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:02 UTC
[maven-release] branch MRELEASE-1084 updated (606f4c83 -> d77a9f91)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRELEASE-1084
in repository https://gitbox.apache.org/repos/asf/maven-release.git
omit 606f4c83 change package name
omit a9d90c0a [MRELEASE-1084] Upgrade Maven to 3.5.4
add 8477434e Remove unused commons-io
new e85c7fa9 [MRELEASE-1084] Upgrade Maven to 3.5.4
new d77a9f91 change package name
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (606f4c83)
\
N -- N -- N refs/heads/MRELEASE-1084 (d77a9f91)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-release-manager/pom.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
[maven-release] 01/02: [MRELEASE-1084] Upgrade Maven to 3.5.4
Posted by mi...@apache.org.
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>
[maven-release] 02/02: change package name
Posted by mi...@apache.org.
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 d77a9f91e84e4fd248f2d09dcc392839d80fda03
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Apr 15 12:57:07 2022 +0200
change package name
---
.../maven/shared/release/phase/AbstractReleaseTestCase.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 989fad22..7a6bb629 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -61,9 +61,9 @@ import org.apache.maven.project.ProjectSorter;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.repository.WorkspaceReader;
-import org.sonatype.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Comparison;
import org.xmlunit.diff.ComparisonResult;
@@ -387,7 +387,7 @@ public abstract class AbstractReleaseTestCase
}
@Override
- public List<String> findVersions( org.sonatype.aether.artifact.Artifact artifact )
+ public List<String> findVersions( org.eclipse.aether.artifact.Artifact artifact )
{
for ( MavenProject mavenProject : reactorProjects )
{
@@ -400,7 +400,7 @@ public abstract class AbstractReleaseTestCase
}
@Override
- public File findArtifact( org.sonatype.aether.artifact.Artifact artifact )
+ public File findArtifact( org.eclipse.aether.artifact.Artifact artifact )
{
for ( MavenProject mavenProject : reactorProjects )
{