diff --git a/java/maven.embedder/external/apache-maven-3.8.4-bin-license.txt b/java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt
similarity index 99%
rename from java/maven.embedder/external/apache-maven-3.8.4-bin-license.txt
rename to java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt
index fa260faa20a8..7600e8c85761 100644
--- a/java/maven.embedder/external/apache-maven-3.8.4-bin-license.txt
+++ b/java/maven.embedder/external/apache-maven-3.8.5-bin-license.txt
@@ -1,9 +1,9 @@
 Name: Apache Maven Distribution
 Description: Apache Maven Distribution
-Version: 3.8.4
+Version: 3.8.5
 License: Apache-2.0
 Origin: Apache Software Foundation
-URL: http://maven.apache.org/
+URL: https://maven.apache.org/
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/java/maven.embedder/external/apache-maven-3.8.4-bin-notice.txt b/java/maven.embedder/external/apache-maven-3.8.5-bin-notice.txt
similarity index 98%
rename from java/maven.embedder/external/apache-maven-3.8.4-bin-notice.txt
rename to java/maven.embedder/external/apache-maven-3.8.5-bin-notice.txt
index 87b31c9b0a82..d4893656292f 100644
--- a/java/maven.embedder/external/apache-maven-3.8.4-bin-notice.txt
+++ b/java/maven.embedder/external/apache-maven-3.8.5-bin-notice.txt
@@ -1,6 +1,6 @@
 
 Apache Maven Distribution
-Copyright 2001-2021 The Apache Software Foundation
+Copyright 2001-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/java/maven.embedder/external/apache-maven-3.8.4-epl-license.txt b/java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt
similarity index 98%
rename from java/maven.embedder/external/apache-maven-3.8.4-epl-license.txt
rename to java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt
index e5249451a6be..6198edb66116 100644
--- a/java/maven.embedder/external/apache-maven-3.8.4-epl-license.txt
+++ b/java/maven.embedder/external/apache-maven-3.8.5-epl-license.txt
@@ -1,9 +1,9 @@
 Name: Apache Maven components under EPL v1.0
 Description: These Apache Maven components are under EPL v1.0: org.eclipse.sisu.inject-0.3.5.jar org.eclipse.sisu.plexus-0.3.5.jar
-Version: 3.8.4
+Version: 3.8.5
 License: Maven-EPL-v10
 Origin: Apache Software Foundation
-Files: apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/org.eclipse.sisu.plexus-0.3.5.jar
+Files: apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/org.eclipse.sisu.inject-0.3.5.jar apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/org.eclipse.sisu.plexus-0.3.5.jar
 
 Eclipse Public License - v 1.0
 
diff --git a/java/maven.embedder/external/apache-maven-3.8.4-slf4j-license.txt b/java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt
similarity index 94%
rename from java/maven.embedder/external/apache-maven-3.8.4-slf4j-license.txt
rename to java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt
index cb036615bdf2..b2be9548afa0 100644
--- a/java/maven.embedder/external/apache-maven-3.8.4-slf4j-license.txt
+++ b/java/maven.embedder/external/apache-maven-3.8.5-slf4j-license.txt
@@ -1,9 +1,9 @@
 Name: slf4j
 Description: Part of Apache Maven Distribution
-Version: 3.8.4
+Version: 3.8.5
 License: MIT-slf4j
 Origin: Apache Software Foundation
-Files: apache-maven-3.8.4-bin.zip!/apache-maven-3.8.4/lib/slf4j-api-1.7.32.jar
+Files: apache-maven-3.8.5-bin.zip!/apache-maven-3.8.5/lib/slf4j-api-1.7.32.jar
 
 Copyright (c) 2004-2017 QOS.ch
 All rights reserved.
diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list
index 693764916631..b38b7d408600 100644
--- a/java/maven.embedder/external/binaries-list
+++ b/java/maven.embedder/external/binaries-list
@@ -16,4 +16,4 @@
 # under the License.
 A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0
 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
-765515B57D2F525BCB682DE9EC702F1D8703E9B9 org.apache.maven:apache-maven:3.8.4:bin@zip
+CDAA301B41DE0E511E06540FA1B3BA1ABA12C0EB org.apache.maven:apache-maven:3.8.5:bin@zip
diff --git a/java/maven.embedder/external/binariesembedded-list b/java/maven.embedder/external/binariesembedded-list
index b51bd76d87b7..5d905080bdcd 100644
--- a/java/maven.embedder/external/binariesembedded-list
+++ b/java/maven.embedder/external/binariesembedded-list
@@ -24,26 +24,26 @@ FA13659F9128F4C011C8E1D06F137083B4876377;com.google.inject:guice:4.2.2:no_aop
 6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1
 32C060250BCC5282CDBC1FD7008C12EB4EBAD00E;org.slf4j:jcl-over-slf4j:1.7.32
 479C1E06DB31C432330183F5CAE684163F186146;javax.annotation:javax.annotation.api:1.2
-6DBA6D03AC7ABD8B895595B0EE7000CE35C3D421;org.apache.maven:maven-artifact:3.8.4
-19E7C1DD9AB8C3266DB19E067E2B7B8764F0FA6A;org.apache.maven:maven-builder-support:3.8.4
-B084A01A5E6D92AC83E64C1FEA25FC019E9EE125;org.apache.maven:maven-compat:3.8.4
-CB11BAC5ED848B900C2533D42AE8F23A73E6A015;org.apache.maven:maven-core:3.8.4
-5159D6F217F646FEF15648EAD95B536337F04CDB;org.apache.maven:maven-embedder:3.8.4
-71057054EA1E5E341B2196804A426E3243F6CB2E;org.apache.maven:maven-model:3.8.4
-8E039DB854CEE3DDBCA932B90C0C06CDCB9DC640;org.apache.maven:maven-model-builder:3.8.4
-699BF28A990398CAA3C7DC860476C409FE538036;org.apache.maven:maven-plugin-api:3.8.4
-C62113372F740797767D520F604D0543DCDFC92F;org.apache.maven:maven-repository-metadata:3.8.4
+4433F50C07DEBEFAED0553BD0068F4F48D449313;org.apache.maven:maven-artifact:3.8.5
+941DD5BBAAA1B2134510E7B3C6175911D0BBECCA;org.apache.maven:maven-builder-support:3.8.5
+EE6A51897E7D1E4A0BD03A1B67124EE210A6D100;org.apache.maven:maven-compat:3.8.5
+404E410171F1139D79425C3B1DDDBBA5B2D81A99;org.apache.maven:maven-core:3.8.5
+8B65C02E38CDC3458503D469167DC626C189791F;org.apache.maven:maven-embedder:3.8.5
+A22C2ED76CBD2F78120D9C653F89E15123D473FE;org.apache.maven:maven-model:3.8.5
+D719E354056FCF486CD2300CCE3D1A422349FD38;org.apache.maven:maven-model-builder:3.8.5
+13CDD6E6C4DF758065E1E367E9E60A3A6C622E7B;org.apache.maven:maven-plugin-api:3.8.5
+A9CF3FF3E565DEDD8231C05F4CCB6B61E6215A82;org.apache.maven:maven-repository-metadata:3.8.5
 5EE235AA5AC5994B5DC847F8E78FFE9D77DD55D7;org.apache.maven.resolver:maven-resolver-api:1.6.3
 D1C8F8E30C2AAE85330E21329D42D7E7F12A7CC3;org.apache.maven.resolver:maven-resolver-connector-basic:1.6.3
 2714FFE60BD71259A41B3E4816122504B5F2DB93;org.apache.maven.resolver:maven-resolver-impl:1.6.3
-2CCBD1E2C713922353CCD779E56AEEFC7A9FA56F;org.apache.maven:maven-resolver-provider:3.8.4
+91F423A4584F2FC7F45CAC5B0B58EDC33C077249;org.apache.maven:maven-resolver-provider:3.8.5
 176425F73FE768BF9CDB8B5A742E7A00C1D8D178;org.apache.maven.resolver:maven-resolver-spi:1.6.3
 7BEC7BC7F6C71A0A793EF355CC908BFAA3DD5F6D;org.apache.maven.resolver:maven-resolver-transport-wagon:1.6.3
 07D5A6879037B34C61C2F527DFCFB59084E86ED0;org.apache.maven.resolver:maven-resolver-util:1.6.3
-ECE24EC40B7D73E755F2EBD22BF8471B6C0B8FBD;org.apache.maven:maven-settings:3.8.4
-50BF143B0E338A26651970860E3067DD94CF31AA;org.apache.maven:maven-settings-builder:3.8.4
+A684F5BA0B738448CEED64894D0789442B11DF8F;org.apache.maven:maven-settings:3.8.5
+B15BFE81E7EDCB140A3D19B305A7CB4B9F32B758;org.apache.maven:maven-settings-builder:3.8.5
 F87A61ADB1E12A00DCC6CC6005A51E693AA7C4AC;org.apache.maven.shared:maven-shared-utils:3.3.4
-5B4DBD3CF0B14038766A6E915D75646C6D396E5B;org.apache.maven:maven-slf4j-provider:3.8.4
+3E2B8D52E22D45FC6D98E488DCE4C24DDCB37B94;org.apache.maven:maven-slf4j-provider:3.8.5
 D4265DD4F0F1D7A06D80DF5A5F475D5FF9C17140;org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
 D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
 425EA8E534716B4BFF1EA90F39BD76BE951D651B;org.codehaus.plexus:plexus-cipher:2.0
@@ -53,6 +53,6 @@ D71996BB2E536F966B3B70E647067FFF3B73D32F;org.eclipse.sisu:org.eclipse.sisu.plexu
 F89C5080614FFD0764E49861895DBEDDE1B47237;org.codehaus.plexus:plexus-sec-dispatcher:2.0
 CF43B5391DE623B36FE066A21127BAEF82C64022;org.codehaus.plexus:plexus-utils:3.3.0
 CDCFF33940D9F2DE763BC41EA05A0BE5941176C3;org.slf4j:slf4j-api:1.7.32
-85876A5672B78AA2E817EEE495239CDDD7B598E7;org.apache.maven.wagon:wagon-file:3.4.3
-FAF4DE1C28C670B22F25705A20DB3E8EE323FB04;org.apache.maven.wagon:wagon-http:3.4.3:shaded
-35AEA87712379DB1844B2001AA644D709EA46877;org.apache.maven.wagon:wagon-provider-api:3.4.3
+292E503E558E6758FC3A6D26A80B46017D4FEDEA;org.apache.maven.wagon:wagon-file:3.5.1
+06F1CF071AFB2D3B1190D7EF047E24F7C3EDFF11;org.apache.maven.wagon:wagon-http:3.5.1:shaded
+118E63F22D05B14535451933AE207BE47EC45D91;org.apache.maven.wagon:wagon-provider-api:3.5.1
diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties
index aaeca8f28b04..79118818de39 100644
--- a/java/maven.embedder/nbproject/project.properties
+++ b/java/maven.embedder/nbproject/project.properties
@@ -20,7 +20,7 @@ javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 release.external/jdom-1.0.jar=modules/ext/maven/jdom-1.0.jar
 release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar
-bundled.maven=apache-maven-3.8.4
+bundled.maven=apache-maven-3.8.5
 extra.module.files=maven/
 nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp
 extra.license.files=${cluster}/maven/LICENSE.txt,${cluster}/maven/NOTICE.txt
diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml
index 4cdbc3010cc3..19420224378c 100644
--- a/java/maven.embedder/nbproject/project.xml
+++ b/java/maven.embedder/nbproject/project.xml
@@ -312,31 +312,31 @@
                 <runtime-relative-path>../maven/lib/jcl-over-slf4j-1.7.32.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-artifact-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-artifact-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-builder-support-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-builder-support-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-compat-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-compat-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-core-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-core-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-embedder-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-embedder-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-model-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-model-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-model-builder-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-model-builder-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-plugin-api-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-repository-metadata-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/maven-resolver-api-1.6.3.jar</runtime-relative-path>
@@ -348,7 +348,7 @@
                 <runtime-relative-path>../maven/lib/maven-resolver-impl-1.6.3.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-resolver-provider-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-resolver-provider-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/maven-resolver-spi-1.6.3.jar</runtime-relative-path>
@@ -360,16 +360,16 @@
                 <runtime-relative-path>../maven/lib/maven-resolver-util-1.6.3.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-settings-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-settings-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-settings-builder-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/maven-shared-utils-3.3.4.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.8.4.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/maven-slf4j-provider-3.8.5.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>../maven/lib/org.eclipse.sisu.inject-0.3.5.jar</runtime-relative-path>
@@ -396,13 +396,13 @@
                 <runtime-relative-path>../maven/lib/slf4j-api-1.7.32.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/wagon-file-3.4.3.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/wagon-file-3.5.1.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/wagon-http-3.4.3-shaded.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/wagon-http-3.5.1-shaded.jar</runtime-relative-path>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>../maven/lib/wagon-provider-api-3.4.3.jar</runtime-relative-path>
+                <runtime-relative-path>../maven/lib/wagon-provider-api-3.5.1.jar</runtime-relative-path>
             </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 14fb118eed39..1feebdb0167a 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -29,8 +29,8 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav
 # It happens that maven 3.3.9 uses commons-lang-2.6.jar, same as o.apache.commons.lang
 # and commons-io-2.5.jar, same as java.lsp.server
 # These are used independently, different functional goals
-# maven 3.8.4 use common-io-2.6 java/java.lsp.server/external/commons-io-2.5.jar java/maven.embedder/external/apache-maven-3.6.3-bin.zip
-platform/o.apache.commons.io/external/commons-io-2.6.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
+# maven 3.8.5 use common-io-2.6 java/java.lsp.server/external/commons-io-2.5.jar java/maven.embedder/external/apache-maven-3.6.3-bin.zip
+platform/o.apache.commons.io/external/commons-io-2.6.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip
 
 # Contains test data (badPackageFileInJar.jar is packaged twice) - this is an
 # upstream problem
@@ -50,9 +50,9 @@ webcommon/javascript2.jade/external/jflex-1.4.3.jar webcommon/javascript2.lexer/
 enterprise/javaee.api/external/javax.annotation-api-1.2.jar java/maven.indexer/external/javax.annotation-api-1.2.jar
 enterprise/javaee7.api/external/javax.annotation-api-1.2.jar enterprise/javaee8.api/external/javax.annotation-api-1.2.jar
 enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.indexer/external/javax.annotation-api-1.2.jar
-enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
-enterprise/javaee7.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
-java/maven.indexer/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
+enterprise/javaee8.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip
+enterprise/javaee7.api/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip
+java/maven.indexer/external/javax.annotation-api-1.2.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip
 
 
 # jaxb-api-osgi is used by multiple modules.
@@ -78,7 +78,7 @@ extide/gradle/external/gradle-7.4-bin.zip ide/libs.antlr4.runtime/external/antlr
 extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.21.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-5.7.0.202003110725-r.jar
-extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.8.4-bin.zip
+extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.8.5-bin.zip
 extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
 extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar
 extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar
@@ -124,4 +124,4 @@ java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-api.jar java/libs.nbjavacapi/
 java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga.jar java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga.jar
 
 # Maven and Gradle are self-contained distributions - ignoring overlaps
-platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
+platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.5-bin.zip