Upgrade to sm 2.0.1, ignore test relying on svn.codehaus.org (#196)

olamy · web-flow · commit d2b2b5e9468b · 2023-06-05T20:57:11.000+10:00
Signed-off-by: Olivier Lamy &lt;olamy@apache.org&gt;
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
   </issueManagement>
 
   <properties>
-    <maven.scm.version>1.13.0</maven.scm.version>
+    <maven.scm.version>2.0.1</maven.scm.version>
     <maven.api.version>3.5.4</maven.api.version>
     <mojo.java.target>8</mojo.java.target>
     <maven.it.version>3.5.4</maven.it.version>
@@ -132,12 +132,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-bazaar</artifactId>
-      <version>${maven.scm.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-svnexe</artifactId>
@@ -156,30 +150,6 @@
       <version>${maven.scm.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-cvsexe</artifactId>
-      <version>${maven.scm.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-starteam</artifactId>
-      <version>${maven.scm.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-clearcase</artifactId>
-      <version>${maven.scm.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-perforce</artifactId>
-      <version>${maven.scm.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-hg</artifactId>
@@ -190,7 +160,7 @@
     <dependency>
       <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
       <artifactId>maven-scm-provider-svnjava</artifactId>
-      <version>2.2.1</version>
+      <version>2.3.0</version>
       <scope>compile</scope>
       <exclusions>
         <!--
diff --git a/src/main/java/org/codehaus/mojo/build/CreateMojo.java b/src/main/java/org/codehaus/mojo/build/CreateMojo.java
@@ -55,16 +55,13 @@
 import org.apache.maven.scm.command.status.StatusScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
-import org.apache.maven.scm.log.ScmLogDispatcher;
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.provider.git.gitexe.command.branch.GitBranchCommand;
 import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
 import org.apache.maven.scm.provider.hg.HgScmProvider;
 import org.apache.maven.scm.provider.hg.HgUtils;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -240,8 +237,6 @@ public class CreateMojo
 
     // ////////////////////////////////////// internal variables ///////////////////////////////////
 
-    private ScmLogDispatcher logger;
-
     private String revision;
 
     private boolean useScm;
@@ -626,15 +621,14 @@ public String getScmBranch()
             if ( GitScmProviderRepository.PROTOCOL_GIT.equals( provider.getScmType() ) )
             {
                 ScmFileSet fileSet = new ScmFileSet( scmDirectory );
-                return GitBranchCommand.getCurrentBranch( getLogger(),
-                                                          (GitScmProviderRepository) repository.getProviderRepository(),
+                return GitBranchCommand.getCurrentBranch( (GitScmProviderRepository) repository.getProviderRepository(),
                                                           fileSet );
             }
             else if ( provider instanceof HgScmProvider )
             {
                 /* hg branch can be obtained directly by a command */
-                HgOutputConsumer consumer = new HgOutputConsumer( getLogger() );
-                ScmResult result = HgUtils.execute( consumer, logger, scmDirectory, new String[] { "id", "-b" } );
+                HgOutputConsumer consumer = new HgOutputConsumer( );
+                ScmResult result = HgUtils.execute( consumer, scmDirectory, new String[] { "id", "-b" } );
                 checkResult( result );
                 if ( StringUtils.isNotEmpty( consumer.getOutput() ) )
                 {
@@ -754,19 +748,6 @@ public String getRevision()
 
     }
 
-    // TODO normally this would be handled in AbstractScmProvider
-    /**
-     * @return
-     */
-    private ScmLogger getLogger()
-    {
-        if ( logger == null )
-        {
-            logger = new ScmLogDispatcher();
-        }
-        return logger;
-    }
-
     // ////////////////////////////////////////////////////////////////////////////////////////////
     // setters to help with test
     public void setScmManager( ScmManager scmManager )
diff --git a/src/main/java/org/codehaus/mojo/build/HgChangeSetMojo.java b/src/main/java/org/codehaus/mojo/build/HgChangeSetMojo.java
@@ -31,7 +31,6 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.log.ScmLogDispatcher;
 import org.apache.maven.scm.provider.hg.HgUtils;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -53,8 +52,6 @@ public class HgChangeSetMojo
     @Parameter( property = "maven.buildNumber.skip", defaultValue = "false" )
     private boolean skip;
 
-    private ScmLogDispatcher logger = new ScmLogDispatcher();
-
     /**
      * The maven project.
      */
@@ -124,8 +121,8 @@ public void execute()
     protected String getHgCommandOutput( String[] command )
         throws ScmException, MojoExecutionException
     {
-        HgOutputConsumer consumer = new HgOutputConsumer( logger );
-        ScmResult result = HgUtils.execute( consumer, logger, scmDirectory, command );
+        HgOutputConsumer consumer = new HgOutputConsumer( );
+        ScmResult result = HgUtils.execute( consumer, scmDirectory, command );
         checkResult( result );
         return consumer.getOutput();
     }
diff --git a/src/main/java/org/codehaus/mojo/build/HgOutputConsumer.java b/src/main/java/org/codehaus/mojo/build/HgOutputConsumer.java
@@ -1,18 +1,18 @@
 package org.codehaus.mojo.build;
 
 import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.provider.hg.command.HgConsumer;
+import org.slf4j.Logger;
 
 class HgOutputConsumer
     extends HgConsumer
 {
 
     private String output;
 
-    HgOutputConsumer( ScmLogger logger )
+    HgOutputConsumer( )
     {
-        super( logger );
+        super( );
     }
 
     @Override
diff --git a/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java b/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java
@@ -204,6 +204,7 @@ public void legacyTimestampItTest()
     }
 
     @Test
+    @Ignore("svn.codehaus.org does not exist anymore")
     public void failLocalChangeItTest()
         throws Exception
     {
@@ -305,6 +306,7 @@ public void mBuildNum85Test()
     }
 
     @Test
+    @Ignore("svn.codehaus.org does not exist anymore")
     public void mojo1372Test()
         throws Exception
     {
@@ -316,6 +318,7 @@ public void mojo1372Test()
     }
 
     @Test
+    @Ignore("svn.codehaus.org does not exist anymore")
     public void Mojo1668Test()
         throws Exception
     {
@@ -339,6 +342,7 @@ public void Mojo1668Test()
     }
 
     @Test
+    @Ignore("svn.codehaus.org does not exist anymore")
     public void noRevisionItTest()
         throws Exception
     {

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`package org.codehaus.mojo.build;`
`2`	`2`
`3`	`3`	`import org.apache.maven.scm.ScmFileStatus;`
`4`		`-import org.apache.maven.scm.log.ScmLogger;`
`5`	`4`	`import org.apache.maven.scm.provider.hg.command.HgConsumer;`
	`5`	`+import org.slf4j.Logger;`
`6`	`6`
`7`	`7`	`class HgOutputConsumer`
`8`	`8`	`extends HgConsumer`
`9`	`9`	`{`
`10`	`10`
`11`	`11`	`private String output;`
`12`	`12`
`13`		`- HgOutputConsumer( ScmLogger logger )`
	`13`	`+ HgOutputConsumer( )`
`14`	`14`	`{`
`15`		`- super( logger );`
	`15`	`+ super( );`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ public void legacyTimestampItTest()`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`@Test`
	`207`	`+ @Ignore("svn.codehaus.org does not exist anymore")`
`207`	`208`	`public void failLocalChangeItTest()`
`208`	`209`	`throws Exception`
`209`	`210`	`{`
`@@ -305,6 +306,7 @@ public void mBuildNum85Test()`
`305`	`306`	`}`
`306`	`307`
`307`	`308`	`@Test`
	`309`	`+ @Ignore("svn.codehaus.org does not exist anymore")`
`308`	`310`	`public void mojo1372Test()`
`309`	`311`	`throws Exception`
`310`	`312`	`{`
`@@ -316,6 +318,7 @@ public void mojo1372Test()`
`316`	`318`	`}`
`317`	`319`
`318`	`320`	`@Test`
	`321`	`+ @Ignore("svn.codehaus.org does not exist anymore")`
`319`	`322`	`public void Mojo1668Test()`
`320`	`323`	`throws Exception`
`321`	`324`	`{`
`@@ -339,6 +342,7 @@ public void Mojo1668Test()`
`339`	`342`	`}`
`340`	`343`
`341`	`344`	`@Test`
	`345`	`+ @Ignore("svn.codehaus.org does not exist anymore")`
`342`	`346`	`public void noRevisionItTest()`
`343`	`347`	`throws Exception`
`344`	`348`	`{`