Author: brett
Date: Sat May 6 00:09:30 2006
New Revision: 400254
URL: http://svn.apache.org/viewcvs?rev=400254&view=rev
Log:
- add test for fix handling when POM already had a namespace to release rewrite
- fix problem when a dependency is inherited and add test
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
(with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject2/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
Sat May 6 00:09:30 2006
@@ -111,6 +111,8 @@
try
{
String content = FileUtils.fileRead( project.getFile() );
+ // we need to eliminate any extra whitespace inside elements, as
JDOM will nuke it
+ content = content.replaceAll( "<([^!][^>]*?)\\s{2,}([^>]*?)>",
"<$1 $2>" );
SAXBuilder builder = new SAXBuilder();
document = builder.build( new StringReader( content ) );
@@ -377,7 +379,7 @@
try
{
- XPath xpath = null;
+ XPath xpath;
if ( !StringUtils.isEmpty(
dependencyRoot.getNamespaceURI() ) )
{
xpath = XPath.newInstance( "./pom:" + groupTagName +
"/pom:" + tagName + "[pom:groupId='" +
@@ -391,16 +393,20 @@
}
Element dependency = (Element) xpath.selectSingleNode(
dependencyRoot );
- Element versionElement = dependency.getChild( "version",
dependencyRoot.getNamespace() );
-
- // avoid if in management
- if ( versionElement != null )
+ // If it was inherited, nothing to do
+ if ( dependency != null )
{
- // avoid if it was not originally set to the original
value (it may be an expression), unless mapped version differs
- if ( originalVersion.equals(
versionElement.getTextTrim() ) ||
- !mappedVersion.equals( mappedVersions.get(
projectId ) ) )
+ Element versionElement = dependency.getChild(
"version", dependencyRoot.getNamespace() );
+
+ // avoid if in management
+ if ( versionElement != null )
{
- versionElement.setText( mappedVersion );
+ // avoid if it was not originally set to the
original value (it may be an expression), unless mapped version differs
+ if ( originalVersion.equals(
versionElement.getTextTrim() ) ||
+ !mappedVersion.equals( mappedVersions.get(
projectId ) ) )
+ {
+ versionElement.setText( mappedVersion );
+ }
}
}
}
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
Sat May 6 00:09:30 2006
@@ -148,6 +148,7 @@
throws Exception
{
ReleaseConfiguration config = createDefaultConfiguration(
"internal-snapshot-dependencies" );
+ mapNextVersion( config, "groupId:subsubproject" );
phase.execute( config );
@@ -605,4 +606,14 @@
protected abstract String readTestProjectFile( String fileName )
throws IOException;
+
+ public void testRewritePomDependenciesWithNamespace()
+ throws Exception
+ {
+ ReleaseConfiguration config = createDefaultConfiguration(
"pom-with-namespace" );
+
+ phase.execute( config );
+
+ assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
}
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
Sat May 6 00:09:30 2006
@@ -248,14 +248,4 @@
assertTrue( compareFiles( config.getReactorProjects() ) );
}
-
- public void testRewritePomDependenciesWithNamespace()
- throws Exception
- {
- ReleaseConfiguration config = createDefaultConfiguration(
"pom-with-namespace" );
-
- phase.execute( config );
-
- assertTrue( compareFiles( config.getReactorProjects() ) );
- }
}
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/expected-pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/expected-pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -25,5 +25,6 @@
<module>subproject1</module>
<module>subproject2</module>
<module>subproject3</module>
+ <module>subproject4</module>
</modules>
</project>
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/pom.xml
Sat May 6 00:09:30 2006
@@ -25,5 +25,6 @@
<module>subproject1</module>
<module>subproject2</module>
<module>subproject3</module>
+ <module>subproject4</module>
</modules>
</project>
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ 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>subproject4</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ 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>subproject4</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject4</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject4</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/expected-pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/expected-pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject1/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>groupId</groupId>
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject2/expected-pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject2/expected-pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/pom-with-namespace/subproject2/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -14,8 +14,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>groupId</groupId>
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -25,5 +25,6 @@
<module>subproject1</module>
<module>subproject2</module>
<module>subproject3</module>
+ <module>subproject4</module>
</modules>
</project>
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml?rev=400254&r1=400253&r2=400254&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml
Sat May 6 00:09:30 2006
@@ -25,5 +25,6 @@
<module>subproject1</module>
<module>subproject2</module>
<module>subproject3</module>
+ <module>subproject4</module>
</modules>
</project>
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ 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>subproject4</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ 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>subproject4</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject4</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,28 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,28 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,36 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,34 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <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>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml?rev=400254&view=auto
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
(added)
+++
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
Sat May 6 00:09:30 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <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>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-namespace/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
