diff --git a/ide/git/nbproject/project.properties b/ide/git/nbproject/project.properties
index 9df54b91c688..890fc749dcb7 100644
--- a/ide/git/nbproject/project.properties
+++ b/ide/git/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 javac.compilerargs=-Xlint:unchecked
-javac.release=11
+javac.release=17
 nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main
 nbm.module.author=Ondrej Vrabec
 nbm.needs.restart=true
diff --git a/ide/libs.git/nbproject/project.properties b/ide/libs.git/nbproject/project.properties
index c68c4b0c9b13..3e357208e514 100644
--- a/ide/libs.git/nbproject/project.properties
+++ b/ide/libs.git/nbproject/project.properties
@@ -17,7 +17,7 @@
 
 is.autoload=true
 
-javac.release=11
+javac.release=17
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list
index 56b76abd1127..120d358dcad3 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.
-B957A281EF7E8C6578601F6327BB12F7C5C2C17C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:6.10.0.202406032230-r
+792FF306EA46E2734624D5C9176BA9C6E092E43C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.0.0.202409031743-r
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt
rename to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt
index a9e04ec8dd7d..b55c41809e1d 100644
--- a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt
+++ b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r-license.txt
@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 6.10.0.202406032230-r
+Version: 7.0.0.202409031743-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 8a3e1b3257e2..7ce13b1d341b 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-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
+release.external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-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 556c829aca97..957730a30042 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 @@
             <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-6.10.0.202406032230-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list
index 0f7c5ac56ac6..b7d652770b4d 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.
-10F9FEEBA165C96C899B0181A1ECA7AE18B7DA81 org.eclipse.jgit:org.eclipse.jgit.lfs:6.10.0.202406032230-r
+95F28CA36011F9CBA2A95C9829B5844CF83D1493 org.eclipse.jgit:org.eclipse.jgit.lfs:7.0.0.202409031743-r
diff --git a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt
rename to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt
index a9e04ec8dd7d..b55c41809e1d 100644
--- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt
+++ b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.0.0.202409031743-r-license.txt
@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 6.10.0.202406032230-r
+Version: 7.0.0.202409031743-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 e3c10a2ead9b..b2c501d75630 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-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-lfs.jar
+release.external/org.eclipse.jgit.lfs-7.0.0.202409031743-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 89fd17b3a6bc..f6e268341d16 100644
--- a/ide/o.eclipse.jgit.lfs/nbproject/project.xml
+++ b/ide/o.eclipse.jgit.lfs/nbproject/project.xml
@@ -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-6.10.0.202406032230-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.lfs-7.0.0.202409031743-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list b/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list
index 78f338052ff9..e0771d4303a5 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.
-B6A43BB49E2BD61F5BB0A1DBAE1D8F7883B2BA9D org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.10.0.202406032230-r
+44AD1B1124EC81AC0ACC2280E27B0239DFFEC41F org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.0.0.202409031743-r
diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt
rename to ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt
index a9e04ec8dd7d..b55c41809e1d 100644
--- a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt
+++ b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r-license.txt
@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 6.10.0.202406032230-r
+Version: 7.0.0.202409031743-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 a27cd0e0cbc0..d7dd2ae0d338 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-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar
+release.external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-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 761515bf2097..4ba3bea78477 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 @@
             <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-6.10.0.202406032230-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list
index 17b8c009e7a4..8562411ce163 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.
-E1166B8B313939890F29A5C611614B67E396B07E org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r
+E11135DED2F1F78DA9A028002AD7837CC970EE8E org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r
diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt
similarity index 99%
rename from ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt
rename to ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt
index a9e04ec8dd7d..b55c41809e1d 100644
--- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt
+++ b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r-license.txt
@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 6.10.0.202406032230-r
+Version: 7.0.0.202409031743-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 99a7a099b627..eece3c2c8e2d 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-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit.jar
+release.external/org.eclipse.jgit-7.0.0.202409031743-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 ddc48797cf81..b98d07abbf0c 100644
--- a/ide/o.eclipse.jgit/nbproject/project.xml
+++ b/ide/o.eclipse.jgit/nbproject/project.xml
@@ -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-6.10.0.202406032230-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit-7.0.0.202409031743-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index f899cb811ddd..db8d69b733cf 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.16.1.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 ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar
 java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/c.google.guava/external/guava-33.2.1-jre.jar
 java/maven.embedder/external/apache-maven-3.9.9-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar
@@ -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-6.10.0.202406032230-r.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 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
diff --git a/platform/o.apache.commons.codec/build.xml b/platform/o.apache.commons.codec/build.xml
index 9015d071cca8..c617e69a6d02 100644
--- a/platform/o.apache.commons.codec/build.xml
+++ b/platform/o.apache.commons.codec/build.xml
@@ -22,12 +22,12 @@
 <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.17.0.jar" property="o.apache.commons.codec.crc32" />
+        <FileCRC32Calculator file="external/commons-codec-1.17.1.jar" property="o.apache.commons.codec.crc32" />
         <jar jarfile="${cluster}/${module.jar}">
-            <zipfileset src="external/commons-codec-1.17.0.jar"/>
+            <zipfileset src="external/commons-codec-1.17.1.jar"/>
             <manifest>
                 <attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/>
-                <attribute name="Bundle-Version" value="1.17.0"/>
+                <attribute name="Bundle-Version" value="1.17.1"/>
                 <attribute name="Export-Package" value="org.apache.commons.codec;version=&quot;1.17.0&quot;,org.apache.commons.codec.binary;version=&quot;1.17.0&quot;,org.apache.commons.codec.digest;version=&quot;1.17.0&quot;,org.apache.commons.codec.language;version=&quot;1.17.0&quot;,org.apache.commons.codec.net;version=&quot;1.17.0&quot;"/>
                 <attribute name="NB-Original-CRC" value="${o.apache.commons.codec.crc32}"/>
             </manifest>
diff --git a/platform/o.apache.commons.codec/external/binaries-list b/platform/o.apache.commons.codec/external/binaries-list
index f22d53f6ccf4..1141cdbc62b7 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.
-0DBE8EEF6E14460E73DA07F7B11BF994D6626355 commons-codec:commons-codec:1.17.0
+973638B7149D333563584137EBF13A691BB60579 commons-codec:commons-codec:1.17.1
diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt b/platform/o.apache.commons.codec/external/commons-codec-1.17.1-license.txt
similarity index 99%
rename from platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt
rename to platform/o.apache.commons.codec/external/commons-codec-1.17.1-license.txt
index 955633fa4d92..f363a26c6ee3 100644
--- a/platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt
+++ b/platform/o.apache.commons.codec/external/commons-codec-1.17.1-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.0
+Version: 1.17.1
 License: Apache-2.0
 
                                  Apache License
diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.17.0-notice.txt b/platform/o.apache.commons.codec/external/commons-codec-1.17.1-notice.txt
similarity index 100%
rename from platform/o.apache.commons.codec/external/commons-codec-1.17.0-notice.txt
rename to platform/o.apache.commons.codec/external/commons-codec-1.17.1-notice.txt
diff --git a/platform/o.apache.commons.codec/nbproject/project.xml b/platform/o.apache.commons.codec/nbproject/project.xml
index 894b9e5b9450..f455656c024f 100644
--- a/platform/o.apache.commons.codec/nbproject/project.xml
+++ b/platform/o.apache.commons.codec/nbproject/project.xml
@@ -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.17.0.jar</binary-origin>
+                <binary-origin>external/commons-codec-1.17.1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>