diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list index c0367459449d..2f28121b40fe 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 +853CE06C11316B33A8EAE5E9095DA096A9528B8F com.google.code.gson:gson:2.13.1 diff --git a/ide/c.google.gson/external/gson-2.12.1-license.txt b/ide/c.google.gson/external/gson-2.13.1-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.1-license.txt index e3fb1d9fa6ac..a506b38020ac 100644 --- a/ide/c.google.gson/external/gson-2.12.1-license.txt +++ b/ide/c.google.gson/external/gson-2.13.1-license.txt @@ -1,7 +1,7 @@ Name: GSon Description: JSon serialization/deserialization library Origin: GitHub -Version: 2.12.1 +Version: 2.13.1 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..baad5e09412e 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.1.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..094526cfcb78 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.1.jar diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/GitCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/GitCommand.java index 7dba628837f0..85965058551b 100644 --- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/GitCommand.java +++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/GitCommand.java @@ -19,9 +19,6 @@ package org.netbeans.libs.git.jgit.commands; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.text.MessageFormat; import org.eclipse.jgit.lib.Repository; import org.netbeans.libs.git.GitException; @@ -49,17 +46,7 @@ public final void execute () throws GitException { if (prepareCommand()) { try { monitor.started(getCommandDescription()); - try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - @Override - public Void run () throws GitException { - GitCommand.this.run(); - return null; - } - }); - } catch (PrivilegedActionException e) { - throw (GitException) e.getException(); - } + run(); } catch (RuntimeException ex) { if (ex.getMessage() != null && ex.getMessage().contains("Unknown repository format")) { //NOI18N throw new GitException("It seems the config file for repository at [" + repository.getWorkTree() + "] is corrupted.\nEnsure it's valid.", ex); //NOI18N diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list index 3092aec0326c..f0ffac1dd7a4 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 +33787FA12A5F0457C2028FA1DA4517AC8EB3DDF7 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.4.0.202509020913-r diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-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.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r-license.txt index c2bafe0c19d4..b9af12e1fe5c 100644 --- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.4.0.202509020913-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..9fd45662a5b5 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.4.0.202509020913-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..33f02e08bc10 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.4.0.202509020913-r.jar diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list index 683b0496341f..6a0eecfe92d2 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 +D47A51B1257A577DB9388386F60953CFB066450C org.eclipse.jgit:org.eclipse.jgit.lfs:7.4.0.202509020913-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.lfs/external/org.eclipse.jgit.lfs-7.4.0.202509020913-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.lfs/external/org.eclipse.jgit.lfs-7.4.0.202509020913-r-license.txt index c2bafe0c19d4..b9af12e1fe5c 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.lfs/external/org.eclipse.jgit.lfs-7.4.0.202509020913-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.4.0.202509020913-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..2cb3bc6e9e22 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.4.0.202509020913-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..fa0e0037e9cc 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.4.0.202509020913-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..05f4a6e695b4 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 +3F08EFBDA770BEA1096525D48BD7A9AC967D0E2A org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.4.0.202509020913-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.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.4.0.202509020913-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.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.4.0.202509020913-r-license.txt index c2bafe0c19d4..b9af12e1fe5c 100644 --- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt +++ b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.4.0.202509020913-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.4.0.202509020913-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..33b90de2917b 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.4.0.202509020913-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..d59aa18bd62e 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.4.0.202509020913-r.jar diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list index ebb4d377d365..3ecf0ec539e0 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 +29F269CDCDF02C9B3D52B452E5679CF79DE99622 org.eclipse.jgit:org.eclipse.jgit:7.4.0.202509020913-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/external/org.eclipse.jgit-7.4.0.202509020913-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/external/org.eclipse.jgit-7.4.0.202509020913-r-license.txt index c2bafe0c19d4..b9af12e1fe5c 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/external/org.eclipse.jgit-7.4.0.202509020913-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 7.2.0.202503040940-r +Version: 7.4.0.202509020913-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..95b033723833 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.4.0.202509020913-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..0c8cefd91e27 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.4.0.202509020913-r.jar diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 3bda126aaa2b..13138acde063 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.11-bin.zip platform/libs.asm/exter java/maven.embedder/external/apache-maven-3.9.11-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.18.0.jar java/maven.embedder/external/apache-maven-3.9.11-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.3.jar java/maven.embedder/external/apache-maven-3.9.11-bin.zip ide/c.google.guava/external/guava-33.4.6-jre.jar +java/maven.embedder/external/apache-maven-3.9.11-bin.zip ide/c.google.gson/external/gson-2.13.1.jar java/maven.embedder/external/apache-maven-3.9.11-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 diff --git a/platform/o.apache.commons.codec/build.xml b/platform/o.apache.commons.codec/build.xml index 693331749776..3ff91db3d03e 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 5a10de95752a..62ddfe024256 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. -EE45D1CF6EC2CC2B809FF04B4DC7AEC858E0DF8F commons-codec:commons-codec:1.18.0 +8C0DBE3AE883FCEDA9B50A6C76E745E548073388 commons-codec:commons-codec:1.19.0 diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt b/platform/o.apache.commons.codec/external/commons-codec-1.19.0-license.txt similarity index 99% rename from platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.19.0-license.txt index 3754c8deecf3..5c3942acc30d 100644 --- a/platform/o.apache.commons.codec/external/commons-codec-1.18.0-license.txt +++ b/platform/o.apache.commons.codec/external/commons-codec-1.19.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.18.0 +Version: 1.19.0 License: Apache-2.0 Apache License diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.18.0-notice.txt b/platform/o.apache.commons.codec/external/commons-codec-1.19.0-notice.txt similarity index 100% rename from platform/o.apache.commons.codec/external/commons-codec-1.18.0-notice.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.19.0-notice.txt diff --git a/platform/o.apache.commons.codec/nbproject/project.xml b/platform/o.apache.commons.codec/nbproject/project.xml index 2d7cdac7a385..a6e66430e108 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.18.0.jar + external/commons-codec-1.19.0.jar