[MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2

This closes #143
apache · Jul 28, 2022 · a197ada · a197ada
1 parent 3163f27
commit a197ada
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/...n-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java b/...n-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import javax.inject.Named;
 import javax.inject.Singleton;
 
 import java.util.HashMap;
@@ -34,7 +33,6 @@
  * Override the makeRepository methods to honour the URL passed in.
  */
 @Singleton
-@Named( "default" )
 @Priority( 100 )
 public class ScmManagerStub
         extends org.apache.maven.scm.manager.ScmManagerStub

diff --git a/...cm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java b/...cm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java
@@ -38,7 +38,7 @@
 
 /**
  * A dummy check-in command.
- * 
+ *
  * @author Benjamin Bentmann
  */
 class StubCheckInCommand
@@ -58,7 +58,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
             File workingCopyRoot = stubRepo.getWorkingCopyRoot( fileSet );
             File repoRoot = stubRepo.getRoot();
 
-            getLogger().info( "Committing: " + workingCopyRoot + " > " + repoRoot );
+            logger.info( "Committing: " + workingCopyRoot + " > " + repoRoot );
 
             List paths = stubRepo.getPaths( workingCopyRoot, fileSet );
 
@@ -68,7 +68,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
                 File srcFile = new File( workingCopyRoot, path );
                 File dstFile = new File( repoRoot, path );
 
-                getLogger().info( "  " + path );
+                logger.info( "  " + path );
 
                 if ( dstFile.isDirectory() )
                 {

diff --git a/...m-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java b/...m-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java
@@ -42,7 +42,7 @@
 
 /**
  * A dummy check-out command.
- * 
+ *
  * @author Benjamin Bentmann
  */
 class StubCheckOutCommand
@@ -75,7 +75,7 @@ else if ( version instanceof ScmBranch )
                 revRoot = stubRepo.getRoot();
             }
 
-            getLogger().info( "Checking out: " + revRoot + " > " + workingCopyRoot );
+            logger.info( "Checking out: " + revRoot + " > " + workingCopyRoot );
 
             if ( workingCopyRoot.isFile() )
             {
@@ -100,7 +100,7 @@ else if ( version instanceof ScmBranch )
                 File srcFile = new File( revRoot, path );
                 File dstFile = new File( workingCopyRoot, path );
 
-                getLogger().info( "  " + path );
+                logger.info( "  " + path );
 
                 if ( srcFile.isDirectory() )
                 {

diff --git a/...n-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java b/...n-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
@@ -38,7 +38,7 @@
 
 /**
  * A stub SCM provider used for the Maven Release Plugin when doing integration testing.
- * 
+ *
  * @author Benjamin Bentmann
  */
 @Singleton
@@ -62,8 +62,6 @@ protected ScmResult executeCommand( Command command, ScmProviderRepository repos
                                         CommandParameters parameters )
         throws ScmException
     {
-        command.setLogger( getLogger() );
-
         return command.execute( repository, fileSet, parameters );
     }
 

diff --git a/...en-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java b/...en-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java
@@ -39,7 +39,7 @@
 
 /**
  * A dummy tag command.
- * 
+ *
  * @author Benjamin Bentmann
  */
 class StubTagCommand
@@ -61,7 +61,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
             String tagName = parameters.getString( CommandParameter.TAG_NAME );
             File tagRoot = new File( stubRepo.getTagBase(), tagName );
 
-            getLogger().info( "Tagging: " + repoRoot + " > " + tagRoot );
+            logger.info( "Tagging: " + repoRoot + " > " + tagRoot );
 
             if ( tagRoot.exists() )
             {
@@ -80,7 +80,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
                 File srcFile = new File( repoRoot, path );
                 File dstFile = new File( tagRoot, path );
 
-                getLogger().info( "  " + path );
+                logger.info( "  " + path );
 
                 if ( srcFile.isDirectory() )
                 {

diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
   </contributors>
 
   <properties>
-    <scmVersion>1.13.0</scmVersion>
+    <scmVersion>2.0.0-M2</scmVersion>
     <javaVersion>8</javaVersion>
     <mavenVersion>3.2.5</mavenVersion>
     <resolverVersion>1.0.0.v20140518</resolverVersion>