diff --git a/.github/workflows/maven_build_itself.yml b/.github/workflows/maven_build_itself.yml
index 5f60f0d53c68..348f260d17a6 100644
--- a/.github/workflows/maven_build_itself.yml
+++ b/.github/workflows/maven_build_itself.yml
@@ -38,7 +38,7 @@ jobs:
cache: 'maven'
- name: Build with Maven
- run: mvn verify -e -B -V -DdistributionFileName=apache-maven
+ run: mvn install -e -B -V -DdistributionFileName=apache-maven
- name: Extract tarball
shell: bash
diff --git a/api/modello-plugin-velocity/pom.xml b/api/modello-plugin-velocity/pom.xml
index c6dfa26427c0..81467fb4c98c 100644
--- a/api/modello-plugin-velocity/pom.xml
+++ b/api/modello-plugin-velocity/pom.xml
@@ -34,6 +34,11 @@
+
+ org.codehaus.plexus
+ plexus-utils
+ 3.4.2
+
org.apache.maven.plugin-tools
maven-plugin-annotations
@@ -84,10 +89,6 @@
modello-plugin-xml
2.0.0
-
- org.codehaus.plexus
- plexus-utils
-
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index f7bb461e5ca5..25cb6b7b1100 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -34,7 +34,7 @@ under the License.
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index fcfca451fe62..0b8467f056f7 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -83,7 +83,7 @@ under the License.
javax.inject
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 1f8fcaa8a6e8..f64242b8c43a 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -131,7 +131,7 @@ under the License.
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 0acecee57087..dd02f9faad1d 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -84,6 +84,7 @@ under the License.
org.codehaus.plexus.util.xml.Xpp3Dom
+ org.codehaus.plexus.util.xml.Xpp3DomBuilder
org.codehaus.plexus.util.xml.pull.XmlPullParser
org.codehaus.plexus.util.xml.pull.XmlPullParserException
org.codehaus.plexus.util.xml.pull.XmlSerializer
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index ff0261624c54..2dd0ae2948eb 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -110,7 +110,7 @@ under the License.
javax.annotation-api
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index d5ef5244c7b9..d02648285979 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -40,7 +40,7 @@ under the License.
4.0.0-alpha-2-SNAPSHOT
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-model-transform/pom.xml b/maven-model-transform/pom.xml
index f45ce884cadb..a5d6dba0ba3e 100644
--- a/maven-model-transform/pom.xml
+++ b/maven-model-transform/pom.xml
@@ -31,7 +31,7 @@ under the License.
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d536b63321b8..8b486b20fca7 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -47,7 +47,7 @@ under the License.
org.eclipse.sisu.plexus
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 158758d612f7..de28c75505c3 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -35,7 +35,7 @@ under the License.
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 8a14e1d7ec7f..2cf2d3fe5b1c 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -71,7 +71,7 @@ under the License.
maven-resolver-impl
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 7dbd0110b7fc..6322e2cd9c28 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -54,7 +54,7 @@ under the License.
plexus-interpolation
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 20837cd235db..2220fee80213 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -45,7 +45,7 @@ under the License.
4.0.0-alpha-2-SNAPSHOT
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-toolchain-builder/pom.xml b/maven-toolchain-builder/pom.xml
index b14f60e6fcc2..88db09848ed7 100644
--- a/maven-toolchain-builder/pom.xml
+++ b/maven-toolchain-builder/pom.xml
@@ -46,7 +46,7 @@ under the License.
javax.inject
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
index 587fbd3340fd..c83f0723e2bc 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-model/pom.xml
@@ -44,7 +44,7 @@ under the License.
4.0.0-alpha-2-SNAPSHOT
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
diff --git a/plexus-utils/pom.xml b/plexus-utils/pom.xml
index 8c760edf326b..3cf03b9ee8e6 100644
--- a/plexus-utils/pom.xml
+++ b/plexus-utils/pom.xml
@@ -27,7 +27,7 @@ under the License.
4.0.0
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
4.0.0-alpha-2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 4a8b40ff0e0a..815d600c26c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@ under the License.
- org.codehaus.plexus
+ org.apache.maven
plexus-utils
${plexusUtilsVersion}