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/07/30 20:48:14 UTC
[maven-release] branch MRELEASE-1094 updated (efba256f -> 6e3e61a3)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRELEASE-1094
in repository https://gitbox.apache.org/repos/asf/maven-release.git
omit efba256f [MRELEASE-1094] Clean up dependencies
add a197ada6 [MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2
new 6e3e61a3 [MRELEASE-1094] Clean up dependencies
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 (efba256f)
\
N -- N -- N refs/heads/MRELEASE-1094 (6e3e61a3)
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 1 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 | 5 +++++
.../java/org/apache/maven/shared/release/stubs/ScmManagerStub.java | 2 --
.../java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java | 6 +++---
.../org/apache/maven/scm/provider/stub/StubCheckOutCommand.java | 6 +++---
.../java/org/apache/maven/scm/provider/stub/StubScmProvider.java | 4 +---
.../java/org/apache/maven/scm/provider/stub/StubTagCommand.java | 6 +++---
pom.xml | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
[maven-release] 01/01: [MRELEASE-1094] Clean up dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1094
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 6e3e61a337121169dc4f73e43b28aa9c8ebe866d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 28 23:46:48 2022 +0200
[MRELEASE-1094] Clean up dependencies
This closes #144
---
maven-release-api/pom.xml | 14 +++++++--
maven-release-manager/pom.xml | 34 +++++++++++++---------
maven-release-plugin/pom.xml | 13 ++++++---
.../maven-release-oddeven-policy/pom.xml | 10 ++-----
pom.xml | 6 ++++
5 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index 5c9dcc56..18f56ba7 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -30,7 +30,7 @@
<name>Maven Release APIs</name>
<description>APIs to implement to extend maven-release-plugin.</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -52,20 +52,28 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 147dc240..8b4a7ba8 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -37,7 +37,6 @@
<artifactId>maven-release-api</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
@@ -74,6 +73,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -86,6 +89,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -118,11 +125,6 @@
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- </dependency>
-
<!-- scm dependencies -->
<dependency>
@@ -146,14 +148,8 @@
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.3.4</version>
</dependency>
<dependency>
@@ -198,6 +194,16 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 6f4fcefe..a8be8ff9 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -39,6 +39,11 @@
</prerequisites>
<dependencies>
+ <dependency>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
@@ -64,6 +69,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
@@ -72,10 +81,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- </dependency>
<!-- verified with ITs -->
<dependency>
diff --git a/maven-release-policies/maven-release-oddeven-policy/pom.xml b/maven-release-policies/maven-release-oddeven-policy/pom.xml
index a34829f4..835c6a93 100644
--- a/maven-release-policies/maven-release-oddeven-policy/pom.xml
+++ b/maven-release-policies/maven-release-oddeven-policy/pom.xml
@@ -51,14 +51,8 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <scope>compile</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 536335d9..9ba681be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,12 @@
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>