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 d62113772e Clean up dependencies versions (#1300)
d62113772e is described below
commit d62113772e60e502f709ffacb0399d48a3a9dcd9
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Nov 17 16:31:11 2023 +0100
Clean up dependencies versions (#1300)
---
maven-core/pom.xml | 2 ++
maven-model-builder/pom.xml | 10 ++++----
pom.xml | 59 ++++++++++++++++++++++++++-------------------
3 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 1805515068..6a08adbdea 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -139,6 +139,8 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 4ff0becbc5..23c8c353d0 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -92,18 +92,18 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
+ <artifactId>xmlunit-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index dd21b95578..722d4e142c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,33 +147,42 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
+
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+ <maven.baseline>3.8.7</maven.baseline>
+ <!-- Control the name of the distribution and information output by mvn -->
+ <distributionId>apache-maven</distributionId>
+ <distributionShortName>Maven</distributionShortName>
+ <distributionName>Apache Maven</distributionName>
+ <maven.site.path>ref/4-LATEST</maven.site.path>
+
<project.build.outputTimestamp>2023-10-20T19:20:23Z</project.build.outputTimestamp>
+ <!-- various versions -->
+ <asmVersion>9.6</asmVersion>
+ <byteBuddyVersion>1.14.9</byteBuddyVersion>
+ <cipherVersion>2.0</cipherVersion>
<classWorldsVersion>2.6.0</classWorldsVersion>
<commonsCliVersion>1.5.0</commonsCliVersion>
<commonsIoVersion>2.11.0</commonsIoVersion>
- <junitVersion>5.10.1</junitVersion>
- <mockitoVersion>5.7.0</mockitoVersion>
- <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
- <plexusXmlVersion>4.0.1</plexusXmlVersion>
<guiceVersion>5.1.0</guiceVersion>
<guavaVersion>32.0.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
- <wagonVersion>3.5.3</wagonVersion>
- <securityDispatcherVersion>2.0</securityDispatcherVersion>
- <cipherVersion>2.0</cipherVersion>
+ <hamcrestVersion>2.2</hamcrestVersion>
+ <jansiVersion>2.4.1</jansiVersion>
+ <javaxAnnotationApiVersion>1.3.2</javaxAnnotationApiVersion>
+ <junitVersion>5.10.1</junitVersion>
<jxpathVersion>1.3</jxpathVersion>
+ <logbackClassicVersion>1.2.11</logbackClassicVersion>
+ <mockitoVersion>5.7.0</mockitoVersion>
+ <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
+ <plexusTestingVersion>1.0.0</plexusTestingVersion>
+ <plexusXmlVersion>4.0.1</plexusXmlVersion>
<resolverVersion>2.0.0-alpha-1</resolverVersion>
+ <securityDispatcherVersion>2.0</securityDispatcherVersion>
<sisuVersion>0.9.0.M2</sisuVersion>
- <asmVersion>9.6</asmVersion>
<slf4jVersion>1.7.36</slf4jVersion>
+ <stax2ApiVersion>4.2.1</stax2ApiVersion>
+ <wagonVersion>3.5.3</wagonVersion>
+ <woodstoxVersion>6.5.1</woodstoxVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
-
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <maven.baseline>3.8.7</maven.baseline>
- <!-- Control the name of the distribution and information output by mvn -->
- <distributionId>apache-maven</distributionId>
- <distributionShortName>Maven</distributionShortName>
- <distributionName>Apache Maven</distributionName>
- <maven.site.path>ref/4-LATEST</maven.site.path>
-
<project.build.outputTimestamp>2023-10-20T19:20:23Z</project.build.outputTimestamp>
</properties>
<!--bootstrap-start-comment-->
@@ -291,7 +300,7 @@ under the License.
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <version>${javaxAnnotationApiVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -306,7 +315,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>2.4.1</version>
+ <version>${jansiVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -322,7 +331,7 @@ under the License.
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.11</version>
+ <version>${logbackClassicVersion}</version>
<optional>true</optional>
</dependency>
<!-- Wagon -->
@@ -416,12 +425,12 @@ under the License.
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>6.5.1</version>
+ <version>${woodstoxVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>4.2.1</version>
+ <version>${stax2ApiVersion}</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
@@ -444,19 +453,19 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>2.2</version>
+ <version>${hamcrestVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>2.2</version>
+ <version>${hamcrestVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-testing</artifactId>
- <version>1.0.0</version>
+ <version>${plexusTestingVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -476,7 +485,7 @@ under the License.
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.9</version>
+ <version>${byteBuddyVersion}</version>
</dependency>
</dependencies>
<!--bootstrap-start-comment-->
