From 1859e6f167e026020a90c888297a2bde536167db Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Mon, 6 Oct 2025 23:11:28 +0200 Subject: [PATCH 1/2] Update gson from 2.12.1 to 2.13.2 --- ide/c.google.gson/external/binaries-list | 2 +- .../{gson-2.12.1-license.txt => gson-2.13.2-license.txt} | 2 +- ide/c.google.gson/nbproject/project.properties | 2 +- ide/c.google.gson/nbproject/project.xml | 2 +- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) rename ide/c.google.gson/external/{gson-2.12.1-license.txt => gson-2.13.2-license.txt} (99%) diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list index c0367459449d..4fede550d4a2 100644 --- a/ide/c.google.gson/external/binaries-list +++ b/ide/c.google.gson/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. -4E773A317740B83B43CFC3D652962856041697CB com.google.code.gson:gson:2.12.1 +48B8230771E573B54CE6E867A9001E75977FE78E com.google.code.gson:gson:2.13.2 diff --git a/ide/c.google.gson/external/gson-2.12.1-license.txt b/ide/c.google.gson/external/gson-2.13.2-license.txt similarity index 99% rename from ide/c.google.gson/external/gson-2.12.1-license.txt rename to ide/c.google.gson/external/gson-2.13.2-license.txt index e3fb1d9fa6ac..3f4e114b00a7 100644 --- a/ide/c.google.gson/external/gson-2.12.1-license.txt +++ b/ide/c.google.gson/external/gson-2.13.2-license.txt @@ -1,7 +1,7 @@ Name: GSon Description: JSon serialization/deserialization library Origin: GitHub -Version: 2.12.1 +Version: 2.13.2 License: Apache-2.0 Apache License diff --git a/ide/c.google.gson/nbproject/project.properties b/ide/c.google.gson/nbproject/project.properties index 53cd64eee947..51eec5562cca 100644 --- a/ide/c.google.gson/nbproject/project.properties +++ b/ide/c.google.gson/nbproject/project.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/gson-2.12.1.jar=modules/com-google-gson.jar +release.external/gson-2.13.2.jar=modules/com-google-gson.jar is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 diff --git a/ide/c.google.gson/nbproject/project.xml b/ide/c.google.gson/nbproject/project.xml index 19fcd32e847a..c2e086fdbd3b 100644 --- a/ide/c.google.gson/nbproject/project.xml +++ b/ide/c.google.gson/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-gson.jar - external/gson-2.12.1.jar + external/gson-2.13.2.jar diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 488c1f12452b..6785b06830cc 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -28,6 +28,7 @@ java/maven.embedder/external/apache-maven-3.9.12-bin.zip platform/libs.asm/exter java/maven.embedder/external/apache-maven-3.9.12-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.18.0.jar java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar +java/maven.embedder/external/apache-maven-3.9.12-bin.zip ide/c.google.gson/external/gson-2.13.2.jar java/maven.embedder/external/apache-maven-3.9.12-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar # Used to parse data during build, but need to as a lib for ide cluster @@ -124,4 +125,4 @@ enterprise/web.jspparser/external/jakarta.servlet.jsp.jstl-api-1.2.7.jar enterpr enterprise/web.jspparser/external/jakarta.servlet.jsp.jstl-1.2.6.jar enterprise/libs.jstl/external/jakarta.servlet.jsp.jstl-1.2.6.jar enterprise/web.jspparser/external/jakarta.servlet.jsp.jstl-api-3.0.2.jar enterprise/libs.jstl/external/jakarta.servlet.jsp.jstl-api-3.0.2.jar enterprise/web.jspparser/external/jakarta.servlet.jsp.jstl-3.0.1.jar enterprise/libs.jstl/external/jakarta.servlet.jsp.jstl-3.0.1.jar -enterprise/web.jspparser/external/commons-logging-1.3.1.jar platform/o.apache.commons.logging/external/commons-logging-1.3.1.jar \ No newline at end of file +enterprise/web.jspparser/external/commons-logging-1.3.1.jar platform/o.apache.commons.logging/external/commons-logging-1.3.1.jar From cc7068e90da9cbefae67d97d248e903fe9f44b04 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 31 Dec 2025 02:54:27 +0100 Subject: [PATCH 2/2] Update jgit from 7.2.0 to 7.2.1 --- ide/o.eclipse.jgit.gpg.bc/external/binaries-list | 2 +- ...=> org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r-license.txt} | 2 +- ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties | 2 +- ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml | 2 +- ide/o.eclipse.jgit.lfs/external/binaries-list | 2 +- ...xt => org.eclipse.jgit.lfs-7.2.1.202505142326-r-license.txt} | 2 +- ide/o.eclipse.jgit.lfs/nbproject/project.properties | 2 +- ide/o.eclipse.jgit.lfs/nbproject/project.xml | 2 +- ide/o.eclipse.jgit.ssh.jsch/external/binaries-list | 2 +- ... org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r-license.txt} | 2 +- ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties | 2 +- ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml | 2 +- ide/o.eclipse.jgit/external/binaries-list | 2 +- ...se.txt => org.eclipse.jgit-7.2.1.202505142326-r-license.txt} | 2 +- ide/o.eclipse.jgit/nbproject/project.properties | 2 +- ide/o.eclipse.jgit/nbproject/project.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename ide/o.eclipse.jgit.gpg.bc/external/{org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt => org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r-license.txt} (99%) rename ide/o.eclipse.jgit.lfs/external/{org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt => org.eclipse.jgit.lfs-7.2.1.202505142326-r-license.txt} (99%) rename ide/o.eclipse.jgit.ssh.jsch/external/{org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt => org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r-license.txt} (99%) rename ide/o.eclipse.jgit/external/{org.eclipse.jgit-7.2.0.202503040940-r-license.txt => org.eclipse.jgit-7.2.1.202505142326-r-license.txt} (99%) diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list index 3092aec0326c..78485dd384c2 100644 --- a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list +++ b/ide/o.eclipse.jgit.gpg.bc/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. -0B53C4CF59B0A52E4E2C43E4FF096BBD8E389B30 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.2.0.202503040940-r +F1A7C31962EEF791DDA4FF91043DF531F06F5F04 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.2.1.202505142326-r diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt rename to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r-license.txt index c2bafe0c19d4..ba47e7cc3a08 100644 --- a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.2.1.202505142326-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties index 0c90ca2c9765..7d463134c09c 100644 --- a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties +++ b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r.jar=modules/org-eclipse-jgit-gpg-bc.jar +release.external/org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r.jar=modules/org-eclipse-jgit-gpg-bc.jar diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml index 0ea5ac61f1d4..77c467d52ed7 100644 --- a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml +++ b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml @@ -65,7 +65,7 @@ org-eclipse-jgit-gpg-bc.jar - external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r.jar + external/org.eclipse.jgit.gpg.bc-7.2.1.202505142326-r.jar diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list index 683b0496341f..49b3c87bea67 100644 --- a/ide/o.eclipse.jgit.lfs/external/binaries-list +++ b/ide/o.eclipse.jgit.lfs/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. -21B6C0D03236D7889C80EBBD6B18FB79246F19D9 org.eclipse.jgit:org.eclipse.jgit.lfs:7.2.0.202503040940-r +C599E6652B31273A8668982082916E1AC1C5FEC6 org.eclipse.jgit:org.eclipse.jgit.lfs:7.2.1.202505142326-r diff --git a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.1.202505142326-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt rename to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.1.202505142326-r-license.txt index c2bafe0c19d4..ba47e7cc3a08 100644 --- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.1.202505142326-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.2.1.202505142326-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.properties b/ide/o.eclipse.jgit.lfs/nbproject/project.properties index 4a5317bb9bf9..1ad4dbac9a4c 100644 --- a/ide/o.eclipse.jgit.lfs/nbproject/project.properties +++ b/ide/o.eclipse.jgit.lfs/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.lfs-7.2.0.202503040940-r.jar=modules/org-eclipse-jgit-lfs.jar +release.external/org.eclipse.jgit.lfs-7.2.1.202505142326-r.jar=modules/org-eclipse-jgit-lfs.jar diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.xml b/ide/o.eclipse.jgit.lfs/nbproject/project.xml index 7c104a574d63..27318df63042 100644 --- a/ide/o.eclipse.jgit.lfs/nbproject/project.xml +++ b/ide/o.eclipse.jgit.lfs/nbproject/project.xml @@ -60,7 +60,7 @@ org-eclipse-jgit-lfs.jar - external/org.eclipse.jgit.lfs-7.2.0.202503040940-r.jar + external/org.eclipse.jgit.lfs-7.2.1.202505142326-r.jar diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list b/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list index a94056289de2..ed93634ccfda 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list +++ b/ide/o.eclipse.jgit.ssh.jsch/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. -D80BF5D740F8A8E4731F75489E6A9226402E6A67 org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.2.0.202503040940-r +23322F5C4845608DA32006F45F4D1E910C2FE5C5 org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.2.1.202505142326-r diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt rename to ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r-license.txt index c2bafe0c19d4..ba47e7cc3a08 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.2.1.202505142326-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties index 5dd53be6d020..4accf1371618 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties +++ b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar +release.external/org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar diff --git a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml index cb8fd7ee7ed5..32da491dbc2f 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml +++ b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml @@ -54,7 +54,7 @@ org-eclipse-jgit-ssh-jsch.jar - external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r.jar + external/org.eclipse.jgit.ssh.jsch-7.2.1.202505142326-r.jar diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list index ebb4d377d365..59bbbc25f983 100644 --- a/ide/o.eclipse.jgit/external/binaries-list +++ b/ide/o.eclipse.jgit/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. -8D9379845E9D37B58B187ABBAB2F7A6B63B59F65 org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r +4E1E47B134371A9F7EA17779164EA5110DA1CD4D org.eclipse.jgit:org.eclipse.jgit:7.2.1.202505142326-r diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.1.202505142326-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt rename to ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.1.202505142326-r-license.txt index c2bafe0c19d4..ba47e7cc3a08 100644 --- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.1.202505142326-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.2.1.202505142326-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit/nbproject/project.properties b/ide/o.eclipse.jgit/nbproject/project.properties index 1850affd5981..a42450e968a3 100644 --- a/ide/o.eclipse.jgit/nbproject/project.properties +++ b/ide/o.eclipse.jgit/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit-7.2.0.202503040940-r.jar=modules/org-eclipse-jgit.jar +release.external/org.eclipse.jgit-7.2.1.202505142326-r.jar=modules/org-eclipse-jgit.jar diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml index 2f7f3cc80b10..a3f4706368b7 100644 --- a/ide/o.eclipse.jgit/nbproject/project.xml +++ b/ide/o.eclipse.jgit/nbproject/project.xml @@ -52,7 +52,7 @@ org-eclipse-jgit.jar - external/org.eclipse.jgit-7.2.0.202503040940-r.jar + external/org.eclipse.jgit-7.2.1.202505142326-r.jar