Skip to content

Commit

Permalink
[SCM-978] Upgrade Maven to 3.2.5 (#136)
Browse files Browse the repository at this point in the history
This closes #136
  • Loading branch information
cstamas authored and michael-o committed May 19, 2022
1 parent 0f8b375 commit 35dcd5c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 26 deletions.
23 changes: 13 additions & 10 deletions maven-scm-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -119,19 +122,19 @@
<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>
<groupId>org.apache.maven.scm</groupId>
<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>
Expand Down
16 changes: 0 additions & 16 deletions maven-scm-plugin/src/it/scm-781/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 35dcd5c

Please sign in to comment.