You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/15 12:51:03 UTC
[maven-release] 01/02: [MRELEASE-1084] Upgrade Maven to 3.5.4
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1084
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit e85c7fa9b1dfb4f6fe508aa4e3200c9df7c89821
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Apr 15 12:54:36 2022 +0200
[MRELEASE-1084] Upgrade Maven to 3.5.4
---
maven-release-api/pom.xml | 6 +++---
maven-release-manager/pom.xml | 12 ++++++------
maven-release-policies/maven-release-oddeven-policy/pom.xml | 6 +++---
pom.xml | 3 ++-
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index a801ea9b..327a5ddb 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -53,9 +53,9 @@
<artifactId>maven-settings</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.0.0.v20140518</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
<optional>true</optional>
</dependency>
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index bca2eee5..8e5f6d99 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -163,15 +163,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
- <version>1.7</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-file</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <version>1.7</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-wagon</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-release-policies/maven-release-oddeven-policy/pom.xml b/maven-release-policies/maven-release-oddeven-policy/pom.xml
index 896d8cb6..5cba8116 100644
--- a/maven-release-policies/maven-release-oddeven-policy/pom.xml
+++ b/maven-release-policies/maven-release-oddeven-policy/pom.xml
@@ -47,9 +47,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.0.0.v20140518</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/pom.xml b/pom.xml
index decab804..77b81ad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,8 @@
<properties>
<scmVersion>1.12.2</scmVersion>
<javaVersion>8</javaVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.5.4</mavenVersion>
+ <resolverVersion>1.1.1</resolverVersion>
<maven.site.path>maven-release-archives/maven-release-LATEST</maven.site.path>
<project.build.outputTimestamp>2022-01-02T10:18:49Z</project.build.outputTimestamp>
</properties>