You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mr...@apache.org on 2008/07/28 08:55:32 UTC
svn commit: r680263 - in /maven/sandbox/branches/scm/git-provider-db: ./
maven-scm-provider-git-commons/ maven-scm-provider-gitexe/
maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/
maven-scm-provider-gitexe/src/...
Author: mrdon
Date: Sun Jul 27 23:55:31 2008
New Revision: 680263
URL: http://svn.apache.org/viewvc?rev=680263&view=rev
Log:
Fixing tests to pass, changing version to -db-1
Added:
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitScmTestCaseAdapter.java
Modified:
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-git-commons/pom.xml
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/pom.xml
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java
maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gittest/pom.xml
maven/sandbox/branches/scm/git-provider-db/pom.xml
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-git-commons/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-git-commons/pom.xml?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-git-commons/pom.xml (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-git-commons/pom.xml Sun Jul 27 23:55:31 2008
@@ -21,12 +21,12 @@
<parent>
<artifactId>maven-scm-providers-git</artifactId>
<groupId>org.apache.maven.scm</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-scm-provider-git-commons</artifactId>
<name>Maven SCM git Provider - Common library</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>regexp</groupId>
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/pom.xml?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/pom.xml (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/pom.xml Sun Jul 27 23:55:31 2008
@@ -21,22 +21,22 @@
<parent>
<artifactId>maven-scm-providers-git</artifactId>
<groupId>org.apache.maven.scm</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-scm-provider-gitexe</artifactId>
<name>Maven SCM git Provider - git Executable Impl.</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-git-commons</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gittest</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -44,6 +44,12 @@
<artifactId>regexp</artifactId>
<version>1.3</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+
</dependencies>
<build>
Added: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitScmTestCaseAdapter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitScmTestCaseAdapter.java?rev=680263&view=auto
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitScmTestCaseAdapter.java (added)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitScmTestCaseAdapter.java Sun Jul 27 23:55:31 2008
@@ -0,0 +1,19 @@
+package org.apache.maven.scm.provider.git.gitexe.command;
+
+import org.apache.maven.scm.ScmTestCase;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
+
+public class GitScmTestCaseAdapter extends ScmTestCase
+{
+ public void assertCommandLine( String expectedCommand, File expectedWorkingDirectory, Commandline actualCommand )
+ {
+ Commandline cl = new Commandline( expectedCommand );
+ if ( expectedWorkingDirectory != null )
+ {
+ cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath() );
+ }
+ assertEquals( cl.toString(), actualCommand.toString() );
+ }
+}
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommandTest.java Sun Jul 27 23:55:31 2008
@@ -21,9 +21,9 @@
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmRevision;
-import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.gitexe.command.GitScmTestCaseAdapter;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
@@ -36,7 +36,7 @@
* @version $Id$
*/
public class GitChangeLogCommandTest
- extends ScmTestCase
+ extends GitScmTestCaseAdapter
{
public void testCommandLineNoDates()
throws Exception
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java Sun Jul 27 23:55:31 2008
@@ -20,8 +20,8 @@
*/
import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.gitexe.command.GitScmTestCaseAdapter;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
@@ -31,7 +31,7 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
public class GitCheckInCommandTest
- extends ScmTestCase
+ extends GitScmTestCaseAdapter
{
private File messageFile;
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommandTest.java Sun Jul 27 23:55:31 2008
@@ -20,9 +20,9 @@
*/
import org.apache.maven.scm.ScmRevision;
-import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.gitexe.command.GitScmTestCaseAdapter;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
@@ -33,7 +33,7 @@
* @version $Id$
*/
public class GitCheckOutCommandTest
- extends ScmTestCase
+ extends GitScmTestCaseAdapter
{
private File workingDirectory;
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommandTest.java Sun Jul 27 23:55:31 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.gitexe.command.GitScmTestCaseAdapter;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.cli.Commandline;
@@ -30,7 +30,7 @@
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*/
public class GitTagCommandTest
- extends ScmTestCase
+ extends GitScmTestCaseAdapter
{
private File messageFile;
Modified: maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gittest/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gittest/pom.xml?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gittest/pom.xml (original)
+++ maven/sandbox/branches/scm/git-provider-db/maven-scm-provider-gittest/pom.xml Sun Jul 27 23:55:31 2008
@@ -21,12 +21,12 @@
<parent>
<artifactId>maven-scm-providers-git</artifactId>
<groupId>org.apache.maven.scm</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-scm-provider-gittest</artifactId>
<name>Maven SCM git Provider TCK Tests</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
Modified: maven/sandbox/branches/scm/git-provider-db/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/scm/git-provider-db/pom.xml?rev=680263&r1=680262&r2=680263&view=diff
==============================================================================
--- maven/sandbox/branches/scm/git-provider-db/pom.xml (original)
+++ maven/sandbox/branches/scm/git-provider-db/pom.xml Sun Jul 27 23:55:31 2008
@@ -21,16 +21,42 @@
<parent>
<artifactId>maven-scm-providers</artifactId>
<groupId>org.apache.maven.scm</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-scm-providers-git</artifactId>
<packaging>pom</packaging>
<name>Maven SCM git Provider - Parent</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-db-1-SNAPSHOT</version>
<modules>
<module>maven-scm-provider-git-commons</module>
<module>maven-scm-provider-gitexe</module>
<module>maven-scm-provider-gittest</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ </dependencies>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/sandbox/branches/scm/git-provider-db</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/maven/sandbox/branches/scm/git-provider-db</developerConnection>
+ </scm>
+ <distributionManagement>
+ <repository>
+ <id>maven-db</id>
+ <name>Don's Maven Release Repository</name>
+ <url>scp://people.apache.org/home/mrdon/public_html/repository</url>
+ </repository>
+ <snapshotRepository>
+ <uniqueVersion>true</uniqueVersion>
+ <id>maven-db</id>
+ <name>Don's Maven Development Repository</name>
+ <url>scp://people.apache.org/home/mrdon/public_html/repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>