Author: brett
Date: Thu Sep 23 09:10:27 2010
New Revision: 1000364
URL: http://svn.apache.org/viewvc?rev=1000364&view=rev
Log:
[MRELEASE-370] dry run does not update snapshot versions correctly
Refactored test cases to ensure it was in the state it would be in a real dry
run (per suggestion in MRELEASE-295)
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/expected-pom.xml
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/pom.xml
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/
- copied from r999228,
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/
Removed:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Thu Sep 23 09:10:27 2010
@@ -213,7 +213,7 @@ public abstract class AbstractRewritePom
}
transformDocument( project, document.getRootElement(),
releaseDescriptor, reactorProjects, scmRepository,
- result );
+ result, simulate );
File pomFile = ReleaseUtil.getStandardPom( project );
@@ -244,12 +244,13 @@ public abstract class AbstractRewritePom
}
private void transformDocument( MavenProject project, Element rootElement,
ReleaseDescriptor releaseDescriptor,
- List reactorProjects, ScmRepository
scmRepository, ReleaseResult result )
+ List reactorProjects, ScmRepository
scmRepository, ReleaseResult result,
+ boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
Namespace namespace = rootElement.getNamespace();
Map mappedVersions = getNextVersionMap( releaseDescriptor );
- Map originalVersions = getOriginalVersionMap( releaseDescriptor,
reactorProjects );
+ Map originalVersions = getOriginalVersionMap( releaseDescriptor,
reactorProjects, simulate );
Map resolvedSnapshotDependencies =
releaseDescriptor.getResolvedSnapshotDependencies();
Element properties = rootElement.getChild( "properties", namespace );
@@ -829,7 +830,8 @@ public abstract class AbstractRewritePom
protected abstract String getResolvedSnapshotVersion( String
artifactVersionlessKey, Map resolvedSnapshots );
- protected abstract Map getOriginalVersionMap( ReleaseDescriptor
releaseDescriptor, List reactorProjects );
+ protected abstract Map getOriginalVersionMap( ReleaseDescriptor
releaseDescriptor, List reactorProjects,
+ boolean simulate );
protected abstract Map getNextVersionMap( ReleaseDescriptor
releaseDescriptor );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
Thu Sep 23 09:10:27 2010
@@ -47,7 +47,7 @@ public class RewritePomVersionsPhase
// We are only updating versions no mods to scm needed
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects, boolean simulate )
{
return releaseDescriptor.getReleaseVersions();
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
Thu Sep 23 09:10:27 2010
@@ -188,7 +188,7 @@ public class RewritePomsForBranchPhase
return result;
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects, boolean simulate )
{
return releaseDescriptor.getOriginalVersions( reactorProjects );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
Thu Sep 23 09:10:27 2010
@@ -92,9 +92,11 @@ public class RewritePomsForDevelopmentPh
}
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects, boolean simulate )
{
- return releaseDescriptor.getReleaseVersions();
+ return simulate
+ ? releaseDescriptor.getOriginalVersions( reactorProjects )
+ : releaseDescriptor.getReleaseVersions();
}
protected Map getNextVersionMap( ReleaseDescriptor releaseDescriptor )
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Thu Sep 23 09:10:27 2010
@@ -208,7 +208,7 @@ public class RewritePomsForReleasePhase
return result;
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List reactorProjects, boolean simulate )
{
return releaseDescriptor.getOriginalVersions( reactorProjects );
}
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
Thu Sep 23 09:10:27 2010
@@ -122,7 +122,13 @@ public abstract class AbstractReleaseTes
return map;
}
- protected List createReactorProjects( String path, String subpath, boolean
copyFiles )
+ protected List createReactorProjects( String path, String subpath )
+ throws Exception
+ {
+ return createReactorProjects( path, path, subpath );
+ }
+
+ protected List createReactorProjects( String path, String targetPath,
String subpath )
throws Exception
{
File testFile = getTestFile( "target/test-classes/projects/" + path +
subpath + "/pom.xml" );
@@ -153,10 +159,10 @@ public abstract class AbstractReleaseTes
int index = filePath.indexOf( "test-classes" ) +
"test-classes".length() + 1;
filePath = filePath.substring( index );
- FileUtils.copyFile( getTestFile( "src/test/resources/" + filePath
),
- getTestFile( "target/test-classes/" + filePath
) );
+ File newFile = getTestFile( "target/test-classes/" +
filePath.replace( path, targetPath ) );
+ FileUtils.copyFile( getTestFile( "src/test/resources/" + filePath
), newFile );
- MavenProject project = projectBuilder.build( file,
localRepository, profileManager );
+ MavenProject project = projectBuilder.build( newFile,
localRepository, profileManager );
for ( Iterator i = project.getModules().iterator(); i.hasNext(); )
{
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -980,7 +980,7 @@ public class CheckDependencySnapshotsPha
private List createDescriptorFromProjects( String path )
throws Exception
{
- return createReactorProjects( "check-dependencies/", path, true );
+ return createReactorProjects( "check-dependencies/", path );
}
private Mock createNoMockPrompter()
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
Thu Sep 23 09:10:27 2010
@@ -78,7 +78,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects = createReactorProjects( "scm-commit",
"/single-pom", false );
+ List reactorProjects = createReactorProjects( "scm-commit",
"/single-pom" );
phase.execute( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
@@ -108,7 +108,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects = createReactorProjects( "scm-commit",
"/multimodule-with-deep-subprojects", false );
+ List reactorProjects = createReactorProjects( "scm-commit",
"/multimodule-with-deep-subprojects" );
phase.execute( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
@@ -138,8 +138,7 @@ public class CheckoutProjectFromScmTest
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List reactorProjects =
- createReactorProjects( "rewrite-for-release/pom-with-parent-flat",
"/root-project", false );
+ List reactorProjects = createReactorProjects(
"rewrite-for-release/pom-with-parent-flat", "/root-project" );
phase.execute( descriptor, new DefaultReleaseEnvironment(),
reactorProjects );
assertEquals( "root-project",
descriptor.getScmRelativePathProjectDirectory() );
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -103,7 +103,7 @@ public class GenerateReleasePomsPhaseTes
*/
protected List createReactorProjects( String path, boolean copyFiles )
throws Exception
{
- List reactorProjects = createReactorProjects(
"generate-release-poms/", path, copyFiles );
+ List reactorProjects = createReactorProjects(
"generate-release-poms/", path );
// add scm provider expectations for each project in the reactor
// TODO: can we move this somewhere better?
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -130,13 +130,7 @@ public class RemoveReleasePomsPhaseTest
private List createReactorProjects( String path )
throws Exception
{
- return createReactorProjects( path, false );
- }
-
- private List createReactorProjects( String path, boolean copyFiles )
- throws Exception
- {
- return createReactorProjects( "remove-release-poms/", path, copyFiles
);
+ return createReactorProjects( "remove-release-poms/", path );
}
private ReleaseDescriptor createReleaseDescriptor()
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Scm;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
@@ -28,6 +29,8 @@ import org.apache.maven.shared.release.u
import java.io.File;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -57,7 +60,7 @@ public class RewritePomsForDevelopmentPh
public void testSimulateRewrite()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List reactorProjects = createReactorProjectsWhenSimulated( "basic-pom"
);
ReleaseDescriptor config = createDescriptorFromBasicPom(
reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -74,32 +77,39 @@ public class RewritePomsForDevelopmentPh
assertEquals( "Check the transformed POM", expected, actual );
}
+ private List createReactorProjectsWhenSimulated( String name )
+ throws Exception
+ {
+ return createReactorProjects( "rewrite-for-release/",
"rewrite-for-development/", name );
+ }
+
public void testSimulateRewriteEjbClientDeps()
throws Exception
{
- List reactorProjects = createReactorProjects(
"basic-pom-ejb-client-dep" );
+ List reactorProjects = new LinkedList( createReactorProjects(
"basic-pom-ejb-client-dep/project" ) );
+ reactorProjects.addAll( createReactorProjects(
"basic-pom-ejb-client-dep/ejb" ) );
ReleaseDescriptor config = createDescriptorFromBasicPom(
reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
config.addDevelopmentVersion( ArtifactUtils.versionlessKey( "groupId",
"artifactId1" ), NEXT_VERSION );
config.addReleaseVersion( ArtifactUtils.versionlessKey( "groupId",
"artifactId1" ), RELEASE_VERSION );
- String expected = readTestProjectFile(
"basic-pom-ejb-client-dep/pom.xml" );
+ String expected = readTestProjectFile(
"basic-pom-ejb-client-dep/project/pom.xml" );
phase.simulate( config, new DefaultReleaseEnvironment(),
reactorProjects );
- String actual = readTestProjectFile(
"basic-pom-ejb-client-dep/pom.xml" );
+ String actual = readTestProjectFile(
"basic-pom-ejb-client-dep/project/pom.xml" );
assertEquals( "Check the original POM untouched", expected, actual );
- expected = readTestProjectFile(
"basic-pom-ejb-client-dep/expected-pom.xml" );
- actual = readTestProjectFile( "basic-pom-ejb-client-dep/pom.xml.next"
);
+ expected = readTestProjectFile(
"basic-pom-ejb-client-dep/project/expected-pom.xml" );
+ actual = readTestProjectFile(
"basic-pom-ejb-client-dep/project/pom.xml.next" );
assertEquals( "Check the transformed POM", expected, actual );
}
public void testClean()
throws Exception
{
- List reactorProjects = createReactorProjectsFromBasicPom();
+ List reactorProjects = createReactorProjectsWhenSimulated( "basic-pom"
);
ReleaseDescriptor config = createDescriptorFromBasicPom(
reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -158,13 +168,19 @@ public class RewritePomsForDevelopmentPh
protected String readTestProjectFile( String fileName )
throws IOException
{
- return ReleaseUtil.readXmlFile( getTestFile(
"target/test-classes/projects/rewrite-for-development/" + fileName ) );
+ return readTestProjectFile( fileName, "rewrite-for-development/" );
+ }
+
+ protected String readTestProjectFile( String fileName, String subpath )
+ throws IOException
+ {
+ return ReleaseUtil.readXmlFile( getTestFile(
"target/test-classes/projects/"+ subpath + fileName ) );
}
protected List createReactorProjects( String path, boolean copyFiles )
throws Exception
{
- return createReactorProjects( "rewrite-for-development/", path,
copyFiles );
+ return createReactorProjects( "rewrite-for-development/", path );
}
protected ReleaseDescriptor createDescriptorFromBasicPom( List
reactorProjects )
@@ -317,6 +333,36 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ public void testSimulateRewritePomWithParentAndProperties()
+ throws Exception
+ {
+ // use the original ones since simulation didn't modify them
+ List reactorProjects = createReactorProjects(
"pom-with-parent-and-properties-sim" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects(
reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1",
ALTERNATIVE_RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subproject1",
ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2",
ALTERNATIVE_RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subproject2",
ALTERNATIVE_NEXT_VERSION );
+
+ mapScm( config );
+
+ phase.simulate( config, new DefaultReleaseEnvironment(),
reactorProjects );
+
+ for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ {
+ MavenProject project = (MavenProject) i.next();
+
+ File pomFile = project.getFile();
+ File actualFile = new File( pomFile.getParentFile(),
pomFile.getName() + ".next" );
+ File expectedFile = new File( actualFile.getParentFile(),
"expected-pom.xml" );
+
+ comparePomFiles( expectedFile, actualFile, true );
+ }
+ }
+
public void testRewritePomDependenciesWithoutDependenciesVersionUpdate()
throws Exception
{
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -52,7 +52,7 @@ public class RewritePomsForReleasePhaseT
protected List createReactorProjects( String path, boolean copyFiles )
throws Exception
{
- return createReactorProjects( "rewrite-for-release/", path, copyFiles
);
+ return createReactorProjects( "rewrite-for-release/", path );
}
protected String readTestProjectFile( String fileName )
@@ -344,7 +344,7 @@ public class RewritePomsForReleasePhaseT
public void testRewritePomForFlatMultiModule()
throws Exception
{
- List reactorProjects = createReactorProjects(
"rewrite-for-release/pom-with-parent-flat", "/root-project", true );
+ List reactorProjects = createReactorProjects(
"rewrite-for-release/pom-with-parent-flat", "/root-project" );
ReleaseDescriptor config =
createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(),
reactorProjects );
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -104,7 +104,7 @@ public class ScmCommitPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects( "scm-commit/",
"multiple-poms", false );
+ List reactorProjects = createReactorProjects( "scm-commit/",
"multiple-poms" );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -352,7 +352,7 @@ public class ScmCommitPhaseTest
private List createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom", false );
+ return createReactorProjects( "scm-commit/", "single-pom" );
}
private static ReleaseDescriptor createReleaseDescriptor()
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Thu Sep 23 09:10:27 2010
@@ -100,7 +100,7 @@ public class ScmTagPhaseTest
public void testCommitMultiModuleDeepFolders()
throws Exception
{
- List reactorProjects = createReactorProjects( "scm-commit/",
"multimodule-with-deep-subprojects", false );
+ List reactorProjects = createReactorProjects( "scm-commit/",
"multimodule-with-deep-subprojects" );
String sourceUrl = "http://svn.example.com/repos/project/trunk/";;
String scmUrl = "scm:svn:" + sourceUrl;
ReleaseDescriptor descriptor = new ReleaseDescriptor();
@@ -134,7 +134,7 @@ public class ScmTagPhaseTest
throws Exception
{
List reactorProjects =
- createReactorProjects( "rewrite-for-release/pom-with-parent-flat",
"/root-project", true );
+ createReactorProjects( "rewrite-for-release/pom-with-parent-flat",
"/root-project" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
ReleaseDescriptor descriptor = new ReleaseDescriptor();
descriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
@@ -166,7 +166,7 @@ public class ScmTagPhaseTest
throws Exception
{
ReleaseDescriptor descriptor = new ReleaseDescriptor();
- List reactorProjects = createReactorProjects( "scm-commit/",
"multiple-poms", false );
+ List reactorProjects = createReactorProjects( "scm-commit/",
"multiple-poms" );
descriptor.setScmSourceUrl( "scm-url" );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
rootProject.getFile().getParentFile().getAbsolutePath() );
@@ -351,7 +351,7 @@ public class ScmTagPhaseTest
private List createReactorProjects()
throws Exception
{
- return createReactorProjects( "scm-commit/", "single-pom", false );
+ return createReactorProjects( "scm-commit/", "single-pom" );
}
private static ReleaseDescriptor createReleaseDescriptor()
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml?rev=1000364&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <packaging>ejb</packaging>
+</project>
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml?rev=1000364&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml
Thu Sep 23 09:10:27 2010
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>ejb</packaging>
+</project>
Copied:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/pom.xml
(from r999228,
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/pom.xml?p2=maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/pom.xml&p1=maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/pom.xml&r1=999228&r2=1000364&rev=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/project/pom.xml
Thu Sep 23 09:10:27 2010
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
@@ -43,13 +43,13 @@
<groupId>groupId</groupId>
<artifactId>artifactId1</artifactId>
<type>ejb</type>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>groupId</groupId>
<artifactId>artifactId1</artifactId>
<type>ejb-client</type>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<!--/dependencyManagement-->
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom-with-schema.xml
Thu Sep 23 09:10:27 2010
@@ -22,6 +22,10 @@
<artifactId>artifactId</artifactId>
<version>1.1-SNAPSHOT</version>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
@@ -34,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -22,6 +22,10 @@
<artifactId>artifactId</artifactId>
<version>1.1-SNAPSHOT</version>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
@@ -34,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom/pom.xml
Thu Sep 23 09:10:27 2010
@@ -22,6 +22,10 @@
<artifactId>artifactId</artifactId>
<version>1.0</version>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
@@ -34,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/expected-pom.xml?rev=1000364&r1=999228&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
-
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
-
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
- <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
</scm>
<modules>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/expected-pom.xml?rev=1000364&r1=999228&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -21,14 +21,14 @@
<parent>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>subproject1</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<properties>
- <module.version>2.0-SNAPSHOT</module.version>
+ <module.version>2.0</module.version>
<ignored.property>ignored</ignored.property>
</properties>
</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/pom.xml?rev=1000364&r1=999228&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject1/pom.xml
Thu Sep 23 09:10:27 2010
@@ -28,7 +28,7 @@
<version>2.0-SNAPSHOT</version>
<properties>
- <module.version>2.0-SNAPSHOT</module.version>
+ <module.version>2.0</module.version>
<ignored.property>ignored</ignored.property>
</properties>
</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/expected-pom.xml?rev=1000364&r1=999228&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -21,22 +21,22 @@
<parent>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>subproject2</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
<version>${module.version}</version>
</dependency>
</dependencies>
<properties>
- <module.version>2.0</module.version>
+ <module.version>2.1-SNAPSHOT</module.version>
<ignored.property>ignored</ignored.property>
</properties>
</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/pom.xml?rev=1000364&r1=999228&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties-sim/subproject2/pom.xml
Thu Sep 23 09:10:27 2010
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
<version>${module.version}</version>
</dependency>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom-with-schema.xml
Thu Sep 23 09:10:27 2010
@@ -38,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -38,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom/pom.xml
Thu Sep 23 09:10:27 2010
@@ -38,4 +38,4 @@
-->
<?processing-instruction attrib="value"?>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
Thu Sep 23 09:10:27 2010
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
<version>${module.version}</version>
</dependency>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml?rev=1000364&r1=1000363&r2=1000364&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
Thu Sep 23 09:10:27 2010
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>groupId</groupId>
<artifactId>subproject1</artifactId>
<version>${module.version}</version>
</dependency>
