You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/05/02 19:41:58 UTC
[maven-scm] branch master updated: [SCM-978] Upgrade Maven to 3.2.5 (#136)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new fd09d024 [SCM-978] Upgrade Maven to 3.2.5 (#136)
fd09d024 is described below
commit fd09d024180ea6adfdf195504dbb75c02c93d4d3
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon May 2 21:41:53 2022 +0200
[SCM-978] Upgrade Maven to 3.2.5 (#136)
This closes #136
---
maven-scm-plugin/pom.xml | 23 +++++++++++++----------
maven-scm-plugin/src/it/scm-781/pom.xml | 16 ----------------
2 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index 3cac2d6b..e6941441 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -41,7 +41,7 @@
<description>Maven Plugin that allows accessing different SCMs.</description>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
</properties>
<prerequisites>
@@ -51,18 +51,21 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
+ <artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
@@ -119,7 +122,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,11 +130,11 @@
<artifactId>maven-scm-provider-svntest</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-gittest</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gittest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/maven-scm-plugin/src/it/scm-781/pom.xml b/maven-scm-plugin/src/it/scm-781/pom.xml
index 12838979..77810159 100644
--- a/maven-scm-plugin/src/it/scm-781/pom.xml
+++ b/maven-scm-plugin/src/it/scm-781/pom.xml
@@ -29,10 +29,6 @@ under the License.
<artifactId>simple</artifactId>
<version>1.0-yolo-SNAPSHOT</version>
- <properties>
- <maven.scm.provider.svn.implementation>javasvn</maven.scm.provider.svn.implementation>
- </properties>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk</connection>
<developerConnection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk</developerConnection>
@@ -45,18 +41,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <version>1.8.11</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>