From 35dcd5c717a0845f46f1350d947a50d82cfff83c Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Mon, 2 May 2022 21:41:53 +0200
Subject: [PATCH] [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 324ab1a96..37b7a5a6d 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 128389793..77810159d 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>