You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/07 08:20:00 UTC
svn commit: r404727 - in /maven/plugins/trunk/maven-release-plugin/src:
main/java/org/apache/maven/plugins/release/phase/
test/java/org/apache/maven/plugins/release/phase/
test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/
test/re...
Author: brett
Date: Sat May 6 23:19:56 2006
New Revision: 404727
URL: http://svn.apache.org/viewcvs?rev=404727&view=rev
Log:
correct SCM mapping over multiple levels
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (with props)
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.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/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom.xml
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java Sat May 6 23:19:56 2006
@@ -48,20 +48,20 @@
// If SCM is null in original model, it is inherited, no mods needed
if ( project.getScm() != null )
{
- ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
- if ( translator != null )
+ Element scmRoot = rootElement.getChild( "scm", namespace );
+ if ( scmRoot != null )
{
- Element scmRoot = rootElement.getChild( "scm", namespace );
- if ( scmRoot != null )
+ Map originalScmInfo = releaseConfiguration.getOriginalScmInfo();
+ // check containsKey, not == null, as we store null as a value
+ if ( !originalScmInfo.containsKey( projectId ) )
{
- Map originalScmInfo = releaseConfiguration.getOriginalScmInfo();
- // check containsKey, not == null, as we store null as a value
- if ( !originalScmInfo.containsKey( projectId ) )
- {
- throw new ReleaseExecutionException(
- "Unable to find original SCM info for '" + project.getName() + "'" );
- }
+ throw new ReleaseExecutionException(
+ "Unable to find original SCM info for '" + project.getName() + "'" );
+ }
+ ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
+ if ( translator != null )
+ {
Scm scm = (Scm) originalScmInfo.get( projectId );
if ( scm != null )
@@ -77,10 +77,10 @@
rewriteElement( "scm", null, rootElement, namespace );
}
}
- }
- else
- {
- getLogger().debug( "No SCM translator found - skipping rewrite" );
+ else
+ {
+ getLogger().debug( "No SCM translator found - skipping rewrite" );
+ }
}
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java Sat May 6 23:19:56 2006
@@ -47,78 +47,89 @@
// If SCM is null in original model, it is inherited, no mods needed
if ( project.getScm() != null )
{
- ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
- if ( translator != null )
+ Element scmRoot = rootElement.getChild( "scm", namespace );
+ if ( scmRoot != null )
{
- Element scmRoot = rootElement.getChild( "scm", namespace );
- if ( scmRoot != null )
- {
- releaseConfiguration.mapOriginalScmInfo( projectId, project.getScm() );
+ releaseConfiguration.mapOriginalScmInfo( projectId, project.getScm() );
- translateScm( project, releaseConfiguration, translator, scmRoot, namespace );
- }
- else if ( project.getParent() != null )
+ translateScm( project, releaseConfiguration, scmRoot, namespace, scmRepository );
+ }
+ else
+ {
+ releaseConfiguration.mapOriginalScmInfo( projectId, null );
+
+ MavenProject parent = project.getParent();
+ if ( parent != null )
{
// If the SCM element is not present, only add it if the parent was not mapped (ie, it's external to
- // the release process and so has not been modified, so the values will not be correct on the tag)
- String parentId = ArtifactUtils.versionlessKey( project.getParent().getGroupId(),
- project.getParent().getArtifactId() );
+ // the release process and so has not been modified, so the values will not be correct on the tag),
+ String parentId = ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() );
if ( !releaseConfiguration.getOriginalScmInfo().containsKey( parentId ) )
{
// we need to add it, since it has changed from the inherited value
- releaseConfiguration.mapOriginalScmInfo( projectId, null );
-
scmRoot = new Element( "scm" );
scmRoot.addContent( "\n " );
- rootElement.addContent( "\n " ).addContent( scmRoot ).addContent( "\n" );
- translateScm( project, releaseConfiguration, translator, scmRoot, namespace );
+ if ( translateScm( project, releaseConfiguration, scmRoot, namespace, scmRepository ) )
+ {
+ rootElement.addContent( "\n " ).addContent( scmRoot ).addContent( "\n" );
+ }
}
}
}
- else
- {
- getLogger().debug( "No SCM translator found - skipping rewrite" );
- }
}
}
- private void translateScm( MavenProject project, ReleaseConfiguration releaseConfiguration,
- ScmTranslator translator, Element scmRoot, Namespace namespace )
+ private boolean translateScm( MavenProject project, ReleaseConfiguration releaseConfiguration, Element scmRoot,
+ Namespace namespace, ScmRepository scmRepository )
{
- Scm scm = project.getScm();
- String tag = releaseConfiguration.getReleaseLabel();
- String tagBase = releaseConfiguration.getTagBase();
-
- // TODO: svn utils should take care of prepending this
- if ( tagBase != null )
+ ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider() );
+ boolean result = false;
+ if ( translator != null )
{
- tagBase = "scm:svn:" + tagBase;
- }
- String value = translator.translateTagUrl( scm.getConnection(), tag, tagBase );
- if ( !value.equals( scm.getConnection() ) )
- {
- rewriteElement( "connection", value, scmRoot, namespace );
- }
+ Scm scm = project.getScm();
+ String tag = releaseConfiguration.getReleaseLabel();
+ String tagBase = releaseConfiguration.getTagBase();
- value = translator.translateTagUrl( scm.getDeveloperConnection(), tag, tagBase );
- if ( !value.equals( scm.getDeveloperConnection() ) )
- {
- rewriteElement( "developerConnection", value, scmRoot, namespace );
- }
+ // TODO: svn utils should take care of prepending this
+ if ( tagBase != null )
+ {
+ tagBase = "scm:svn:" + tagBase;
+ }
+ String value = translator.translateTagUrl( scm.getConnection(), tag, tagBase );
+ if ( !value.equals( scm.getConnection() ) )
+ {
+ rewriteElement( "connection", value, scmRoot, namespace );
+ result = true;
+ }
- // use original tag base without protocol
- value = translator.translateTagUrl( scm.getUrl(), tag, releaseConfiguration.getTagBase() );
- if ( !value.equals( scm.getUrl() ) )
- {
- rewriteElement( "url", value, scmRoot, namespace );
- }
+ value = translator.translateTagUrl( scm.getDeveloperConnection(), tag, tagBase );
+ if ( !value.equals( scm.getDeveloperConnection() ) )
+ {
+ rewriteElement( "developerConnection", value, scmRoot, namespace );
+ result = true;
+ }
+
+ // use original tag base without protocol
+ value = translator.translateTagUrl( scm.getUrl(), tag, releaseConfiguration.getTagBase() );
+ if ( !value.equals( scm.getUrl() ) )
+ {
+ rewriteElement( "url", value, scmRoot, namespace );
+ result = true;
+ }
- value = translator.resolveTag( tag );
- if ( value != null && !value.equals( scm.getTag() ) )
+ value = translator.resolveTag( tag );
+ if ( value != null && !value.equals( scm.getTag() ) )
+ {
+ rewriteElement( "tag", value, scmRoot, namespace );
+ result = true;
+ }
+ }
+ else
{
- rewriteElement( "tag", value, scmRoot, namespace );
+ getLogger().debug( "No SCM translator found - skipping rewrite" );
}
+ return result;
}
protected Map getOriginalVersionMap( ReleaseConfiguration releaseConfiguration )
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=404727&r1=404726&r2=404727&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 23:19:56 2006
@@ -256,9 +256,13 @@
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:subproject1", RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subproject1", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subsubproject", RELEASE_VERSION );
+ config.mapDevelopmentVersion( "groupId:subsubproject", NEXT_VERSION );
config.mapOriginalScmInfo( "groupId:artifactId", null );
+ config.mapOriginalScmInfo( "groupId:subproject1", null );
+ config.mapOriginalScmInfo( "groupId:subsubproject", null );
phase.execute( config );
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java Sat May 6 23:19:56 2006
@@ -252,8 +252,8 @@
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
- ReleaseConfiguration config =
- createConfigurationForPomWithParentAlternateNextVersion( "basic-pom-inherited-scm" );
+ ReleaseConfiguration config = createConfigurationForWithParentNextVersion( "basic-pom-inherited-scm" );
+ config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
phase.execute( config );
Modified: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected-pom.xml?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected-pom.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/expected-pom.xml Sat May 6 23:19:56 2006
@@ -31,4 +31,8 @@
<prerequisites>
<maven>2.0.4</maven>
</prerequisites>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
</project>
Modified: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml Sat May 6 23:19:56 2006
@@ -32,6 +32,10 @@
<maven>2.0.4</maven>
</prerequisites>
+ <modules>
+ <module>subproject1</module>
+ </modules>
+
<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>
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml Sat May 6 23:19:56 2006
@@ -0,0 +1,32 @@
+<?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>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml Sat May 6 23:19:56 2006
@@ -0,0 +1,32 @@
+<?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>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml Sat May 6 23:19:56 2006
@@ -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>groupId</groupId>
+ <artifactId>subproject1</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/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml Sat May 6 23:19:56 2006
@@ -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>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom.xml?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/expected-pom.xml Sat May 6 23:19:56 2006
@@ -32,9 +32,14 @@
<maven>2.0.4</maven>
</prerequisites>
+ <modules>
+ <module>subproject1</module>
+ </modules>
+
<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>
-</project>
\ No newline at end of file
+</project>
+
Modified: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml?rev=404727&r1=404726&r2=404727&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/pom.xml Sat May 6 23:19:56 2006
@@ -31,4 +31,9 @@
<prerequisites>
<maven>2.0.4</maven>
</prerequisites>
-</project>
\ No newline at end of file
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
+
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml Sat May 6 23:19:56 2006
@@ -0,0 +1,33 @@
+<?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>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
+
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml Sat May 6 23:19:56 2006
@@ -0,0 +1,33 @@
+<?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>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
+
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml Sat May 6 23:19:56 2006
@@ -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>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml?rev=404727&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml Sat May 6 23:19:56 2006
@@ -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>groupId</groupId>
+ <artifactId>subproject1</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/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision