continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r524959 - in /maven/continuum/trunk: ./ continuum-release/ continuum-release/src/main/java/org/apache/maven/continuum/release/phase/ continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ continuum-webapp/
Date Mon, 02 Apr 2007 22:58:23 GMT
Author: evenisse
Date: Mon Apr  2 15:58:21 2007
New Revision: 524959

URL: http://svn.apache.org/viewvc?view=rev&rev=524959
Log:
Little fix with the maven-scm

Modified:
    maven/continuum/trunk/continuum-release/pom.xml
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
    maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/pom.xml?view=diff&rev=524959&r1=524958&r2=524959
==============================================================================
--- maven/continuum/trunk/continuum-release/pom.xml (original)
+++ maven/continuum/trunk/continuum-release/pom.xml Mon Apr  2 15:58:21 2007
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-manager</artifactId>
-      <version>1.0-20070315.153226-5</version>
+      <version>1.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>classworlds</groupId>
@@ -76,11 +76,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.0-alpha-6-20070302.170858-2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-taskqueue</artifactId>
     </dependency>
     <dependency>
@@ -101,6 +96,11 @@
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-clearcase</artifactId>
+      <version>${maven-scm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-provider-cvsjava</artifactId>
       <version>${maven-scm.version}</version>
     </dependency>
     <dependency>

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java?view=diff&rev=524959&r1=524958&r2=524959
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
Mon Apr  2 15:58:21 2007
@@ -34,6 +34,7 @@
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmVersion;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 
 import java.util.List;
@@ -83,7 +84,7 @@
         try
         {
             result = provider.update(
-                repository, new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory()
) ), null );
+                repository, new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory()
) ), (ScmVersion)null );
         }
         catch ( ScmException e )
         {

Modified: maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?view=diff&rev=524959&r1=524958&r2=524959
==============================================================================
--- maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
(original)
+++ maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
Mon Apr  2 15:58:21 2007
@@ -30,6 +30,7 @@
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.taskqueue.Task;
@@ -104,7 +105,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.0-SNAPSHOT</version>"
) > 0 );
@@ -116,7 +117,7 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-1.0"
);
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>1.0</version>"
) > 0 );
@@ -148,7 +149,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.1-SNAPSHOT</version>"
) > 0 );
@@ -160,7 +161,7 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-2.0"
);
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>2.0</version>"
) > 0 );
@@ -190,7 +191,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.1-SNAPSHOT</version>"
) > 0 );
@@ -202,7 +203,7 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-1.1"
);
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, null
);
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null
);
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>1.1</version>"
) > 0 );

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?view=diff&rev=524959&r1=524958&r2=524959
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Mon Apr  2 15:58:21 2007
@@ -355,6 +355,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-provider-cvsjava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvsexe</artifactId>
     </dependency>
     <dependency>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=524959&r1=524958&r2=524959
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Mon Apr  2 15:58:21 2007
@@ -209,6 +209,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-cvsjava</artifactId>
+        <version>${maven-scm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-cvsexe</artifactId>
         <version>${maven-scm.version}</version>
       </dependency>



Mime
View raw message