Skip to content

Update jgit from 7.2.0 to 7.4.0 #8892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Update jgit from 7.2.0 to 7.4.0 #8892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79fda51
Update commons-codec from 1.18.0 to 1.19.0.
mbien Oct 6, 2025
d7723c7
Update gson from 2.12.1 to 2.13.1.
mbien Oct 6, 2025
66bed4e
Update jgit from 7.2 to 7.4.
mbien Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ide/c.google.gson/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...gle.gson/external/gson-2.12.1-license.txt → ...gle.gson/external/gson-2.13.1-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ide/c.google.gson/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ide/c.google.gson/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-google-gson.jar</runtime-relative-path>
<binary-origin>external/gson-2.12.1.jar</binary-origin>
<binary-origin>external/gson-2.13.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
15 changes: 1 addition & 14 deletions ide/libs.git/src/org/netbeans/libs/git/jgit/commands/GitCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -49,17 +46,7 @@ public final void execute () throws GitException {
if (prepareCommand()) {
try {
monitor.started(getCommandDescription());
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@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
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...pse.jgit-7.2.0.202503040940-r-license.txt → ...t.gpg.bc-7.4.0.202509020913-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-gpg-bc.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...t.gpg.bc-7.2.0.202503040940-r-license.txt → ...jgit.lfs-7.4.0.202509020913-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-lfs.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.lfs-7.2.0.202503040940-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.lfs-7.4.0.202509020913-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...jgit.lfs-7.2.0.202503040940-r-license.txt → ...ssh.jsch-7.4.0.202509020913-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-ssh-jsch.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.ssh.jsch-7.4.0.202509020913-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...ssh.jsch-7.2.0.202503040940-r-license.txt → ...pse.jgit-7.4.0.202509020913-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit-7.2.0.202503040940-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit-7.4.0.202509020913-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
1 change: 1 addition & 0 deletions nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions platform/o.apache.commons.codec/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<project name="platform/o.apache.commons.codec" default="build" basedir=".">
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="jar" depends="-define-FileCRC32Calculator">
<FileCRC32Calculator file="external/commons-codec-1.18.0.jar" property="o.apache.commons.codec.crc32" />
<FileCRC32Calculator file="external/commons-codec-1.19.0.jar" property="o.apache.commons.codec.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/commons-codec-1.18.0.jar"/>
<zipfileset src="external/commons-codec-1.19.0.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/>
<attribute name="Bundle-Version" value="1.18.0"/>
<attribute name="Export-Package" value="org.apache.commons.codec;version=&quot;1.18.0.0&quot;,org.apache.commons.codec.binary;version=&quot;1.18.0&quot;,org.apache.commons.codec.digest;version=&quot;1.18.0&quot;,org.apache.commons.codec.language;version=&quot;1.18.0&quot;,org.apache.commons.codec.net;version=&quot;1.18.0&quot;"/>
<attribute name="Bundle-Version" value="1.19.0"/>
<attribute name="Export-Package" value="org.apache.commons.codec;version=&quot;1.19.0.0&quot;,org.apache.commons.codec.binary;version=&quot;1.19.0&quot;,org.apache.commons.codec.digest;version=&quot;1.19.0&quot;,org.apache.commons.codec.language;version=&quot;1.19.0&quot;,org.apache.commons.codec.net;version=&quot;1.19.0&quot;"/>
<attribute name="NB-Original-CRC" value="${o.apache.commons.codec.crc32}"/>
</manifest>
</jar>
Expand Down
2 changes: 1 addition & 1 deletion platform/o.apache.commons.codec/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...external/commons-codec-1.18.0-license.txt → ...external/commons-codec-1.19.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 .../external/commons-codec-1.18.0-notice.txt → .../external/commons-codec-1.19.0-notice.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion platform/o.apache.commons.codec/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-apache-commons-codec.jar</runtime-relative-path>
<binary-origin>external/commons-codec-1.18.0.jar</binary-origin>
<binary-origin>external/commons-codec-1.19.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Loading