From e23b10bdcedba93953c4aaa576ce563a97dd7b6a Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 08:43:48 +0200 Subject: [PATCH 1/7] Update commons compress from 1.26.2 to 1.27.1 --- ide/libs.commons_compress/external/binaries-list | 2 +- ...1.26.2-license.txt => commons-compress-1.27.1-license.txt} | 2 +- ...s-1.26.2-notice.txt => commons-compress-1.27.1-notice.txt} | 0 ide/libs.commons_compress/nbproject/project.properties | 2 +- ide/libs.commons_compress/nbproject/project.xml | 4 ++-- .../src/org/netbeans/libs/commons_compress/mf-layer.xml | 2 +- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename ide/libs.commons_compress/external/{commons-compress-1.26.2-license.txt => commons-compress-1.27.1-license.txt} (99%) rename ide/libs.commons_compress/external/{commons-compress-1.26.2-notice.txt => commons-compress-1.27.1-notice.txt} (100%) diff --git a/ide/libs.commons_compress/external/binaries-list b/ide/libs.commons_compress/external/binaries-list index 9653d3168f42..ae9aac2f5c41 100644 --- a/ide/libs.commons_compress/external/binaries-list +++ b/ide/libs.commons_compress/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. -EB1F823447AF685208E684FCE84783B43517960C org.apache.commons:commons-compress:1.26.2 +A19151084758E2FBB6B41EDDAA88E7B8FF4E6599 org.apache.commons:commons-compress:1.27.1 diff --git a/ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt b/ide/libs.commons_compress/external/commons-compress-1.27.1-license.txt similarity index 99% rename from ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt rename to ide/libs.commons_compress/external/commons-compress-1.27.1-license.txt index 27a7b1be300f..88bfed396231 100644 --- a/ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt +++ b/ide/libs.commons_compress/external/commons-compress-1.27.1-license.txt @@ -1,5 +1,5 @@ Name: Commons Compress -Version: 1.26.2 +Version: 1.27.1 Description: The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files. Origin: https://commons.apache.org/proper/commons-compress/index.html License: Apache-2.0 diff --git a/ide/libs.commons_compress/external/commons-compress-1.26.2-notice.txt b/ide/libs.commons_compress/external/commons-compress-1.27.1-notice.txt similarity index 100% rename from ide/libs.commons_compress/external/commons-compress-1.26.2-notice.txt rename to ide/libs.commons_compress/external/commons-compress-1.27.1-notice.txt diff --git a/ide/libs.commons_compress/nbproject/project.properties b/ide/libs.commons_compress/nbproject/project.properties index e090e46a4b56..353f35c6f3c4 100644 --- a/ide/libs.commons_compress/nbproject/project.properties +++ b/ide/libs.commons_compress/nbproject/project.properties @@ -18,5 +18,5 @@ is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/commons-compress-1.26.2.jar=modules/ext/commons-compress-1.26.2.jar +release.external/commons-compress-1.27.1.jar=modules/ext/commons-compress-1.27.1.jar spec.version.base=0.34.0 diff --git a/ide/libs.commons_compress/nbproject/project.xml b/ide/libs.commons_compress/nbproject/project.xml index 09c43077ebe3..aec1b0deecb4 100644 --- a/ide/libs.commons_compress/nbproject/project.xml +++ b/ide/libs.commons_compress/nbproject/project.xml @@ -61,8 +61,8 @@ org.apache.commons.compress.utils - ext/commons-compress-1.26.2.jar - external/commons-compress-1.26.2.jar + ext/commons-compress-1.27.1.jar + external/commons-compress-1.27.1.jar diff --git a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml index 04a31a871cbb..b3939e04bd5e 100644 --- a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml +++ b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml @@ -27,7 +27,7 @@ - + diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 38b07df8a1b4..0c3589b4d9d5 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -54,7 +54,7 @@ enterprise/websvc.restlib/external/osgi.core-8.0.0.jar platform/libs.osgi/extern 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.3.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.26.2.jar +extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.27.1.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r.jar extide/gradle/external/gradle-7.4-bin.zip java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar From 82132de98151307542dc198e5a0db22cf9338d6f Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 08:53:34 +0200 Subject: [PATCH 2/7] Update commons codec from 1.17.1 to 1.18.0 --- .../antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 ++-- platform/o.apache.commons.codec/build.xml | 8 ++++---- platform/o.apache.commons.codec/external/binaries-list | 2 +- ....17.1-license.txt => commons-codec-1.18.0-license.txt} | 2 +- ...-1.17.1-notice.txt => commons-codec-1.18.0-notice.txt} | 0 platform/o.apache.commons.codec/nbproject/project.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename platform/o.apache.commons.codec/external/{commons-codec-1.17.1-license.txt => commons-codec-1.18.0-license.txt} (99%) rename platform/o.apache.commons.codec/external/{commons-codec-1.17.1-notice.txt => commons-codec-1.18.0-notice.txt} (100%) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 0c3589b4d9d5..bcfd73acd06a 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -24,7 +24,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav # bundled maven conflicts with other libraries java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar -java/maven.embedder/external/apache-maven-3.9.9-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.17.1.jar +java/maven.embedder/external/apache-maven-3.9.9-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.18.0.jar java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar java/maven.embedder/external/apache-maven-3.9.9-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar @@ -63,7 +63,7 @@ extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar extide/gradle/external/gradle-7.4-bin.zip enterprise/cloud.oracle/external/httpclient-4.5.13.jar -extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.17.0.jar +extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.18.0.jar # These are the endorsed version of the javaee apis and create libraries, so they are better kept separate enterprise/javaee.api/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/javax.annotation-api-1.2.jar diff --git a/platform/o.apache.commons.codec/build.xml b/platform/o.apache.commons.codec/build.xml index c617e69a6d02..693331749776 100644 --- a/platform/o.apache.commons.codec/build.xml +++ b/platform/o.apache.commons.codec/build.xml @@ -22,13 +22,13 @@ - + - + - - + + diff --git a/platform/o.apache.commons.codec/external/binaries-list b/platform/o.apache.commons.codec/external/binaries-list index 1141cdbc62b7..5a10de95752a 100644 --- a/platform/o.apache.commons.codec/external/binaries-list +++ b/platform/o.apache.commons.codec/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. -973638B7149D333563584137EBF13A691BB60579 commons-codec:commons-codec:1.17.1 +EE45D1CF6EC2CC2B809FF04B4DC7AEC858E0DF8F commons-codec:commons-codec:1.18.0 diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.17.1-license.txt b/platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt similarity index 99% rename from platform/o.apache.commons.codec/external/commons-codec-1.17.1-license.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt index f363a26c6ee3..3754c8deecf3 100644 --- a/platform/o.apache.commons.codec/external/commons-codec-1.17.1-license.txt +++ b/platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt @@ -1,7 +1,7 @@ Name: Apache Commons Codec Description: General encoding/decoding algorithms (for example phonetic, base64, URL). Origin: https://commons.apache.org/proper/commons-codec/ -Version: 1.17.1 +Version: 1.18.0 License: Apache-2.0 Apache License diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.17.1-notice.txt b/platform/o.apache.commons.codec/external/commons-codec-1.18.0-notice.txt similarity index 100% rename from platform/o.apache.commons.codec/external/commons-codec-1.17.1-notice.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.18.0-notice.txt diff --git a/platform/o.apache.commons.codec/nbproject/project.xml b/platform/o.apache.commons.codec/nbproject/project.xml index f455656c024f..2d7cdac7a385 100644 --- a/platform/o.apache.commons.codec/nbproject/project.xml +++ b/platform/o.apache.commons.codec/nbproject/project.xml @@ -28,7 +28,7 @@ org-apache-commons-codec.jar - external/commons-codec-1.17.1.jar + external/commons-codec-1.18.0.jar From 0560e34eb24d2f230a3d7d8b18f0c2d5f69d2d23 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 08:59:00 +0200 Subject: [PATCH 3/7] Update commons io from 2.16.1 to 2.18.0 --- platform/o.apache.commons.commons_io/external/binaries-list | 2 +- ...ns-io-2.16.1-license.txt => commons-io-2.18.0-license.txt} | 2 +- ...mons-io-2.16.1-notice.txt => commons-io-2.18.0-notice.txt} | 0 .../o.apache.commons.commons_io/nbproject/project.properties | 2 +- platform/o.apache.commons.commons_io/nbproject/project.xml | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename platform/o.apache.commons.commons_io/external/{commons-io-2.16.1-license.txt => commons-io-2.18.0-license.txt} (99%) rename platform/o.apache.commons.commons_io/external/{commons-io-2.16.1-notice.txt => commons-io-2.18.0-notice.txt} (100%) diff --git a/platform/o.apache.commons.commons_io/external/binaries-list b/platform/o.apache.commons.commons_io/external/binaries-list index c97b1f7a66be..8eccad0f16df 100644 --- a/platform/o.apache.commons.commons_io/external/binaries-list +++ b/platform/o.apache.commons.commons_io/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. -377D592E740DC77124E0901291DBFAA6810A200E commons-io:commons-io:2.16.1 +44084EF756763795B31C578403DD028FF4A22950 commons-io:commons-io:2.18.0 diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.18.0-license.txt similarity index 99% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.18.0-license.txt index 92962a2eaae5..3142d6873b70 100644 --- a/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt +++ b/platform/o.apache.commons.commons_io/external/commons-io-2.18.0-license.txt @@ -1,7 +1,7 @@ Name: Apache Commons IO Description: Assist with developing IO functionality Origin: Apache Software Foundation -Version: 2.16.1 +Version: 2.18.0 License: Apache-2.0 URL: https://commons.apache.org/proper/commons-io/ diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-notice.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.18.0-notice.txt similarity index 100% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.1-notice.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.18.0-notice.txt diff --git a/platform/o.apache.commons.commons_io/nbproject/project.properties b/platform/o.apache.commons.commons_io/nbproject/project.properties index c85dac5a27f2..0fd47c689703 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.properties +++ b/platform/o.apache.commons.commons_io/nbproject/project.properties @@ -16,7 +16,7 @@ # under the License. javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/commons-io-2.16.1.jar=modules/ext/commons-io-2.16.1.jar +release.external/commons-io-2.18.0.jar=modules/ext/commons-io-2.18.0.jar is.autoload=true nbm.module.author=Tomas Stupka #generics related sig validation failure diff --git a/platform/o.apache.commons.commons_io/nbproject/project.xml b/platform/o.apache.commons.commons_io/nbproject/project.xml index 00a248952f64..6ba860983b3d 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.xml +++ b/platform/o.apache.commons.commons_io/nbproject/project.xml @@ -58,8 +58,8 @@ org.apache.commons.io.serialization - ext/commons-io-2.16.1.jar - external/commons-io-2.16.1.jar + ext/commons-io-2.18.0.jar + external/commons-io-2.18.0.jar From 6d378880cadf16369a7b3ebb77ccb0c344c0d806 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 09:02:58 +0200 Subject: [PATCH 4/7] Update commons lang3 from 3.14.0 to 3.17.0 --- platform/o.apache.commons.lang3/external/binaries-list | 2 +- ...ang3-3.14.0-license.txt => commons-lang3-3.17.0-license.txt} | 2 +- ...-lang3-3.14.0-notice.txt => commons-lang3-3.17.0-notice.txt} | 0 platform/o.apache.commons.lang3/nbproject/project.properties | 2 +- platform/o.apache.commons.lang3/nbproject/project.xml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename platform/o.apache.commons.lang3/external/{commons-lang3-3.14.0-license.txt => commons-lang3-3.17.0-license.txt} (99%) rename platform/o.apache.commons.lang3/external/{commons-lang3-3.14.0-notice.txt => commons-lang3-3.17.0-notice.txt} (100%) diff --git a/platform/o.apache.commons.lang3/external/binaries-list b/platform/o.apache.commons.lang3/external/binaries-list index f7ed1be81543..36dd1b04ee75 100644 --- a/platform/o.apache.commons.lang3/external/binaries-list +++ b/platform/o.apache.commons.lang3/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. -1ED471194B02F2C6CB734A0CD6F6F107C673AFAE org.apache.commons:commons-lang3:3.14.0 +B17D2136F0460DCC0D2016CEEFCA8723BDF4EE70 org.apache.commons:commons-lang3:3.17.0 diff --git a/platform/o.apache.commons.lang3/external/commons-lang3-3.14.0-license.txt b/platform/o.apache.commons.lang3/external/commons-lang3-3.17.0-license.txt similarity index 99% rename from platform/o.apache.commons.lang3/external/commons-lang3-3.14.0-license.txt rename to platform/o.apache.commons.lang3/external/commons-lang3-3.17.0-license.txt index 76965dbcbd01..21a8fb52f18e 100644 --- a/platform/o.apache.commons.lang3/external/commons-lang3-3.14.0-license.txt +++ b/platform/o.apache.commons.lang3/external/commons-lang3-3.17.0-license.txt @@ -1,5 +1,5 @@ Name: Commons Lang -Version: 3.14.0 +Version: 3.17.0 License: Apache-2.0 Origin: https://commons.apache.org/proper/commons-lang/ Description: Provides extra functionality for classes in java.lang. diff --git a/platform/o.apache.commons.lang3/external/commons-lang3-3.14.0-notice.txt b/platform/o.apache.commons.lang3/external/commons-lang3-3.17.0-notice.txt similarity index 100% rename from platform/o.apache.commons.lang3/external/commons-lang3-3.14.0-notice.txt rename to platform/o.apache.commons.lang3/external/commons-lang3-3.17.0-notice.txt diff --git a/platform/o.apache.commons.lang3/nbproject/project.properties b/platform/o.apache.commons.lang3/nbproject/project.properties index 1ee2bd605584..de1ab6dcdf68 100644 --- a/platform/o.apache.commons.lang3/nbproject/project.properties +++ b/platform/o.apache.commons.lang3/nbproject/project.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/commons-lang3-3.14.0.jar=modules/org-apache-commons-lang3.jar +release.external/commons-lang3-3.17.0.jar=modules/org-apache-commons-lang3.jar is.autoload=true diff --git a/platform/o.apache.commons.lang3/nbproject/project.xml b/platform/o.apache.commons.lang3/nbproject/project.xml index 244ece97fe6e..c4b718f49770 100644 --- a/platform/o.apache.commons.lang3/nbproject/project.xml +++ b/platform/o.apache.commons.lang3/nbproject/project.xml @@ -28,7 +28,7 @@ commons-lang3.jar - external/commons-lang3-3.14.0.jar + external/commons-lang3-3.17.0.jar From e7483d59feb7552f3b7b76b9873030080bd9bfe8 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 09:07:37 +0200 Subject: [PATCH 5/7] Update commons logging from 1.3.3 to 1.3.5 --- platform/o.apache.commons.logging/build.xml | 8 ++++---- platform/o.apache.commons.logging/external/binaries-list | 2 +- ....3.3-license.txt => commons-logging-1.3.5-license.txt} | 2 +- ...-1.3.3-notice.txt => commons-logging-1.3.5-notice.txt} | 0 platform/o.apache.commons.logging/nbproject/project.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename platform/o.apache.commons.logging/external/{commons-logging-1.3.3-license.txt => commons-logging-1.3.5-license.txt} (99%) rename platform/o.apache.commons.logging/external/{commons-logging-1.3.3-notice.txt => commons-logging-1.3.5-notice.txt} (100%) diff --git a/platform/o.apache.commons.logging/build.xml b/platform/o.apache.commons.logging/build.xml index fcb4f3848be0..09aec663326a 100644 --- a/platform/o.apache.commons.logging/build.xml +++ b/platform/o.apache.commons.logging/build.xml @@ -27,9 +27,9 @@ the original commons-logging. --> - + - + - + diff --git a/platform/o.apache.commons.logging/external/binaries-list b/platform/o.apache.commons.logging/external/binaries-list index 4b53016932c6..2b572b61e940 100644 --- a/platform/o.apache.commons.logging/external/binaries-list +++ b/platform/o.apache.commons.logging/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. -580AD1A4F34876C4F964C083361DE31B3D60BE68 commons-logging:commons-logging:1.3.3 +A3FCC5D3C29B2B03433AA2D2F2D2C1B1638924A1 commons-logging:commons-logging:1.3.5 diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt b/platform/o.apache.commons.logging/external/commons-logging-1.3.5-license.txt similarity index 99% rename from platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt rename to platform/o.apache.commons.logging/external/commons-logging-1.3.5-license.txt index f2dec05d88b4..2fd798a5e70e 100644 --- a/platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt +++ b/platform/o.apache.commons.logging/external/commons-logging-1.3.5-license.txt @@ -1,6 +1,6 @@ Name: Apache Jakarta Commons Logging Origin: Apache Software Foundation -Version: 1.3.3 +Version: 1.3.5 License: Apache-2.0 Description: Logging component URL: https://commons.apache.org/proper/commons-logging/ diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.3.3-notice.txt b/platform/o.apache.commons.logging/external/commons-logging-1.3.5-notice.txt similarity index 100% rename from platform/o.apache.commons.logging/external/commons-logging-1.3.3-notice.txt rename to platform/o.apache.commons.logging/external/commons-logging-1.3.5-notice.txt diff --git a/platform/o.apache.commons.logging/nbproject/project.xml b/platform/o.apache.commons.logging/nbproject/project.xml index b7ffc5fa11f6..f1b0c544a0a4 100644 --- a/platform/o.apache.commons.logging/nbproject/project.xml +++ b/platform/o.apache.commons.logging/nbproject/project.xml @@ -28,7 +28,7 @@ org-apache-commons-logging.jar - external/commons-logging-1.3.3.jar + external/commons-logging-1.3.5.jar From 2d1fac4fcde5dfaf8f8766f01428e8546d7e845a Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 09:14:28 +0200 Subject: [PATCH 6/7] Update freemarker from 2.3.33 to 2.3.34 --- ide/libs.freemarker/external/binaries-list | 2 +- ...arker-2.3.33-license.txt => freemarker-2.3.34-license.txt} | 2 +- ...emarker-2.3.33-notice.txt => freemarker-2.3.34-notice.txt} | 0 ide/libs.freemarker/nbproject/project.properties | 2 +- ide/libs.freemarker/nbproject/project.xml | 4 ++-- .../src/org/netbeans/libs/freemarker/FreemarkerFactory.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename ide/libs.freemarker/external/{freemarker-2.3.33-license.txt => freemarker-2.3.34-license.txt} (99%) rename ide/libs.freemarker/external/{freemarker-2.3.33-notice.txt => freemarker-2.3.34-notice.txt} (100%) diff --git a/ide/libs.freemarker/external/binaries-list b/ide/libs.freemarker/external/binaries-list index 9d310234b841..774eb7e25957 100644 --- a/ide/libs.freemarker/external/binaries-list +++ b/ide/libs.freemarker/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. -FECAEB606993FC9FD0F95FE5A644048A69C39474 org.freemarker:freemarker:2.3.33 +C2FA47A1C3B6DCDFCA90E952E51211967A4BAA54 org.freemarker:freemarker:2.3.34 diff --git a/ide/libs.freemarker/external/freemarker-2.3.33-license.txt b/ide/libs.freemarker/external/freemarker-2.3.34-license.txt similarity index 99% rename from ide/libs.freemarker/external/freemarker-2.3.33-license.txt rename to ide/libs.freemarker/external/freemarker-2.3.34-license.txt index 6030c6366bca..be1046f63b21 100644 --- a/ide/libs.freemarker/external/freemarker-2.3.33-license.txt +++ b/ide/libs.freemarker/external/freemarker-2.3.34-license.txt @@ -1,5 +1,5 @@ Name: Apache FreeMarker -Version: 2.3.33 +Version: 2.3.34 Origin: Apache Software Foundation License: Apache-2.0-freemarker Description: Template engine diff --git a/ide/libs.freemarker/external/freemarker-2.3.33-notice.txt b/ide/libs.freemarker/external/freemarker-2.3.34-notice.txt similarity index 100% rename from ide/libs.freemarker/external/freemarker-2.3.33-notice.txt rename to ide/libs.freemarker/external/freemarker-2.3.34-notice.txt diff --git a/ide/libs.freemarker/nbproject/project.properties b/ide/libs.freemarker/nbproject/project.properties index beba096f4f75..acc5ff4ddf26 100644 --- a/ide/libs.freemarker/nbproject/project.properties +++ b/ide/libs.freemarker/nbproject/project.properties @@ -19,7 +19,7 @@ is.autoload=true javac.compilerargs=-Xlint:unchecked javac.release=17 -release.external/freemarker-2.3.33.jar=modules/ext/freemarker-2.3.33.jar +release.external/freemarker-2.3.34.jar=modules/ext/freemarker-2.3.34.jar module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper)) spec.version.base=2.62.0 diff --git a/ide/libs.freemarker/nbproject/project.xml b/ide/libs.freemarker/nbproject/project.xml index bb440c516f3c..7bb3e7f273d3 100644 --- a/ide/libs.freemarker/nbproject/project.xml +++ b/ide/libs.freemarker/nbproject/project.xml @@ -119,8 +119,8 @@ - ext/freemarker-2.3.33.jar - external/freemarker-2.3.33.jar + ext/freemarker-2.3.34.jar + external/freemarker-2.3.34.jar diff --git a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java index 1669fca75976..baaaefcb9575 100644 --- a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java +++ b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java @@ -36,7 +36,7 @@ public String getEngineName() { @Override public String getEngineVersion() { - return "2.3.33"; + return "2.3.34"; } @Override @@ -51,7 +51,7 @@ public String getLanguageName() { @Override public String getLanguageVersion() { - return "2.3.33"; + return "2.3.34"; } @Override From 23831158b7dd918a8d3fcc19548aac6c8f51352f Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 1 Apr 2025 09:25:03 +0200 Subject: [PATCH 7/7] Update JNA from 5.14.0 to 5.17.0 --- .../libs.jna.platform/external/binaries-list | 2 +- ...se.txt => jna-platform-5.17.0-license.txt} | 2 +- .../nbproject/project.properties | 2 +- .../libs.jna.platform/nbproject/project.xml | 4 ++-- platform/libs.jna/external/binaries-list | 2 +- ...4.0-license.txt => jna-5.17.0-license.txt} | 2 +- .../nbproject/org-netbeans-libs-jna.sig | 2 +- .../libs.jna/nbproject/project.properties | 20 +++++++++---------- platform/libs.jna/nbproject/project.xml | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) rename platform/libs.jna.platform/external/{jna-platform-5.14.0-license.txt => jna-platform-5.17.0-license.txt} (99%) rename platform/libs.jna/external/{jna-5.14.0-license.txt => jna-5.17.0-license.txt} (99%) diff --git a/platform/libs.jna.platform/external/binaries-list b/platform/libs.jna.platform/external/binaries-list index 5f6df505df0c..c47ecda9d970 100644 --- a/platform/libs.jna.platform/external/binaries-list +++ b/platform/libs.jna.platform/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -28934D48AED814F11E4C584DA55C49FA7032B31B net.java.dev.jna:jna-platform:5.14.0 +A4934C44D25A9D8C2DDF4203AFFD20330CB3426F net.java.dev.jna:jna-platform:5.17.0 diff --git a/platform/libs.jna.platform/external/jna-platform-5.14.0-license.txt b/platform/libs.jna.platform/external/jna-platform-5.17.0-license.txt similarity index 99% rename from platform/libs.jna.platform/external/jna-platform-5.14.0-license.txt rename to platform/libs.jna.platform/external/jna-platform-5.17.0-license.txt index aa407336b559..9efaf1ef7ec4 100644 --- a/platform/libs.jna.platform/external/jna-platform-5.14.0-license.txt +++ b/platform/libs.jna.platform/external/jna-platform-5.17.0-license.txt @@ -1,5 +1,5 @@ Name: Java Native Access -Version: 5.14.0 +Version: 5.17.0 License: Apache-2.0 Description: Dynamically access native libraries from Java without JNI. Origin: Java Native Access diff --git a/platform/libs.jna.platform/nbproject/project.properties b/platform/libs.jna.platform/nbproject/project.properties index 3ab7ee5c669f..fb778e469bec 100644 --- a/platform/libs.jna.platform/nbproject/project.properties +++ b/platform/libs.jna.platform/nbproject/project.properties @@ -17,5 +17,5 @@ is.autoload=true javac.source=1.8 -release.external/jna-platform-5.14.0.jar=modules/ext/jna-platform-5.14.0.jar +release.external/jna-platform-5.17.0.jar=modules/ext/jna-platform-5.17.0.jar sigtest.gen.fail.on.error=false diff --git a/platform/libs.jna.platform/nbproject/project.xml b/platform/libs.jna.platform/nbproject/project.xml index cd2e3f6eb1b0..dd8bda725f7b 100644 --- a/platform/libs.jna.platform/nbproject/project.xml +++ b/platform/libs.jna.platform/nbproject/project.xml @@ -47,8 +47,8 @@ com.sun.jna.platform.wince - ext/jna-platform-5.14.0.jar - external/jna-platform-5.14.0.jar + ext/jna-platform-5.17.0.jar + external/jna-platform-5.17.0.jar diff --git a/platform/libs.jna/external/binaries-list b/platform/libs.jna/external/binaries-list index 51ed5e814ec5..bbd8875f8f87 100644 --- a/platform/libs.jna/external/binaries-list +++ b/platform/libs.jna/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -67BF3EAEA4F0718CB376A181A629E5F88FA1C9DD net.java.dev.jna:jna:5.14.0 +33D12735BEF894440780FCE64F9758D420C7BAE2 net.java.dev.jna:jna:5.17.0 diff --git a/platform/libs.jna/external/jna-5.14.0-license.txt b/platform/libs.jna/external/jna-5.17.0-license.txt similarity index 99% rename from platform/libs.jna/external/jna-5.14.0-license.txt rename to platform/libs.jna/external/jna-5.17.0-license.txt index aa407336b559..9efaf1ef7ec4 100644 --- a/platform/libs.jna/external/jna-5.14.0-license.txt +++ b/platform/libs.jna/external/jna-5.17.0-license.txt @@ -1,5 +1,5 @@ Name: Java Native Access -Version: 5.14.0 +Version: 5.17.0 License: Apache-2.0 Description: Dynamically access native libraries from Java without JNI. Origin: Java Native Access diff --git a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig index 02b96f0eb9fc..8523aa8bc540 100644 --- a/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig +++ b/platform/libs.jna/nbproject/org-netbeans-libs-jna.sig @@ -274,7 +274,7 @@ fld public final static int POINTER_SIZE fld public final static int SIZE_T_SIZE fld public final static int WCHAR_SIZE fld public final static java.lang.String DEFAULT_ENCODING -fld public final static java.lang.String VERSION = "5.14.0" +fld public final static java.lang.String VERSION = "5.17.0" fld public final static java.lang.String VERSION_NATIVE = "7.0.0" fld public final static java.nio.charset.Charset DEFAULT_CHARSET innr public abstract interface static ffi_callback diff --git a/platform/libs.jna/nbproject/project.properties b/platform/libs.jna/nbproject/project.properties index 36ee9b6ab762..be838d5d5241 100644 --- a/platform/libs.jna/nbproject/project.properties +++ b/platform/libs.jna/nbproject/project.properties @@ -16,17 +16,17 @@ # under the License. javac.source=1.8 -release.external/jna-5.14.0.jar=modules/ext/jna-5.14.0.jar +release.external/jna-5.17.0.jar=modules/ext/jna-5.17.0.jar # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well. -release.external/jna-5.14.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib -release.external/jna-5.14.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib -release.external/jna-5.14.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so -release.external/jna-5.14.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so -release.external/jna-5.14.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so -release.external/jna-5.14.0.jar!/com/sun/jna/linux-riscv64/libjnidispatch.so=modules/lib/riscv64/linux/libjnidispatch-nb.so -release.external/jna-5.14.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll -release.external/jna-5.14.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll -release.external/jna-5.14.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll +release.external/jna-5.17.0.jar!/com/sun/jna/darwin-x86-64/libjnidispatch.jnilib=modules/lib/x86_64/libjnidispatch-nb.jnilib +release.external/jna-5.17.0.jar!/com/sun/jna/darwin-aarch64/libjnidispatch.jnilib=modules/lib/aarch64/libjnidispatch-nb.jnilib +release.external/jna-5.17.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-nb.so +release.external/jna-5.17.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-nb.so +release.external/jna-5.17.0.jar!/com/sun/jna/linux-aarch64/libjnidispatch.so=modules/lib/aarch64/linux/libjnidispatch-nb.so +release.external/jna-5.17.0.jar!/com/sun/jna/linux-riscv64/libjnidispatch.so=modules/lib/riscv64/linux/libjnidispatch-nb.so +release.external/jna-5.17.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-nb.dll +release.external/jna-5.17.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-nb.dll +release.external/jna-5.17.0.jar!/com/sun/jna/win32-aarch64/jnidispatch.dll=modules/lib/aarch64/jnidispatch-nb.dll jnlp.verify.excludes=\ modules/lib/amd64/jnidispatch-nb.dll,\ modules/lib/x86/jnidispatch-nb.dll,\ diff --git a/platform/libs.jna/nbproject/project.xml b/platform/libs.jna/nbproject/project.xml index d38f0cd5d569..71b071f26cd4 100644 --- a/platform/libs.jna/nbproject/project.xml +++ b/platform/libs.jna/nbproject/project.xml @@ -48,8 +48,8 @@ com.sun.jna.win32 - ext/jna-5.14.0.jar - external/jna-5.14.0.jar + ext/jna-5.17.0.jar + external/jna-5.17.0.jar