You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/01/01 15:08:24 UTC
[maven-release] 01/01: [MRELEASE-1075] Move CVS-based tests to Subversion or Git
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1075
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit b07cfacebd7ea34377ec6af487ce37c111afc078
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jan 1 16:03:10 2022 +0100
[MRELEASE-1075] Move CVS-based tests to Subversion or Git
---
.../shared/release/phase/CheckPomPhaseTest.java | 4 ++--
.../release/phase/InputVariablesPhaseTest.java | 10 ++++-----
.../phase/RewritePomsForBranchPhaseTest.java | 12 +++++-----
.../phase/RewritePomsForDevelopmentPhaseTest.java | 26 +++++++++++-----------
.../phase/RewritePomsForReleasePhaseTest.java | 14 ++++++------
.../scm/DefaultScmRepositoryConfiguratorTest.java | 18 +++++++--------
.../expected-pom.xml | 12 +++++-----
.../pom.xml | 12 +++++-----
.../expected-pom.xml | 8 +++----
.../basic-pom-with-git}/pom.xml | 8 +++----
.../expected-pom.xml | 8 +++----
.../pom.xml | 8 +++----
.../expected-pom.xml | 13 ++++++-----
.../pom.xml | 12 +++++-----
.../expected-pom.xml | 12 +++++-----
.../pom.xml | 12 +++++-----
.../expected-pom.xml | 8 +++----
.../basic-pom-with-git}/pom.xml | 8 +++----
18 files changed, 102 insertions(+), 103 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
index 84e78d7..46ee81c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
@@ -95,7 +95,7 @@ public class CheckPomPhaseTest
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setScmSourceUrl( "scm:svn:https://localhost/tmp/repo" );
-
+
MavenProject project = createProject( "1.0-SNAPSHOT" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), Collections.singletonList( project ) );
@@ -120,7 +120,7 @@ public class CheckPomPhaseTest
throws Exception
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
- builder.setScmSourceUrl( "scm:cvs:" );
+ builder.setScmSourceUrl( "scm:svn:" );
MavenProject project = createProject( "1.0-SNAPSHOT" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
index 6476f04..6c215e0 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
@@ -289,7 +289,7 @@ public class InputVariablesPhaseTest
// MRELEASE-110
@Test
- public void testCvsTag()
+ public void testSvnTag()
throws Exception
{
// prepare
@@ -301,25 +301,25 @@ public class InputVariablesPhaseTest
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
builder.setInteractive( false );
builder.addReleaseVersion( "groupId:artifactId", "1.0" );
- builder.setScmSourceUrl( "scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module" );
+ builder.setScmSourceUrl( "scm:svn:svn://localhost/repo" );
// execute
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// verify
- assertEquals( "Check tag", "artifactId-1_0", ReleaseUtils.buildReleaseDescriptor( builder ).getScmReleaseLabel() );
+ assertEquals( "Check tag", "artifactId-1.0", ReleaseUtils.buildReleaseDescriptor( builder ).getScmReleaseLabel() );
// prepare
builder = new ReleaseDescriptorBuilder();
builder.setInteractive( false );
builder.addReleaseVersion( "groupId:artifactId", "1.0" );
- builder.setScmSourceUrl( "scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module" );
+ builder.setScmSourceUrl( "scm:svn:svn://localhost/repo" );
// execute
phase.simulate( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
// verify
- assertEquals( "Check tag", "artifactId-1_0", ReleaseUtils.buildReleaseDescriptor( builder ).getScmReleaseLabel() );
+ assertEquals( "Check tag", "artifactId-1.0", ReleaseUtils.buildReleaseDescriptor( builder ).getScmReleaseLabel() );
// never use prompter
verifyNoMoreInteractions( mockPrompter );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
index 49642af..aee022c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
@@ -213,12 +213,12 @@ public class RewritePomsForBranchPhaseTest
}
@Test
- public void testRewriteBasicPomWithCvs()
+ public void testRewriteBasicPomWithGit()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -270,11 +270,11 @@ public class RewritePomsForBranchPhaseTest
}
@Test
- public void testRewriteBasicPomWithCvsFromTag()
+ public void testRewriteBasicPomWithGitFromTag()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs-from-tag" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git-from-tag" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git-from-tag" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index 953694c..476cf04 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -64,7 +64,7 @@ public class RewritePomsForDevelopmentPhaseTest
{
return "rewrite-poms-for-development";
}
-
+
@Override
protected Path getWorkingDirectory( String workingDir )
{
@@ -252,18 +252,18 @@ public class RewritePomsForDevelopmentPhaseTest
}
@Test
- public void testRewriteBasicPomWithCvs()
+ public void testRewriteBasicPomWithGit()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git" );
mapNextVersion( builder, "groupId:artifactId" );
Scm scm = new Scm();
- scm.setConnection( "${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module" );
- scm.setDeveloperConnection( "${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module" );
- scm.setUrl( "${baseUrl}/module" );
+ scm.setConnection( "${scm.base}:git://localhost/repo" );
+ scm.setDeveloperConnection( "${scm.base}:git+ssh://${username}@localhost/tmp/repo" );
+ scm.setUrl( "${baseUrl}/repo" );
builder.addOriginalScmInfo( "groupId:artifactId", scm );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -272,18 +272,18 @@ public class RewritePomsForDevelopmentPhaseTest
}
@Test
- public void testRewriteBasicPomWithCvsFromTag()
+ public void testRewriteBasicPomWithGitFromTag()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs-from-tag" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git-from-tag" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git-from-tag" );
mapNextVersion( builder, "groupId:artifactId" );
Scm scm = new Scm();
- scm.setConnection( "scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module" );
- scm.setDeveloperConnection( "scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module" );
- scm.setUrl( "http://localhost/viewcvs.cgi/module" );
+ scm.setConnection( "scm:git:git://localhost/repo" );
+ scm.setDeveloperConnection( "scm:git:git+ssh://${username}@localhost/tmp/repo" );
+ scm.setUrl( "http://localhost/viewgit.cgi/repo" );
scm.setTag( "original-label" );
builder.addOriginalScmInfo( "groupId:artifactId", scm );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index e25678e..54fc130 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -59,7 +59,7 @@ public class RewritePomsForReleasePhaseTest
{
return "rewrite-poms-for-release";
}
-
+
@Override
protected Path getWorkingDirectory( String workingDir )
{
@@ -213,12 +213,12 @@ public class RewritePomsForReleasePhaseTest
}
@Test
- public void testRewriteBasicPomWithCvs()
+ public void testRewriteBasicPomWithGit()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
@@ -270,11 +270,11 @@ public class RewritePomsForReleasePhaseTest
}
@Test
- public void testRewriteBasicPomWithCvsFromTag()
+ public void testRewriteBasicPomWithGitFromTag()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
- ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-cvs-from-tag" );
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-git-from-tag" );
+ ReleaseDescriptorBuilder builder = createDescriptorFromProjects( reactorProjects, "basic-pom-with-git-from-tag" );
mapNextVersion( builder, "groupId:artifactId" );
phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
index 985e6cf..8dd50c8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
@@ -41,8 +41,6 @@ public class DefaultScmRepositoryConfiguratorTest
{
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- private static final int CVS_PORT = 2401;
-
@Override
protected void setUp()
throws Exception
@@ -59,8 +57,8 @@ public class DefaultScmRepositoryConfiguratorTest
ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( ReleaseUtils.buildReleaseDescriptor( builder ), null );
- assertEquals( "check provider", "cvs", repository.getProvider() );
- assertEquals( "check username", "anoncvs", repository.getProviderRepository().getUser() );
+ assertEquals( "check provider", "svn", repository.getProvider() );
+ assertNull( "check username", repository.getProviderRepository().getUser() );
assertNull( "check password", repository.getProviderRepository().getPassword() );
}
@@ -93,7 +91,7 @@ public class DefaultScmRepositoryConfiguratorTest
{
Settings settings = new Settings();
Server server = new Server();
- server.setId( "localhost:" + CVS_PORT );
+ server.setId( "localhost" );
server.setUsername( "settings-username" );
server.setPassword( "settings-password" );
server.setPrivateKey( "settings-private-key" );
@@ -101,14 +99,14 @@ public class DefaultScmRepositoryConfiguratorTest
settings.addServer( server );
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
- builder.setScmSourceUrl( "scm:cvs:pserver:anoncvs@localhost:/home/cvs:module" );
+ builder.setScmSourceUrl( "scm:svn:http://localhost/repo" );
ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( ReleaseUtils.buildReleaseDescriptor( builder ), settings );
ScmProviderRepositoryWithHost providerRepository =
(ScmProviderRepositoryWithHost) repository.getProviderRepository();
assertEquals( "check host", "localhost", providerRepository.getHost() );
- assertEquals( "check port", CVS_PORT, providerRepository.getPort() );
+ assertEquals( "check port", 0, providerRepository.getPort() );
assertEquals( "check username", "settings-username", providerRepository.getUser() );
assertEquals( "check password", "settings-password", providerRepository.getPassword() );
assertEquals( "check private key", "settings-private-key", providerRepository.getPrivateKey() );
@@ -179,7 +177,7 @@ public class DefaultScmRepositoryConfiguratorTest
throws NoSuchScmProviderException
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
- builder.setScmSourceUrl( "scm:cvs:" );
+ builder.setScmSourceUrl( "scm:svn:" );
try
{
@@ -201,13 +199,13 @@ public class DefaultScmRepositoryConfiguratorTest
ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( ReleaseUtils.buildReleaseDescriptor( builder ), null );
ScmProvider provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
- assertEquals( "Check SCM provider", "cvs", provider.getScmType() );
+ assertEquals( "Check SCM provider", "svn", provider.getScmType() );
}
private static ReleaseDescriptorBuilder createReleaseDescriptorBuilder()
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
- builder.setScmSourceUrl( "scm:cvs:pserver:anoncvs@localhost:/home/cvs:module" );
+ builder.setScmSourceUrl( "scm:svn:http://localhost/repo" );
return builder;
}
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/expected-pom.xml
similarity index 75%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/expected-pom.xml
index 27435c2..de046e3 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/expected-pom.xml
@@ -27,13 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
<tag>release-label</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/pom.xml
similarity index 75%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/pom.xml
index 923f88e..4d64c05 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git-from-tag/pom.xml
@@ -27,13 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
<tag>original-tag</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/expected-pom.xml
similarity index 79%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/expected-pom.xml
index 60479d9..74d21b0 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/expected-pom.xml
@@ -27,9 +27,9 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
<tag>release-label</tag>
</scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/pom.xml
similarity index 78%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/pom.xml
index b4af394..d0a8b36 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-git/pom.xml
@@ -27,8 +27,8 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
</scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/expected-pom.xml
similarity index 79%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/expected-pom.xml
index 52c1aa3..847c5a6 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/expected-pom.xml
@@ -27,9 +27,9 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
<tag>original-label</tag>
</scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/pom.xml
similarity index 78%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/pom.xml
index 2780f9c..b534bb3 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs-from-tag/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git-from-tag/pom.xml
@@ -27,9 +27,9 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
<tag>release-label</tag>
</scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/expected-pom.xml
similarity index 74%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/expected-pom.xml
index c68c10f..504f718 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/expected-pom.xml
@@ -27,12 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
+ <tag>HEAD</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/pom.xml
similarity index 74%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/pom.xml
index 63c09af..3c6ab06 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-git/pom.xml
@@ -27,13 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
<tag>release-label</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/expected-pom.xml
similarity index 74%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/expected-pom.xml
index 63c09af..3c6ab06 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/expected-pom.xml
@@ -27,13 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
<tag>release-label</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/pom.xml
similarity index 75%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/pom.xml
index 923f88e..4d64c05 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git-from-tag/pom.xml
@@ -27,13 +27,13 @@
</prerequisites>
<scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
+ <connection>${scm.base}:git://localhost/repo</connection>
+ <developerConnection>${scm.base}:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>${baseUrl}/repo</url>
<tag>original-tag</tag>
</scm>
<properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ <scm.base>scm:git</scm.base>
+ <baseUrl>http://localhost/viewgit.cgi</baseUrl>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/expected-pom.xml
similarity index 78%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/expected-pom.xml
index 2780f9c..b534bb3 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/expected-pom.xml
@@ -27,9 +27,9 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
<tag>release-label</tag>
</scm>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/pom.xml
similarity index 78%
rename from maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml
rename to maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/pom.xml
index b4af394..d0a8b36 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-git/pom.xml
@@ -27,8 +27,8 @@
</prerequisites>
<scm>
- <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
+ <connection>scm:git:git://localhost/repo</connection>
+ <developerConnection>scm:git:git+ssh://${username}@localhost/tmp/repo</developerConnection>
+ <url>http://localhost/viewgit.cgi/repo</url>
</scm>
-</project>
\ No newline at end of file
+</project>