From 16f00de17ceb6c2139a01d6afe2c3ef19268beb3 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Fri, 26 Jan 2024 14:45:37 +0100 Subject: [PATCH] Update guava from 32.1.2-jre to 33.0.0-jre updates also guava's failureaccess lib from 1.0.1 to 1.0.2 --- ide/c.google.guava.failureaccess/external/binaries-list | 2 +- ...cess-1.0.1-license.txt => failureaccess-1.0.2-license.txt} | 2 +- ide/c.google.guava.failureaccess/nbproject/project.properties | 2 +- ide/c.google.guava.failureaccess/nbproject/project.xml | 2 +- ide/c.google.guava/external/binaries-list | 2 +- ...va-32.1.2-jre-license.txt => guava-33.0.0-jre-license.txt} | 2 +- ide/c.google.guava/nbproject/project.properties | 2 +- ide/c.google.guava/nbproject/project.xml | 2 +- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) rename ide/c.google.guava.failureaccess/external/{failureaccess-1.0.1-license.txt => failureaccess-1.0.2-license.txt} (99%) rename ide/c.google.guava/external/{guava-32.1.2-jre-license.txt => guava-33.0.0-jre-license.txt} (99%) diff --git a/ide/c.google.guava.failureaccess/external/binaries-list b/ide/c.google.guava.failureaccess/external/binaries-list index c71c3937fb60..f4ff27670bf5 100644 --- a/ide/c.google.guava.failureaccess/external/binaries-list +++ b/ide/c.google.guava.failureaccess/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -1DCF1DE382A0BF95A3D8B0849546C88BAC1292C9 com.google.guava:failureaccess:1.0.1 +C4A06A64E650562F30B7BF9AAEC1BFED43ACA12B com.google.guava:failureaccess:1.0.2 diff --git a/ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt b/ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt similarity index 99% rename from ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt rename to ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt index 8db246aa2be6..0c948ba081a4 100644 --- a/ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt +++ b/ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt @@ -1,5 +1,5 @@ Name: Guava - Failure Access Library -Version: 1.0.1 +Version: 1.0.2 License: Apache-2.0 Origin: https://github.com/google/guava Description: A Guava subproject diff --git a/ide/c.google.guava.failureaccess/nbproject/project.properties b/ide/c.google.guava.failureaccess/nbproject/project.properties index 1fcc19e43c10..b5846341b20f 100644 --- a/ide/c.google.guava.failureaccess/nbproject/project.properties +++ b/ide/c.google.guava.failureaccess/nbproject/project.properties @@ -17,6 +17,6 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 spec.version.base=1.2.0 -release.external/failureaccess-1.0.1.jar=modules/com-google-guava-failureaccess.jar +release.external/failureaccess-1.0.2.jar=modules/com-google-guava-failureaccess.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/ide/c.google.guava.failureaccess/nbproject/project.xml b/ide/c.google.guava.failureaccess/nbproject/project.xml index 358696d3e293..9284279c26eb 100644 --- a/ide/c.google.guava.failureaccess/nbproject/project.xml +++ b/ide/c.google.guava.failureaccess/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-guava-failureaccess.jar - external/failureaccess-1.0.1.jar + external/failureaccess-1.0.2.jar diff --git a/ide/c.google.guava/external/binaries-list b/ide/c.google.guava/external/binaries-list index 2ce8f29293bb..fb2721be1648 100644 --- a/ide/c.google.guava/external/binaries-list +++ b/ide/c.google.guava/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -5E64EC7E056456BEF3A4BC4C6FDAEF71E8AB6318 com.google.guava:guava:32.1.2-jre +161BA27964A62F241533807A46B8711B13C1D94B com.google.guava:guava:33.0.0-jre diff --git a/ide/c.google.guava/external/guava-32.1.2-jre-license.txt b/ide/c.google.guava/external/guava-33.0.0-jre-license.txt similarity index 99% rename from ide/c.google.guava/external/guava-32.1.2-jre-license.txt rename to ide/c.google.guava/external/guava-33.0.0-jre-license.txt index 5e96e10af434..fbfec6c443ee 100644 --- a/ide/c.google.guava/external/guava-32.1.2-jre-license.txt +++ b/ide/c.google.guava/external/guava-33.0.0-jre-license.txt @@ -1,5 +1,5 @@ Name: Guava -Version: 32.1.2 +Version: 33.0.0 License: Apache-2.0 Origin: https://github.com/google/guava Description: Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more. diff --git a/ide/c.google.guava/nbproject/project.properties b/ide/c.google.guava/nbproject/project.properties index 25de2f919ee9..70d199644a6a 100644 --- a/ide/c.google.guava/nbproject/project.properties +++ b/ide/c.google.guava/nbproject/project.properties @@ -17,6 +17,6 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 spec.version.base=27.17.0 -release.external/guava-32.1.2-jre.jar=modules/com-google-guava.jar +release.external/guava-33.0.0-jre.jar=modules/com-google-guava.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/ide/c.google.guava/nbproject/project.xml b/ide/c.google.guava/nbproject/project.xml index 995a71507ea5..56e34cddfa47 100644 --- a/ide/c.google.guava/nbproject/project.xml +++ b/ide/c.google.guava/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-guava.jar - external/guava-32.1.2-jre.jar + external/guava-33.0.0-jre.jar diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index ec9973e06191..86137b6b0c2a 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -26,7 +26,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav java/maven.embedder/external/apache-maven-3.9.6-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar java/maven.embedder/external/apache-maven-3.9.6-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar java/maven.embedder/external/apache-maven-3.9.6-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.0.jar -java/maven.embedder/external/apache-maven-3.9.6-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar +java/maven.embedder/external/apache-maven-3.9.6-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar # Used to parse data during build, but need to as a lib for ide cluster nbbuild/external/json-simple-1.1.1.jar ide/libs.json_simple/external/json-simple-1.1.1.jar @@ -57,7 +57,7 @@ enterprise/web.core.syntax/external/struts-tiles-1.3.10.jar enterprise/web.strut # gradle is used at build-time, so we can ignore the duplicates extide/gradle/external/gradle-7.4-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar -extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar +extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.24.0.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar