You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2007/02/07 03:28:16 UTC
svn commit: r504415 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/
t...
Author: epunzalan
Date: Tue Feb 6 18:28:14 2007
New Revision: 504415
URL: http://svn.apache.org/viewvc?view=rev&rev=504415
Log:
[MRELEASE-194]
update the expression in pom properties if the expression was caught defining an artifact version instead of a version value
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/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/RewritePomsForDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.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?view=diff&rev=504415&r1=504414&r2=504415
==============================================================================
--- 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 Tue Feb 6 18:28:14 2007
@@ -207,6 +207,7 @@
Namespace namespace = rootElement.getNamespace();
Map mappedVersions = getNextVersionMap( releaseDescriptor );
Map originalVersions = getOriginalVersionMap( releaseDescriptor, reactorProjects );
+ Element properties = rootElement.getChild( "properties", namespace );
String parentVersion = rewriteParent( project, rootElement, namespace, mappedVersions, originalVersions );
@@ -215,7 +216,7 @@
rewriteVersion( rootElement, namespace, mappedVersions, projectId, project, parentVersion );
rewriteDependencies( project.getDependencies(), rootElement, mappedVersions, originalVersions, projectId,
- result );
+ properties, result );
if ( project.getDependencyManagement() != null )
{
@@ -223,7 +224,7 @@
if ( dependencyRoot != null )
{
rewriteDependencies( project.getDependencyManagement().getDependencies(), dependencyRoot,
- mappedVersions, originalVersions, projectId, result );
+ mappedVersions, originalVersions, projectId, properties, result );
}
}
@@ -233,18 +234,18 @@
if ( buildRoot != null )
{
rewritePlugins( project.getBuildPlugins(), buildRoot, mappedVersions, originalVersions, projectId,
- result );
+ properties, result );
if ( project.getPluginManagement() != null )
{
Element pluginsRoot = buildRoot.getChild( "pluginManagement", namespace );
if ( pluginsRoot != null )
{
rewritePlugins( project.getPluginManagement().getPlugins(), pluginsRoot, mappedVersions,
- originalVersions, projectId, result );
+ originalVersions, projectId, properties, result );
}
}
rewriteExtensions( project.getBuildExtensions(), buildRoot, mappedVersions, originalVersions, projectId,
- result );
+ properties, result );
}
}
@@ -254,7 +255,7 @@
if ( pluginsRoot != null )
{
rewriteReportPlugins( project.getReportPlugins(), pluginsRoot, mappedVersions, originalVersions,
- projectId, result );
+ projectId, properties, result );
}
}
@@ -320,7 +321,7 @@
}
private void rewriteDependencies( List dependencies, Element dependencyRoot, Map mappedVersions,
- Map originalVersions, String projectId, ReleaseResult result )
+ Map originalVersions, String projectId, Element properties, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( dependencies != null )
@@ -330,13 +331,14 @@
Dependency dep = (Dependency) i.next();
updateDomVersion( dep.getGroupId(), dep.getArtifactId(), mappedVersions, dep.getVersion(),
- originalVersions, "dependencies", "dependency", dependencyRoot, projectId, result );
+ originalVersions, "dependencies", "dependency", dependencyRoot, projectId,
+ properties, result );
}
}
}
private void rewritePlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions,
- String projectId, ReleaseResult result )
+ String projectId, Element properties, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( plugins != null )
@@ -349,14 +351,15 @@
if ( plugin.getVersion() != null )
{
updateDomVersion( plugin.getGroupId(), plugin.getArtifactId(), mappedVersions, plugin.getVersion(),
- originalVersions, "plugins", "plugin", pluginRoot, projectId, result );
+ originalVersions, "plugins", "plugin", pluginRoot, projectId,
+ properties, result );
}
}
}
}
private void rewriteExtensions( List extensions, Element extensionRoot, Map mappedVersions, Map originalVersions,
- String projectId, ReleaseResult result )
+ String projectId, Element properties, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( extensions != null )
@@ -367,13 +370,13 @@
updateDomVersion( extension.getGroupId(), extension.getArtifactId(), mappedVersions,
extension.getVersion(), originalVersions, "extensions", "extension", extensionRoot,
- projectId, result );
+ projectId, properties, result );
}
}
}
private void rewriteReportPlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions,
- String projectId, ReleaseResult result )
+ String projectId, Element properties, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
if ( plugins != null )
@@ -386,7 +389,8 @@
if ( plugin.getVersion() != null )
{
updateDomVersion( plugin.getGroupId(), plugin.getArtifactId(), mappedVersions, plugin.getVersion(),
- originalVersions, "plugins", "plugin", pluginRoot, projectId, result );
+ originalVersions, "plugins", "plugin", pluginRoot, projectId,
+ properties, result );
}
}
}
@@ -394,7 +398,7 @@
private void updateDomVersion( String groupId, String artifactId, Map mappedVersions, String version,
Map originalVersions, String groupTagName, String tagName, Element dependencyRoot,
- String projectId, ReleaseResult result )
+ String projectId, Element properties, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
@@ -431,11 +435,54 @@
// avoid if in management
if ( versionElement != null )
{
+ String versionText = versionElement.getTextTrim();
+
// 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() ) ||
+ if ( originalVersion.equals( versionText ) ||
!mappedVersion.equals( mappedVersions.get( projectId ) ) )
{
versionElement.setText( mappedVersion );
+ }
+ else if ( versionText.matches( "\\$\\{project.+\\}" )
+ || versionText.matches( "\\$\\{pom.+\\}" ) )
+ {
+ logInfo( result, "Ignoring artifact version update for expression: " + versionText );
+ //ignore... we cannot update this expression
+ }
+ else if ( versionText.matches( "\\$\\{.+\\}" ) && properties != null )
+ {
+ //version is an expression, check for properties to update instead
+ String expression = versionText.substring( 2, versionText.length() - 1 );
+ Element property = properties.getChild( expression, properties.getNamespace() );
+ if ( property != null )
+ {
+ String propertyValue = property.getTextTrim();
+
+ if ( originalVersion.equals( propertyValue ) )
+ {
+ // change the property only if the property is the same as what's in the reactor
+ property.setText( mappedVersion );
+ }
+ else if ( !mappedVersion.equals( versionText ) )
+ {
+ // the value of the expression conflicts with what the user wanted to release
+ throw new ReleaseFailureException( "The artifact (" + key + ") requires a " +
+ "different version (" + mappedVersion + ") than what is found (" +
+ propertyValue + ") for the expression (" + expression + ") in the " +
+ "project (" + projectId + ")." );
+ }
+ }
+ else
+ {
+ // the expression used to define the version of this artifact may be inherited
+ throw new ReleaseFailureException( "The version could not be updated: " +
+ versionText );
+ }
+ }
+ else
+ {
+ // the version for this artifact could not be updated.
+ throw new ReleaseFailureException( "The version could not be updated: " + versionText );
}
}
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?view=diff&rev=504415&r1=504414&r2=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Tue Feb 6 18:28:14 2007
@@ -267,4 +267,24 @@
assertTrue( compareFiles( reactorProjects ) );
}
+
+ public void testRewritePomWithParentAndProperties()
+ throws Exception
+ {
+ List reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ mapScm( config );
+
+ phase.execute( config, null, reactorProjects );
+
+ assertTrue( compareFiles( reactorProjects ) );
+ }
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java?view=diff&rev=504415&r1=504414&r2=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java Tue Feb 6 18:28:14 2007
@@ -266,6 +266,21 @@
assertTrue( compareFiles( reactorProjects ) );
}
+ public void testRewritePomWithParentAndProperties()
+ throws Exception
+ {
+ List reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, null, reactorProjects );
+
+ assertTrue( compareFiles( reactorProjects ) );
+ }
+
protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
{
ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,34 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.1-SNAPSHOT</version>
+
+ <properties>
+ <module.version>2.0</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,34 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+
+ <properties>
+ <module.version>2.0</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,42 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+ <version>2.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${module.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <module.version>2.1-SNAPSHOT</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,42 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+ <version>2.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${module.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <module.version>2.0</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-parent-and-properties/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/tags/release-label</url>
+ </scm>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,34 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+
+ <properties>
+ <module.version>2.0-SNAPSHOT</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,34 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.0-SNAPSHOT</version>
+
+ <properties>
+ <module.version>2.0-SNAPSHOT</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,42 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+ <version>2.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${module.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <module.version>2.0</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml?view=auto&rev=504415
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml Tue Feb 6 18:28:14 2007
@@ -0,0 +1,42 @@
+<?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>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+ <version>2.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>${module.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <module.version>2.0-SNAPSHOT</module.version>
+ <ignored.property>ignored</ignored.property>
+ </properties>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-properties/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native