diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list
index 851549697985..c0367459449d 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.
-527175CA6D81050B53BDD4C457A6D6E017626B0E com.google.code.gson:gson:2.11.0
+4E773A317740B83B43CFC3D652962856041697CB com.google.code.gson:gson:2.12.1
diff --git a/ide/c.google.gson/external/gson-2.11.0-license.txt b/ide/c.google.gson/external/gson-2.12.1-license.txt
similarity index 99%
rename from ide/c.google.gson/external/gson-2.11.0-license.txt
rename to ide/c.google.gson/external/gson-2.12.1-license.txt
index 683468f22a25..e3fb1d9fa6ac 100644
--- a/ide/c.google.gson/external/gson-2.11.0-license.txt
+++ b/ide/c.google.gson/external/gson-2.12.1-license.txt
@@ -1,7 +1,7 @@
Name: GSon
Description: JSon serialization/deserialization library
Origin: GitHub
-Version: 2.11.0
+Version: 2.12.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 b00dad9f6ed1..53cd64eee947 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.11.0.jar=modules/com-google-gson.jar
+release.external/gson-2.12.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 4b7ad92120b1..19fcd32e847a 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.11.0.jar
+ external/gson-2.12.1.jar
diff --git a/ide/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java b/ide/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
index 8bef50713823..d5196895ce8b 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/GitRevisionInfo.java
@@ -114,7 +114,7 @@ public long getCommitTime () {
if (author == null) {
return (long) revCommit.getCommitTime() * 1000;
} else {
- return author.getWhen().getTime();
+ return author.getWhenAsInstant().toEpochMilli();
}
}
diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CommitCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CommitCommand.java
index 1a2b74b5fbe9..45fa3d938e9d 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CommitCommand.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CommitCommand.java
@@ -170,9 +170,9 @@ private void transferTimestamp (org.eclipse.jgit.api.CommitCommand commit, RevCo
PersonIdent lastAuthor = lastCommit.getAuthorIdent();
if (lastAuthor != null) {
PersonIdent author = commit.getAuthor();
- commit.setAuthor(lastAuthor.getTimeZone() == null
- ? new PersonIdent(author, lastAuthor.getWhen())
- : new PersonIdent(author, lastAuthor.getWhen(), lastAuthor.getTimeZone()));
+ commit.setAuthor(lastAuthor.getZoneId() == null
+ ? new PersonIdent(author, lastAuthor.getWhenAsInstant())
+ : new PersonIdent(author, lastAuthor.getWhenAsInstant(), lastAuthor.getZoneId()));
}
}
@@ -197,7 +197,7 @@ private void prepareIndex () throws NoWorkTreeException, CorruptObjectException,
treeWalk.addTree(new DirCacheIterator(cache));
final int T_HEAD = 0;
final int T_INDEX = 1;
- List toAdd = new LinkedList();
+ List toAdd = new LinkedList<>();
while (treeWalk.next() && !monitor.isCanceled()) {
String path = treeWalk.getPathString();
int mHead = treeWalk.getRawMode(T_HEAD);
diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
index 8b4ea50d3c41..f1714496d159 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java
@@ -310,11 +310,11 @@ public boolean requiresCommitBody () {
Date from = criteria.getFrom();
Date to = criteria.getTo();
if (from != null && to != null) {
- filter = AndRevFilter.create(filter, CommitTimeRevFilter.between(from, to));
+ filter = AndRevFilter.create(filter, CommitTimeRevFilter.between(from.toInstant(), to.toInstant()));
} else if (from != null) {
- filter = AndRevFilter.create(filter, CommitTimeRevFilter.after(from));
+ filter = AndRevFilter.create(filter, CommitTimeRevFilter.after(from.toInstant()));
} else if (to != null) {
- filter = AndRevFilter.create(filter, CommitTimeRevFilter.before(to));
+ filter = AndRevFilter.create(filter, CommitTimeRevFilter.before(to.toInstant()));
}
// this must be at the end, limit filter must apply as the last
if (criteria.getLimit() != -1) {
diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/TransportCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/TransportCommand.java
index a5a41c9d434f..a1305d4234e4 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/TransportCommand.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/TransportCommand.java
@@ -29,16 +29,13 @@
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.errors.UnsupportedCredentialItem;
-import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.transport.CredentialItem;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.TransportProtocol;
import org.eclipse.jgit.transport.URIish;
-import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
import org.netbeans.libs.git.GitException;
import org.netbeans.libs.git.jgit.GitClassFactory;
@@ -81,17 +78,17 @@ public boolean get (URIish uriish, CredentialItem... items) throws UnsupportedCr
password = "";
}
for (CredentialItem i : items) {
- if (i instanceof CredentialItem.Username) {
- ((CredentialItem.Username) i).setValue(user);
+ if (i instanceof CredentialItem.Username un) {
+ un.setValue(user);
continue;
}
- if (i instanceof CredentialItem.Password) {
- ((CredentialItem.Password) i).setValue(password.toCharArray());
+ if (i instanceof CredentialItem.Password pw) {
+ pw.setValue(password.toCharArray());
continue;
}
- if (i instanceof CredentialItem.StringType) {
+ if (i instanceof CredentialItem.StringType st) {
if (i.getPromptText().equals("Password: ")) { //NOI18N
- ((CredentialItem.StringType) i).setValue(password);
+ st.setValue(password);
continue;
}
}
@@ -241,18 +238,15 @@ protected final void handleException (TransportException e, URIish uri) throws G
protected abstract void runTransportCommand () throws GitException;
- private static class DelegatingSystemReader extends SystemReader {
+ private static class DelegatingSystemReader extends SystemReader.Delegate {
+
private final SystemReader instance;
public DelegatingSystemReader (SystemReader sr) {
+ super(sr);
this.instance = sr;
}
- @Override
- public String getHostname () {
- return instance.getHostname();
- }
-
@Override
public String getenv (String string) {
if (PROP_ENV_GIT_SSH.equals(string)) {
@@ -260,35 +254,6 @@ public String getenv (String string) {
}
return instance.getenv(string);
}
-
- @Override
- public String getProperty (String string) {
- return instance.getProperty(string);
- }
-
- @Override
- public FileBasedConfig openUserConfig (Config config, FS fs) {
- return instance.openUserConfig(config, fs);
- }
-
- @Override
- public FileBasedConfig openSystemConfig (Config config, FS fs) {
- return instance.openSystemConfig(config, fs);
- }
-
- @Override
- public long getCurrentTime () {
- return instance.getCurrentTime();
- }
-
- @Override
- public int getTimezone (long l) {
- return instance.getTimezone(l);
- }
-
- @Override
- public FileBasedConfig openJGitConfig(Config config, FS fs) {
- return instance.openJGitConfig(config, fs);
- }
+
}
}
diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java
index 8d6b5467cc99..53bd461f9811 100644
--- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java
+++ b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/ConnectionTest.java
@@ -24,10 +24,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
import org.netbeans.junit.Filter;
import org.netbeans.libs.git.GitClient;
@@ -284,7 +281,7 @@ public char[] getPassphrase (String uri, String prompt) {
public void testSshConnectionGITSSH_Issue213394 () throws Exception {
SystemReader sr = SystemReader.getInstance();
- SystemReader.setInstance(new DelegatingSystemReader(sr) {
+ SystemReader.setInstance(new SystemReader.Delegate(sr) {
@Override
public String getenv (String string) {
@@ -404,51 +401,4 @@ public char[] getPassphrase (String uri, String prompt) {
}
- private static class DelegatingSystemReader extends SystemReader {
- private final SystemReader instance;
-
- public DelegatingSystemReader (SystemReader sr) {
- this.instance = sr;
- }
-
- @Override
- public String getHostname () {
- return instance.getHostname();
- }
-
- @Override
- public String getenv (String string) {
- return instance.getenv(string);
- }
-
- @Override
- public String getProperty (String string) {
- return instance.getProperty(string);
- }
-
- @Override
- public FileBasedConfig openUserConfig (Config config, FS fs) {
- return instance.openUserConfig(config, fs);
- }
-
- @Override
- public FileBasedConfig openSystemConfig (Config config, FS fs) {
- return instance.openSystemConfig(config, fs);
- }
-
- @Override
- public long getCurrentTime () {
- return instance.getCurrentTime();
- }
-
- @Override
- public int getTimezone (long l) {
- return instance.getTimezone(l);
- }
-
- @Override
- public FileBasedConfig openJGitConfig(Config config, FS fs) {
- return instance.openJGitConfig(config, fs);
- }
- }
}
diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CommitTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CommitTest.java
index 8b7a37b7c1e7..5f0daafd16b0 100644
--- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CommitTest.java
+++ b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/CommitTest.java
@@ -643,9 +643,9 @@ public void testAmendCommit () throws Exception {
new GitUser("user2", "user2.email"), new GitUser("committer2", "committer2.email"), true, NULL_PROGRESS_MONITOR);
RevCommit amendedCommit = walk.parseCommit(repository.resolve(lastCommit.getRevision()));
assertEquals("Commit time should not change after amend", time, lastCommit.getCommitTime());
- assertEquals(originalCommit.getAuthorIdent().getWhen(), amendedCommit.getAuthorIdent().getWhen());
+ assertEquals(originalCommit.getAuthorIdent().getWhenAsInstant(), amendedCommit.getAuthorIdent().getWhenAsInstant());
// commit time should not equal.
- assertFalse(originalCommit.getCommitterIdent().getWhen().equals(amendedCommit.getCommitterIdent().getWhen()));
+ assertFalse(originalCommit.getCommitterIdent().getWhenAsInstant().equals(amendedCommit.getCommitterIdent().getWhenAsInstant()));
statuses = client.getStatus(new File[] { workDir }, NULL_PROGRESS_MONITOR);
assertStatus(statuses, workDir, newOne, true, GitStatus.Status.STATUS_NORMAL, GitStatus.Status.STATUS_NORMAL, GitStatus.Status.STATUS_NORMAL, false);
assertStatus(statuses, workDir, another, true, GitStatus.Status.STATUS_NORMAL, GitStatus.Status.STATUS_NORMAL, GitStatus.Status.STATUS_NORMAL, false);
@@ -693,7 +693,9 @@ public void testCherryPickCommit () throws Exception {
GitRevisionInfo commit = client.commit(new File[0], info.getFullMessage(), null, null, NULL_PROGRESS_MONITOR);
assertEquals(info.getAuthor(), commit.getAuthor());
assertEquals(info.getCommitTime(), commit.getCommitTime());
- assertEquals(Utils.findCommit(repository, info.getRevision()).getAuthorIdent().getWhen(),
- Utils.findCommit(repository, commit.getRevision()).getAuthorIdent().getWhen());
+ assertEquals(
+ Utils.findCommit(repository, info.getRevision()).getAuthorIdent().getWhenAsInstant(),
+ Utils.findCommit(repository, commit.getRevision()).getAuthorIdent().getWhenAsInstant()
+ );
}
}
diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/UpdateRefTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/UpdateRefTest.java
index a7bf170257c3..45f3f994a497 100644
--- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/UpdateRefTest.java
+++ b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/UpdateRefTest.java
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
+import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.ReflogReader;
import org.eclipse.jgit.lib.Repository;
import org.netbeans.libs.git.GitClient;
@@ -83,7 +84,9 @@ public void testMoveMergeCommit () throws Exception {
GitRefUpdateResult res = client.updateReference("master", info.getRevision(), NULL_PROGRESS_MONITOR);
assertEquals(GitRefUpdateResult.FAST_FORWARD, res);
- ReflogReader reflogReader = repository.getReflogReader("master");
+ Ref ref = repository.findRef("master");
+ assertNotNull(ref);
+ ReflogReader reflogReader = repository.getRefDatabase().getReflogReader(ref);
assertEquals("merge " + info.getRevision() + ": Fast-forward", reflogReader.getLastEntry().getComment());
}
@@ -104,7 +107,9 @@ public void testMoveMergeRef () throws Exception {
GitRefUpdateResult res = client.updateReference("master", "BRANCH", NULL_PROGRESS_MONITOR);
assertEquals(GitRefUpdateResult.FAST_FORWARD, res);
- ReflogReader reflogReader = repository.getReflogReader("master");
+ Ref ref = repository.findRef("master");
+ assertNotNull(ref);
+ ReflogReader reflogReader = repository.getRefDatabase().getReflogReader(ref);
assertEquals("merge BRANCH: Fast-forward", reflogReader.getLastEntry().getComment());
}
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list
index 120d358dcad3..3092aec0326c 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.
-792FF306EA46E2734624D5C9176BA9C6E092E43C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.0.0.202409031743-r
+0B53C4CF59B0A52E4E2C43E4FF096BBD8E389B30 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.2.0.202503040940-r
diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt
rename to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt
index b55c41809e1d..c2bafe0c19d4 100644
--- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt
+++ b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r-license.txt
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
-Version: 7.0.0.202409031743-r
+Version: 7.2.0.202503040940-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 7ce13b1d341b..0c90ca2c9765 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.0.0.202409031743-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
+release.external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-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 957730a30042..0ea5ac61f1d4 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.0.0.202409031743-r.jar
+ external/org.eclipse.jgit.gpg.bc-7.2.0.202503040940-r.jar
diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list
index b7d652770b4d..683b0496341f 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.
-95F28CA36011F9CBA2A95C9829B5844CF83D1493 org.eclipse.jgit:org.eclipse.jgit.lfs:7.0.0.202409031743-r
+21B6C0D03236D7889C80EBBD6B18FB79246F19D9 org.eclipse.jgit:org.eclipse.jgit.lfs:7.2.0.202503040940-r
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt
rename to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt
index b55c41809e1d..c2bafe0c19d4 100644
--- a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt
+++ b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.2.0.202503040940-r-license.txt
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
-Version: 7.0.0.202409031743-r
+Version: 7.2.0.202503040940-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 b2c501d75630..4a5317bb9bf9 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.0.0.202409031743-r.jar=modules/org-eclipse-jgit-lfs.jar
+release.external/org.eclipse.jgit.lfs-7.2.0.202503040940-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 f6e268341d16..7c104a574d63 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.0.0.202409031743-r.jar
+ external/org.eclipse.jgit.lfs-7.2.0.202503040940-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 e0771d4303a5..a94056289de2 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.
-44AD1B1124EC81AC0ACC2280E27B0239DFFEC41F org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.0.0.202409031743-r
+D80BF5D740F8A8E4731F75489E6A9226402E6A67 org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.2.0.202503040940-r
diff --git a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt
rename to ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt
index b55c41809e1d..c2bafe0c19d4 100644
--- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt
+++ b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r-license.txt
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
-Version: 7.0.0.202409031743-r
+Version: 7.2.0.202503040940-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 d7dd2ae0d338..5dd53be6d020 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.0.0.202409031743-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar
+release.external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-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 4ba3bea78477..cb8fd7ee7ed5 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.0.0.202409031743-r.jar
+ external/org.eclipse.jgit.ssh.jsch-7.2.0.202503040940-r.jar
diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list
index 8562411ce163..ebb4d377d365 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.
-E11135DED2F1F78DA9A028002AD7837CC970EE8E org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r
+8D9379845E9D37B58B187ABBAB2F7A6B63B59F65 org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r
diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt
rename to ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt
index b55c41809e1d..c2bafe0c19d4 100644
--- a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt
+++ b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.2.0.202503040940-r-license.txt
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
-Version: 7.0.0.202409031743-r
+Version: 7.2.0.202503040940-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 eece3c2c8e2d..1850affd5981 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.0.0.202409031743-r.jar=modules/org-eclipse-jgit.jar
+release.external/org.eclipse.jgit-7.2.0.202503040940-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 b98d07abbf0c..2f7f3cc80b10 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.0.0.202409031743-r.jar
+ external/org.eclipse.jgit-7.2.0.202503040940-r.jar
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index b6486a666282..2eae7494435c 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -56,7 +56,7 @@ extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/exter
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/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.0.0.202409031743-r.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
extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.9.9-bin.zip
extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar