This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 10487d7b5d [MNG-7820] Get rid of plexus-utils (#1255)
10487d7b5d is described below
commit 10487d7b5d6f9b44fd278f10868337644665d342
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Sep 22 10:59:31 2023 +0200
[MNG-7820] Get rid of plexus-utils (#1255)
---
maven-core/pom.xml | 14 +++++---------
.../src/test/resources-project-builder/foo/sub/pom.xml | 4 ----
maven-model-builder/pom.xml | 4 ----
maven-plugin-api/pom.xml | 10 ++++++----
maven-resolver-provider/pom.xml | 4 ----
maven-settings-builder/pom.xml | 4 ----
maven-toolchain-builder/pom.xml | 4 ----
maven-xml-impl/pom.xml | 6 ++++++
pom.xml | 8 --------
9 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f62bb41bc3..87484b5a6b 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -103,6 +103,11 @@ under the License.
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
@@ -126,10 +131,6 @@ under the License.
<artifactId>javax.inject</artifactId>
</dependency>
<!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
@@ -148,11 +149,6 @@ under the License.
<artifactId>commons-jxpath</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
index 4217dcfc5a..8d917d1085 100644
--- a/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
@@ -36,10 +36,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 35efe28000..1c6269ddfc 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -44,10 +44,6 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index a7b982f479..d236d4a7a9 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -43,10 +43,12 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index c15c8e582f..decd6d879d 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -68,10 +68,6 @@ under the License.
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index a6b02581f5..28fc1e56cc 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -51,10 +51,6 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
diff --git a/maven-toolchain-builder/pom.xml b/maven-toolchain-builder/pom.xml
index 591f793933..1d8642fcef 100644
--- a/maven-toolchain-builder/pom.xml
+++ b/maven-toolchain-builder/pom.xml
@@ -43,10 +43,6 @@ under the License.
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
diff --git a/maven-xml-impl/pom.xml b/maven-xml-impl/pom.xml
index 9dc43deede..874d354fc3 100644
--- a/maven-xml-impl/pom.xml
+++ b/maven-xml-impl/pom.xml
@@ -38,6 +38,12 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/pom.xml b/pom.xml
index 5c93937fc0..95ba29dc52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,11 +150,9 @@ under the License.
<classWorldsVersion>2.6.0</classWorldsVersion>
<commonsCliVersion>1.5.0</commonsCliVersion>
<commonsIoVersion>2.11.0</commonsIoVersion>
- <commonsLangVersion>3.12.0</commonsLangVersion>
<junitVersion>5.9.1</junitVersion>
<mockitoVersion>4.11.0</mockitoVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
- <plexusUtilsVersion>4.0.0</plexusUtilsVersion>
<plexusXmlVersion>4.0.1</plexusXmlVersion>
<guiceVersion>5.1.0</guiceVersion>
<guavaVersion>32.0.1-jre</guavaVersion>
@@ -202,12 +200,6 @@ under the License.
<version>${project.version}</version>
</dependency>
<!--bootstrap-end-comment-->
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexusUtilsVersion}</version>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
