Author: bentmann
Date: Sat May 24 06:46:58 2008
New Revision: 659823
URL: http://svn.apache.org/viewvc?rev=659823&view=rev
Log:
o Fixed handling of non-coalesced text
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/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=659823&r1=659822&r2=659823&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
Sat May 24 06:46:58 2008
@@ -45,7 +45,6 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
import org.jdom.Comment;
-import org.jdom.Content;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -309,10 +308,23 @@
{
for ( Iterator it = element.getContent().iterator(); it.hasNext();
)
{
- Content content = (Content) it.next();
+ Object content = it.next();
if ( ( content instanceof Text ) && ( (Text) content
).getTextTrim().length() > 0 )
{
text = (Text) content;
+ while ( it.hasNext() )
+ {
+ content = it.next();
+ if ( content instanceof Text )
+ {
+ text.append( (Text) content );
+ it.remove();
+ }
+ else
+ {
+ break;
+ }
+ }
break;
}
}
@@ -323,13 +335,11 @@
}
else
{
- String leadingWhitespace = "";
- String trailingWhitespace = "";
String chars = text.getText();
String trimmed = text.getTextTrim();
int idx = chars.indexOf( trimmed );
- leadingWhitespace = chars.substring( 0, idx );
- trailingWhitespace = chars.substring( idx + trimmed.length() );
+ String leadingWhitespace = chars.substring( 0, idx );
+ String trailingWhitespace = chars.substring( idx +
trimmed.length() );
text.setText( leadingWhitespace + value + trailingWhitespace );
}
}
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=659823&r1=659822&r2=659823&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
Sat May 24 06:46:58 2008
@@ -547,6 +547,18 @@
assertTrue( comparePomFiles( reactorProjects ) );
}
+ public void testRewriteCDataAroundValues()
+ throws Exception
+ {
+ List reactorProjects = createReactorProjects( "cdata-around-values" );
+ 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/cdata-around-values/expected-release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,56 @@
+<?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>
+ <scm>
+
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+ <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/cdata-around-values/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]>-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></connection>
+
<developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/trunk]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[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/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+ <scm>
+
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+ <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/cdata-around-values/subproject1/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/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/cdata-around-values/subproject1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ <scm>
+
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+ <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/cdata-around-values/subproject2/expected-release-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/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/cdata-around-values/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.1-SNAPSHOT]]></version>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></connection>
+
<developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/trunk]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.1-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[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/cdata-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/tags/release-label]]></connection>
+
<developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/tags/release-label]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/tags/release-label]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[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/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.1-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.1-SNAPSHOT]]></version>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.1-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.1-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.1-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/tags/release-label]]></connection>
+
<developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/tags/release-label]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/tags/release-label]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[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/cdata-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]>-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></connection>
+
<developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/trunk]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[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/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml?rev=659823&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml
Sat May 24 06:46:58 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
