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/04/27 16:55:46 UTC
svn commit: r397561 - in /maven/plugins/trunk/maven-release-plugin: ./
src/main/java/org/apache/maven/plugins/release/
src/main/java/org/apache/maven/plugins/release/phase/
src/main/resources/META-INF/plexus/
src/test/java/org/apache/maven/plugins/rele...
Author: brett
Date: Thu Apr 27 07:55:43 2006
New Revision: 397561
URL: http://svn.apache.org/viewcvs?rev=397561&view=rev
Log:
[MRELEASE-98] more parent tests, and add dependency mapping
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml (with props)
Modified:
maven/plugins/trunk/maven-release-plugin/pom.xml
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ReleaseManager.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/main/resources/META-INF/plexus/components.xml
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
Modified: maven/plugins/trunk/maven-release-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/pom.xml?rev=397561&r1=397560&r2=397561&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/pom.xml Thu Apr 27 07:55:43 2006
@@ -109,6 +109,11 @@
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-8</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ReleaseManager.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ReleaseManager.java?rev=397561&r1=397560&r2=397561&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ReleaseManager.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/ReleaseManager.java Thu Apr 27 07:55:43 2006
@@ -1,7 +1,5 @@
package org.apache.maven.plugins.release;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
-
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.plugins.release.config.ReleaseConfiguration;
/**
* Release management classes.
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=397561&r1=397560&r2=397561&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 Thu Apr 27 07:55:43 2006
@@ -17,6 +17,7 @@
*/
import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.model.Dependency;
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.config.ReleaseConfiguration;
import org.apache.maven.plugins.release.scm.ReleaseScmCommandException;
@@ -37,10 +38,12 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Namespace;
+import org.jdom.Text;
import org.jdom.filter.ElementFilter;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
+import org.jdom.xpath.XPath;
import java.io.File;
import java.io.FileWriter;
@@ -66,6 +69,8 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
+ private static final String LS = System.getProperty( "line.separator" );
+
public void execute( ReleaseConfiguration releaseConfiguration )
throws ReleaseExecutionException
{
@@ -90,7 +95,7 @@
// rewrite DOM as a string to find differences, since text outside the root element is not tracked
StringWriter w = new StringWriter();
Format format = Format.getRawFormat();
- format.setLineSeparator( System.getProperty( "line.separator" ) );
+ format.setLineSeparator( LS );
XMLOutputter out = new XMLOutputter( format );
out.output( document.getRootElement(), w );
@@ -128,68 +133,100 @@
private void transformPomToReleaseVersionPom( MavenProject project, Element rootElement, Map mappedVersions )
throws ReleaseExecutionException
{
+ String parentVersion = null;
+ Namespace namespace = rootElement.getNamespace();
+ if ( project.hasParent() && project.getParentArtifact().isSnapshot() )
+ {
+ Element parentElement = rootElement.getChild( "parent", namespace );
+ Element versionElement = parentElement.getChild( "version", namespace );
+ MavenProject parent = project.getParent();
+ parentVersion = (String) mappedVersions.get(
+ ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() ) );
+ if ( parentVersion == null )
+ {
+ throw new ReleaseExecutionException( "Version for parent '" + parent.getName() + "' was not mapped" );
+ }
+ versionElement.setText( parentVersion );
+ }
+
if ( project.getArtifact().isSnapshot() )
{
// TODO: what about if version is inherited? shouldn't prompt...
- Element versionElement = rootElement.getChild( "version", rootElement.getNamespace() );
+ Element versionElement = rootElement.getChild( "version", namespace );
String version = (String) mappedVersions.get(
ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ) );
if ( version == null )
{
throw new ReleaseExecutionException( "Version for '" + project.getName() + "' was not mapped" );
}
- versionElement.setText( version );
- }
- if ( project.hasParent() && project.getParentArtifact().isSnapshot() )
- {
- Element parentElement = rootElement.getChild( "parent", rootElement.getNamespace() );
- Element versionElement = parentElement.getChild( "version", rootElement.getNamespace() );
- MavenProject parent = project.getParent();
- String version = (String) mappedVersions.get(
- ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() ) );
- if ( version == null )
+ if ( versionElement == null )
{
- throw new ReleaseExecutionException( "Version for parent '" + parent.getName() + "' was not mapped" );
+ if ( !version.equals( parentVersion ) )
+ {
+ // we will add this after artifactId
+ Element artifactIdElement = rootElement.getChild( "artifactId", namespace );
+ int index = rootElement.indexOf( artifactIdElement );
+
+ versionElement = new Element( "version", namespace );
+ versionElement.setText( version );
+ rootElement.addContent( index + 1, new Text( "\n " ) );
+ rootElement.addContent( index + 2, versionElement );
+ }
+ }
+ else
+ {
+ versionElement.setText( version );
}
- versionElement.setText( version );
}
- // TODO: rewrite SCM
- // TODO: rewrite dependencies
- // TODO: rewrite dependency management
- // TODO: rewrite extensions
- // TODO: rewrite plugins, plugin management
- // TODO: rewrite reporting plugins
-
-/*
- ProjectScmRewriter scmRewriter = getScmRewriter();
- scmRewriter.rewriteScmInfo( model, projectId, getTagLabel() );
-
- //Rewrite dependencies section
- List dependencies = model.getDependencies();
-
- ProjectVersionResolver versionResolver = getVersionResolver();
+ List dependencies = project.getDependencies();
if ( dependencies != null )
{
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
Dependency dep = (Dependency) i.next();
- // Avoid in dep mgmt
+
+ // Avoid if in dep mgmt
if ( dep.getVersion() != null )
{
- String resolvedVersion =
- versionResolver.getResolvedVersion( dep.getGroupId(), dep.getArtifactId() );
+ String key = ArtifactUtils.versionlessKey( dep.getGroupId(), dep.getArtifactId() );
+ String version = (String) mappedVersions.get( key );
+
+ if ( version == null )
+ {
+ throw new ReleaseExecutionException( "Version for dependency '" + key + "' was not mapped" );
+ }
+
+ getLogger().debug( "Updating " + dep.getArtifactId() + " to " + version );
+
+ try
+ {
+ XPath xpath = XPath.newInstance( "dependencies/dependency[groupId='" + dep.getGroupId() +
+ "' and artifactId='" + dep.getArtifactId() + "']" );
- if ( resolvedVersion != null )
+ Element dependency = (Element) xpath.selectSingleNode( rootElement );
+ dependency.getChild( "version" ).setText( version );
+ }
+ catch ( JDOMException e )
{
- getLog().info( "Updating " + dep.getArtifactId() + " to " + resolvedVersion );
- dep.setVersion( resolvedVersion );
+ throw new ReleaseExecutionException( "Unable to locate dependency to process in document", e );
}
}
}
}
+ // TODO: rewrite SCM
+ // TODO: rewrite dependency management
+ // TODO: rewrite extensions
+ // TODO: rewrite plugins, plugin management
+ // TODO: rewrite reporting plugins
+
+/*
+ ProjectScmRewriter scmRewriter = getScmRewriter();
+ scmRewriter.rewriteScmInfo( model, projectId, getTagLabel() );
+
+ ProjectVersionResolver versionResolver = getVersionResolver();
Build build = model.getBuild();
if ( build != null )
@@ -383,7 +420,7 @@
}
Format format = Format.getRawFormat();
- format.setLineSeparator( System.getProperty( "line.separator" ) );
+ format.setLineSeparator( LS );
XMLOutputter out = new XMLOutputter( format );
out.output( document.getRootElement(), writer );
@@ -687,7 +724,7 @@
*/
}
- /*
+/*
private String resolveVersion( Artifact artifact, String artifactUsage, List pluginArtifactRepositories )
throws MojoExecutionException
{
Modified: maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml?rev=397561&r1=397560&r2=397561&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml Thu Apr 27 07:55:43 2006
@@ -1,3 +1,19 @@
+<!--
+ ~ 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.
+ -->
+
<component-set>
<components>
<component>
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=397561&r1=397560&r2=397561&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 Thu Apr 27 07:55:43 2006
@@ -1,9 +1,22 @@
package org.apache.maven.plugins.release.phase;
/*
- * 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.
+ * 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.
*/
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.config.ReleaseConfiguration;
import org.apache.maven.plugins.release.scm.DefaultScmRepositoryConfigurator;
@@ -28,8 +41,10 @@
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* Test the SCM modification check phase.
@@ -79,15 +94,9 @@
ReleaseConfiguration config = createConfigurationFromProjects( "pom-with-parent" );
// remove parent from processing so it fails when looking at the parent of the child instead
- for ( Iterator i = config.getReactorProjects().iterator(); i.hasNext(); )
- {
- MavenProject project = (MavenProject) i.next();
- if ( "subproject1".equals( project.getArtifactId() ) )
- {
- config.setReactorProjects( Collections.singletonList( project ) );
- }
- }
-
+ MavenProject project =
+ (MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject1" );
+ config.setReactorProjects( Collections.singletonList( project ) );
config.mapReleaseVersion( "groupId:subproject1", "2.0" );
try
@@ -114,6 +123,78 @@
assertTrue( compareFiles( config.getReactorProjects() ) );
}
+ public void testRewritePomWithInheritedVersion()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "pom-with-inherited-version" );
+
+ config.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject1", "1.0" );
+
+ phase.execute( config );
+
+ assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
+
+ public void testRewritePomWithChangedInheritedVersion()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "pom-with-inherited-version" );
+
+ config.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject1", "2.0" );
+
+ phase.execute( config );
+
+ MavenProject project =
+ (MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject1" );
+
+ String actual = FileUtils.fileRead( project.getFile() );
+ String expected =
+ FileUtils.fileRead( new File( project.getFile().getParentFile(), "expected-pom-version-changed.xml" ) );
+ assertEquals( "Check the transformed POM", expected, actual );
+ }
+
+ public void testRewritePomDependencies()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-dependencies" );
+
+ config.mapReleaseVersion( "groupId:subproject1", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject2", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject3", "1.0" );
+ config.mapReleaseVersion( "groupId:artifactId", "1.0" );
+
+ phase.execute( config );
+
+ assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
+
+ public void testRewritePomUnmappedDependencies()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-dependencies" );
+
+ MavenProject project =
+ (MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject2" );
+ config.setReactorProjects( Collections.singletonList( project ) );
+
+ config.mapReleaseVersion( "groupId:subproject2", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject3", "1.0" );
+ config.mapReleaseVersion( "groupId:artifactId", "1.0" );
+
+ try
+ {
+ phase.execute( config );
+
+ fail( "Should have thrown an exception" );
+ }
+ catch ( ReleaseExecutionException e )
+ {
+ assertNull( "Check no cause", e.getCause() );
+ }
+ }
+
public void testRewriteBasicPomWithEditMode()
throws Exception
{
@@ -295,5 +376,17 @@
assertEquals( "Check the transformed POM", expected, actual );
}
return true;
+ }
+
+ private static Map getProjectsAsMap( List reactorProjects )
+ {
+ Map map = new HashMap();
+ for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ {
+ MavenProject project = (MavenProject) i.next();
+
+ map.put( ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ), project );
+ }
+ return map;
}
}
Added: 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=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/expected-pom.xml Thu Apr 27 07:55:43 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>
+ <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/internal-snapshot-dependencies/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/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/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=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/pom.xml Thu Apr 27 07:55:43 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>
+ <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/internal-snapshot-dependencies/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/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/subproject1/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/subproject1/expected-pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml Thu Apr 27 07:55:43 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>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/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/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml Thu Apr 27 07:55:43 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>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject1/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/subproject2/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/subproject2/expected-pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/expected-pom.xml Thu Apr 27 07:55:43 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>
+ <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/internal-snapshot-dependencies/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/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/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/pom.xml Thu Apr 27 07:55:43 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>
+ <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/internal-snapshot-dependencies/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject2/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/subproject3/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/subproject3/expected-pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/expected-pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,40 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <dependencies>
+ <!-- Test different release version remains the same -->
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/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/subproject3/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,40 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <dependencies>
+ <!-- Test different release version remains the same -->
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-dependencies/subproject3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,27 @@
+<!--
+ ~ 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>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/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-inherited-version/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,27 @@
+<!--
+ ~ 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>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml Thu Apr 27 07:55:43 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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.0</version>
+
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/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-inherited-version/subproject1/expected-pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,27 @@
+<!--
+ ~ 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>
+
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/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-inherited-version/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml?rev=397561&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml Thu Apr 27 07:55:43 2006
@@ -0,0 +1,27 @@
+<!--
+ ~ 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>
+
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/pom-with-inherited-version/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision