You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/03 17:01:22 UTC
svn commit: r399326 - in /maven/plugins/trunk/maven-release-plugin/src:
main/java/org/apache/maven/plugins/release/phase/
test/java/org/apache/maven/plugins/release/phase/
test/resources/projects/rewrite-for-release/interpolated-versions/
test/resource...
Author: brett
Date: Wed May 3 08:00:54 2006
New Revision: 399326
URL: http://svn.apache.org/viewcvs?rev=399326&view=rev
Log:
[MRELEASE-70] keep expressions for versions where possible
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml (with props)
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java?rev=399326&r1=399325&r2=399326&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java Wed May 3 08:00:54 2006
@@ -183,7 +183,7 @@
rewriteVersion( rootElement, namespace, mappedVersions, projectId, project, parentVersion );
- rewriteDependencies( project.getDependencies(), rootElement, mappedVersions, originalVersions );
+ rewriteDependencies( project.getDependencies(), rootElement, mappedVersions, originalVersions, projectId );
if ( project.getDependencyManagement() != null )
{
@@ -191,27 +191,28 @@
if ( dependencyRoot != null )
{
rewriteDependencies( project.getDependencyManagement().getDependencies(), dependencyRoot,
- mappedVersions, originalVersions );
+ mappedVersions, originalVersions, projectId );
}
}
if ( project.getBuild() != null )
{
- Element pluginsRoot = rootElement.getChild( "build", namespace );
- if ( pluginsRoot != null )
+ Element buildRoot = rootElement.getChild( "build", namespace );
+ if ( buildRoot != null )
{
- rewritePlugins( project.getBuildPlugins(), pluginsRoot, mappedVersions, originalVersions );
+ rewritePlugins( project.getBuildPlugins(), buildRoot, mappedVersions, originalVersions, projectId );
if ( project.getPluginManagement() != null )
{
- pluginsRoot = pluginsRoot.getChild( "pluginManagement", namespace );
+ Element pluginsRoot = buildRoot.getChild( "pluginManagement", namespace );
if ( pluginsRoot != null )
{
rewritePlugins( project.getPluginManagement().getPlugins(), pluginsRoot, mappedVersions,
- originalVersions );
+ originalVersions, projectId );
}
}
+ rewriteExtensions( project.getBuildExtensions(), buildRoot, mappedVersions, originalVersions,
+ projectId );
}
- rewriteExtensions( project.getBuildExtensions(), pluginsRoot, mappedVersions, originalVersions );
}
if ( project.getReporting() != null )
@@ -219,7 +220,8 @@
Element pluginsRoot = rootElement.getChild( "reporting", namespace );
if ( pluginsRoot != null )
{
- rewriteReportPlugins( project.getReportPlugins(), pluginsRoot, mappedVersions, originalVersions );
+ rewriteReportPlugins( project.getReportPlugins(), pluginsRoot, mappedVersions, originalVersions,
+ projectId );
}
}
@@ -236,28 +238,25 @@
{
throw new ReleaseFailureException( "Version for '" + project.getName() + "' was not mapped" );
}
- else
- {
- if ( versionElement == null )
- {
- if ( !version.equals( parentVersion ) )
- {
- // we will add this after artifactId, since it was missing but different from the inherited version
- Element artifactIdElement = rootElement.getChild( "artifactId", namespace );
- int index = rootElement.indexOf( artifactIdElement );
-
- versionElement = new Element( "version", namespace );
- versionElement.setText( version );
- rootElement.addContent( index + 1, new Text( "\n " ) );
- rootElement.addContent( index + 2, versionElement );
- }
- }
- else
+ if ( versionElement == null )
+ {
+ if ( !version.equals( parentVersion ) )
{
+ // we will add this after artifactId, since it was missing but different from the inherited version
+ Element artifactIdElement = rootElement.getChild( "artifactId", namespace );
+ int index = rootElement.indexOf( artifactIdElement );
+
+ versionElement = new Element( "version", namespace );
versionElement.setText( version );
+ rootElement.addContent( index + 1, new Text( "\n " ) );
+ rootElement.addContent( index + 2, versionElement );
}
}
+ else
+ {
+ versionElement.setText( version );
+ }
}
private String rewriteParent( MavenProject project, Element rootElement, Namespace namespace, Map mappedVersions,
@@ -288,7 +287,7 @@
}
private void rewriteDependencies( List dependencies, Element dependencyRoot, Map mappedVersions,
- Map originalVersions )
+ Map originalVersions, String projectId )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( dependencies != null )
@@ -298,12 +297,13 @@
Dependency dep = (Dependency) i.next();
updateDomVersion( dep.getGroupId(), dep.getArtifactId(), mappedVersions, dep.getVersion(),
- originalVersions, "dependencies", "dependency", dependencyRoot );
+ originalVersions, "dependencies", "dependency", dependencyRoot, projectId );
}
}
}
- private void rewritePlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions )
+ private void rewritePlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions,
+ String projectId )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( plugins != null )
@@ -316,13 +316,14 @@
if ( plugin.getVersion() != null )
{
updateDomVersion( plugin.getGroupId(), plugin.getArtifactId(), mappedVersions, plugin.getVersion(),
- originalVersions, "plugins", "plugin", pluginRoot );
+ originalVersions, "plugins", "plugin", pluginRoot, projectId );
}
}
}
}
- private void rewriteExtensions( List extensions, Element extensionRoot, Map mappedVersions, Map originalVersions )
+ private void rewriteExtensions( List extensions, Element extensionRoot, Map mappedVersions, Map originalVersions,
+ String projectId )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( extensions != null )
@@ -332,12 +333,14 @@
Extension extension = (Extension) i.next();
updateDomVersion( extension.getGroupId(), extension.getArtifactId(), mappedVersions,
- extension.getVersion(), originalVersions, "extensions", "extension", extensionRoot );
+ extension.getVersion(), originalVersions, "extensions", "extension", extensionRoot,
+ projectId );
}
}
}
- private void rewriteReportPlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions )
+ private void rewriteReportPlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions,
+ String projectId )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( plugins != null )
@@ -350,20 +353,22 @@
if ( plugin.getVersion() != null )
{
updateDomVersion( plugin.getGroupId(), plugin.getArtifactId(), mappedVersions, plugin.getVersion(),
- originalVersions, "plugins", "plugin", pluginRoot );
+ originalVersions, "plugins", "plugin", pluginRoot, projectId );
}
}
}
}
private void updateDomVersion( String groupId, String artifactId, Map mappedVersions, String version,
- Map originalVersions, String groupTagName, String tagName, Element dependencyRoot )
+ Map originalVersions, String groupTagName, String tagName, Element dependencyRoot,
+ String projectId )
throws ReleaseExecutionException, ReleaseFailureException
{
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
String mappedVersion = (String) mappedVersions.get( key );
- if ( version.equals( originalVersions.get( key ) ) )
+ Object originalVersion = originalVersions.get( key );
+ if ( version.equals( originalVersion ) )
{
if ( mappedVersion != null )
{
@@ -380,7 +385,12 @@
// avoid if in management
if ( versionElement != null )
{
- versionElement.setText( mappedVersion );
+ // avoid if it was not originally set to the original value (it may be an expression), unless mapped version differs
+ if ( originalVersion.equals( versionElement.getTextTrim() ) ||
+ !mappedVersion.equals( mappedVersions.get( projectId ) ) )
+ {
+ versionElement.setText( mappedVersion );
+ }
}
}
catch ( JDOMException e )
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=399326&r1=399325&r2=399326&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java Wed May 3 08:00:54 2006
@@ -566,7 +566,7 @@
return config;
}
- private ReleaseConfiguration createMappedConfiguration( String path )
+ protected ReleaseConfiguration createMappedConfiguration( String path )
throws Exception
{
ReleaseConfiguration config = createDifferingVersionConfiguration( path );
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java?rev=399326&r1=399325&r2=399326&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java Wed May 3 08:00:54 2006
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Iterator;
/**
* Test the SCM modification check phase.
@@ -196,5 +197,43 @@
phase.execute( config );
assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
+
+ public void testRewriteInterpolatedVersions()
+ throws Exception
+ {
+ ReleaseConfiguration config = createMappedConfiguration( "interpolated-versions" );
+
+ phase.execute( config );
+
+ assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
+
+ public void testRewriteInterpolatedVersionsDifferentVersion()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "interpolated-versions" );
+
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject3", NEXT_VERSION );
+
+ phase.execute( config );
+
+ for ( Iterator i = config.getReactorProjects().iterator(); i.hasNext(); )
+ {
+ MavenProject project = (MavenProject) i.next();
+
+ // skip subproject1 - we don't need to worry about its version mapping change, it has no deps of any kind
+ if ( !"groupId".equals( project.getGroupId() ) || !"subproject1".equals( project.getArtifactId() ) )
+ {
+ File actualFile = project.getFile();
+ String actual = FileUtils.fileRead( actualFile );
+ File expectedFile = new File( actualFile.getParentFile(), "expected-pom-different-version.xml" );
+ String expected = FileUtils.fileRead( expectedFile );
+ assertEquals( "Check the transformed POM", expected, actual );
+ }
+ }
}
}
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,51 @@
+<!--
+ ~ 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.0</version>
+ <packaging>pom</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ <module>subproject3</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,51 @@
+<!--
+ ~ 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.0</version>
+ <packaging>pom</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ <module>subproject3</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,51 @@
+<!--
+ ~ 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.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ <module>subproject3</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,42 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,42 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,42 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,61 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject3</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom-different-version.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,61 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject3</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </extension>
+ </extensions>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml?rev=399326&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml Wed May 3 08:00:54 2006
@@ -0,0 +1,61 @@
+<!--
+ ~ 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>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject3</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </extension>
+ </extensions>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/interpolated-versions/subproject3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision