You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/05/23 01:06:24 UTC
svn commit: r659301 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
test/resources/projects/generate-release-poms/whitespace-around-coords/
test/reso...
Author: bentmann
Date: Thu May 22 16:06:22 2008
New Revision: 659301
URL: http://svn.apache.org/viewvc?rev=659301&view=rev
Log:
[MRELEASE-267] Whitespaces in artifactId or groupId prevent version update
Submitted by: René Link
Reviewed by: Benjamin Bentmann
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml (with props)
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/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
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=659301&r1=659300&r2=659301&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 May 22 16:06:22 2008
@@ -267,6 +267,27 @@
ReleaseUtil.getRootProject( reactorProjects ) );
}
+ /**
+ * Updates the version information in the given <code><version></code> element.
+ *
+ * @param versionElement The version element to update, must not be <code>null</code>.
+ * @param version The version string to set, must not be <code>null</code>.
+ */
+ private void rewriteVersion( Element versionElement, String version )
+ {
+ String leadingWhitespace = "";
+ String trailingWhitespace = "";
+ String text = versionElement.getText();
+ if ( StringUtils.isNotEmpty( text ) )
+ {
+ String trimmed = text.trim();
+ int idx = text.indexOf( trimmed );
+ leadingWhitespace = text.substring( 0, idx );
+ trailingWhitespace = text.substring( idx + trimmed.length() );
+ }
+ versionElement.setText( leadingWhitespace + version + trailingWhitespace );
+ }
+
private void rewriteVersion( Element rootElement, Namespace namespace, Map mappedVersions, String projectId,
MavenProject project, String parentVersion )
throws ReleaseFailureException
@@ -294,7 +315,7 @@
}
else
{
- versionElement.setText( version );
+ rewriteVersion( versionElement, version );
}
}
@@ -319,7 +340,7 @@
}
else
{
- versionElement.setText( parentVersion );
+ rewriteVersion( versionElement, parentVersion );
}
}
return parentVersion;
@@ -425,14 +446,14 @@
XPath xpath;
if ( !StringUtils.isEmpty( dependencyRoot.getNamespaceURI() ) )
{
- xpath = XPath.newInstance( "./pom:" + groupTagName + "/pom:" + tagName + "[pom:groupId='" + groupId +
- "' and pom:artifactId='" + artifactId + "']" );
+ xpath = XPath.newInstance( "./pom:" + groupTagName + "/pom:" + tagName + "[normalize-space(pom:groupId)='" + groupId +
+ "' and normalize-space(pom:artifactId)='" + artifactId + "']" );
xpath.addNamespace( "pom", dependencyRoot.getNamespaceURI() );
}
else
{
- xpath = XPath.newInstance( "./" + groupTagName + "/" + tagName + "[groupId='" + groupId +
- "' and artifactId='" + artifactId + "']" );
+ xpath = XPath.newInstance( "./" + groupTagName + "/" + tagName + "[normalize-space(groupId)='" + groupId +
+ "' and normalize-space(artifactId)='" + artifactId + "']" );
}
List dependencies = xpath.selectNodes( dependencyRoot );
@@ -509,7 +530,7 @@
{
if ( mappedVersion == null )
{
- versionElement.setText( resolvedSnapshotVersion );
+ rewriteVersion( versionElement, resolvedSnapshotVersion );
return;
}
@@ -519,7 +540,7 @@
if ( originalVersion.equals( versionText ) ||
!mappedVersion.equals( mappedVersions.get( projectId ) ) )
{
- versionElement.setText( mappedVersion );
+ rewriteVersion( versionElement, mappedVersion );
}
else if ( versionText.matches( "\\$\\{project.+\\}" ) ||
versionText.matches( "\\$\\{pom.+\\}" ) || "${version}".equals( versionText ) )
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=659301&r1=659300&r2=659301&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java Thu May 22 16:06:22 2008
@@ -499,6 +499,18 @@
}
}
+ public void testRewriteWhitespaceAroundCoords()
+ throws Exception
+ {
+ List reactorProjects = createReactorProjects( "whitespace-around-coords" );
+ ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+ mapNextVersion( config, "groupId:subproject2" );
+
+ phase.execute( config, null, reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
public void testCleanNoProjects()
throws Exception
{
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>target</directory>
+ </build>
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>${remoterepo}</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
+</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/expected-release-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,68 @@
+<!--
+ ~ 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>
+ 2.0-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>target</directory>
+ </build>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>${remoterepo}</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
+</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/expected-release-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>target</directory>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>${remoterepo}</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
+</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/expected-release-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,68 @@
+<!--
+ ~ 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>pom</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.1-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.1-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,68 @@
+<!--
+ ~ 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>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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.1-SNAPSHOT
+ </version>
+ </parent>
+
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.1-SNAPSHOT
+ </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0
+ </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ 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.1-SNAPSHOT
+ </version>
+ </parent>
+
+ <artifactId>
+ subproject2
+ </artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.1-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.1-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0
+ </version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0
+ </version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,68 @@
+<!--
+ ~ 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>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,68 @@
+<!--
+ ~ 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>
+ 2.0-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0
+ </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0
+ </version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0
+ </version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml?rev=659301&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml Thu May 22 16:06:22 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ 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>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>
+ groupId
+ </groupId>
+ <artifactId>
+ subproject1
+ </artifactId>
+ <version>
+ 2.0-SNAPSHOT
+ </version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/whitespace-around-coords/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision