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/28 04:44:10 UTC
svn commit: r397742 [1/2] - 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-release/internal-differing-snapshot-pl...
Author: brett
Date: Thu Apr 27 19:44:07 2006
New Revision: 397742
URL: http://svn.apache.org/viewcvs?rev=397742&view=rev
Log:
[MRELEASE-98] plugin rewriting
Added:
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject1/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject1/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject1/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject2/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject2/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject2/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject3/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject3/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject3/pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject4/
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject4/expected-pom.xml (with props)
maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/subproject4/pom.xml (with props)
Modified:
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/RewritePomsForReleasePhaseTest.java
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=397742&r1=397741&r2=397742&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 19:44:07 2006
@@ -18,6 +18,8 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.config.ReleaseConfiguration;
import org.apache.maven.plugins.release.scm.ReleaseScmCommandException;
@@ -197,65 +199,45 @@
}
}
- // TODO: rewrite SCM
- // 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 )
+ if ( project.getBuild() != null )
{
- //Rewrite plugins section
- List plugins = build.getPlugins();
-
- if ( plugins != null )
+ Element pluginsRoot = rootElement.getChild( "build", namespace );
+ if ( pluginsRoot != null )
{
- for ( Iterator i = plugins.iterator(); i.hasNext(); )
+ rewritePlugins( project.getBuildPlugins(), pluginsRoot, mappedVersions, originalVersions );
+ if ( project.getPluginManagement() != null )
{
- Plugin plugin = (Plugin) i.next();
-
- // Avoid in plugin mgmt
- if ( plugin.getVersion() != null )
+ pluginsRoot = pluginsRoot.getChild( "pluginManagement", namespace );
+ if ( pluginsRoot != null )
{
- String resolvedVersion =
- versionResolver.getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
-
- if ( resolvedVersion != null )
- {
- plugin.setVersion( resolvedVersion );
- }
+ rewritePlugins( project.getPluginManagement().getPlugins(), pluginsRoot, mappedVersions,
+ originalVersions );
}
}
}
+ // TODO: rewrite extensions
+ }
- PluginManagement pluginManagement = build.getPluginManagement();
- plugins = pluginManagement != null ? pluginManagement.getPlugins() : null;
-
- if ( plugins != null )
+ if ( project.getReporting() != null )
+ {
+ Element pluginsRoot = rootElement.getChild( "reporting", namespace );
+ if ( pluginsRoot != null )
{
- for ( Iterator i = plugins.iterator(); i.hasNext(); )
- {
- Plugin plugin = (Plugin) i.next();
+ rewriteReportPlugins( project.getReportPlugins(), pluginsRoot, mappedVersions, originalVersions );
+ }
+ }
- if ( plugin.getVersion() != null )
- {
- String resolvedVersion =
- versionResolver.getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
+ // TODO: rewrite SCM
- if ( resolvedVersion != null )
- {
- plugin.setVersion( resolvedVersion );
- }
- }
- }
- }
+/*
+ ProjectScmRewriter scmRewriter = getScmRewriter();
+ scmRewriter.rewriteScmInfo( model, projectId, getTagLabel() );
+ ProjectVersionResolver versionResolver = getVersionResolver();
+ Build build = model.getBuild();
+
+ if ( build != null )
+ {
//Rewrite extensions section
List extensions = build.getExtensions();
@@ -272,28 +254,6 @@
}
}
}
-
- Reporting reporting = model.getReporting();
-
- if ( reporting != null )
- {
- //Rewrite reports section
- List reports = reporting.getPlugins();
-
- for ( Iterator i = reports.iterator(); i.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) i.next();
-
- String resolvedVersion =
- versionResolver.getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
-
- if ( resolvedVersion != null )
- {
- plugin.setVersion( resolvedVersion );
- }
- }
- }
-
*/
}
@@ -341,6 +301,112 @@
{
throw new ReleaseExecutionException(
"Version '" + dep.getVersion() + "' for dependency '" + key + "' was not mapped" );
+ }
+ }
+ }
+ }
+ }
+
+ private void rewritePlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions )
+ throws ReleaseExecutionException
+ {
+ if ( plugins != null )
+ {
+ for ( Iterator i = plugins.iterator(); i.hasNext(); )
+ {
+ Plugin plugin = (Plugin) i.next();
+
+ // We can ignore plugins whose version is assumed, they are only written into the release pom
+ if ( plugin.getVersion() != null )
+ {
+ String key = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
+ String version = (String) mappedVersions.get( key );
+
+ if ( version != null && plugin.getVersion().equals( originalVersions.get( key ) ) )
+ {
+ getLogger().debug( "Updating " + plugin.getArtifactId() + " to " + version );
+
+ try
+ {
+ XPath xpath = XPath.newInstance( "./plugins/plugin[groupId='" + plugin.getGroupId() +
+ "' and artifactId='" + plugin.getArtifactId() + "']" );
+
+ Element dependency = (Element) xpath.selectSingleNode( pluginRoot );
+ Element versionElement = dependency.getChild( "version" );
+
+ // avoid if in plugin management
+ if ( versionElement != null )
+ {
+ versionElement.setText( version );
+ }
+ }
+ catch ( JDOMException e )
+ {
+ throw new ReleaseExecutionException( "Unable to locate plugin to process in document",
+ e );
+ }
+ }
+ else
+ {
+ // We can ignore dependencies we don't know of, unless they are snapshots
+ if ( ArtifactUtils.isSnapshot( plugin.getVersion() ) )
+ {
+ throw new ReleaseExecutionException(
+ "Version '" + plugin.getVersion() + "' for plugin '" + key + "' was not mapped" );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void rewriteReportPlugins( List plugins, Element pluginRoot, Map mappedVersions, Map originalVersions )
+ throws ReleaseExecutionException
+ {
+ if ( plugins != null )
+ {
+ for ( Iterator i = plugins.iterator(); i.hasNext(); )
+ {
+ ReportPlugin plugin = (ReportPlugin) i.next();
+
+ // We can ignore plugins whose version is assumed, they are only written into the release pom
+ if ( plugin.getVersion() != null )
+ {
+ String key = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
+ String version = (String) mappedVersions.get( key );
+
+ if ( version != null && plugin.getVersion().equals( originalVersions.get( key ) ) )
+ {
+ getLogger().debug( "Updating " + plugin.getArtifactId() + " to " + version );
+
+ try
+ {
+ XPath xpath = XPath.newInstance( "./plugins/plugin[groupId='" + plugin.getGroupId() +
+ "' and artifactId='" + plugin.getArtifactId() + "']" );
+
+ Element dependency = (Element) xpath.selectSingleNode( pluginRoot );
+ Element versionElement = dependency.getChild( "version" );
+
+ // avoid if in plugin management
+ if ( versionElement != null )
+ {
+ versionElement.setText( version );
+ }
+ }
+ catch ( JDOMException e )
+ {
+ throw new ReleaseExecutionException( "Unable to locate report plugin to process in document",
+ e );
+ }
+ }
+ else
+ {
+ // We can ignore dependencies we don't know of, unless they are snapshots
+ if ( ArtifactUtils.isSnapshot( plugin.getVersion() ) )
+ {
+ throw new ReleaseExecutionException(
+ "Version '" + plugin.getVersion() + "' for report plugin '" + key + "' was not mapped" );
+ }
}
}
}
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=397742&r1=397741&r2=397742&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 19:44:07 2006
@@ -171,6 +171,31 @@
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 testRewritePomDependenciesDifferentVersion()
throws Exception
{
@@ -178,10 +203,89 @@
config.mapReleaseVersion( "groupId:subproject1", "1.0" );
config.mapReleaseVersion( "groupId:subproject2", "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 testRewriteManagedPomDependencies()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-dependency" );
+
+ 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 testRewriteManagedPomUnmappedDependencies()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-dependency" );
+
+ 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 testRewritePomPlugins()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-plugins" );
+
+ config.mapReleaseVersion( "groupId:subproject1", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject2", "1.0" );
config.mapReleaseVersion( "groupId:subproject3", "1.0" );
config.mapReleaseVersion( "groupId:subproject4", "1.0" );
config.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ phase.execute( config );
+
+ assertTrue( compareFiles( config.getReactorProjects() ) );
+ }
+
+ public void testRewritePomUnmappedPlugins()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-plugins" );
+
+ 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 );
@@ -194,10 +298,46 @@
}
}
- public void testRewritePomUnmappedDependencies()
+ public void testRewritePomPluginsDifferentVersion()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-dependencies" );
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-differing-snapshot-plugins" );
+
+ config.mapReleaseVersion( "groupId:subproject1", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject2", "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 testRewriteManagedPomPlugins()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-plugin" );
+
+ 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 testRewriteManagedPomUnmappedPlugins()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-plugin" );
MavenProject project =
(MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject2" );
@@ -219,14 +359,15 @@
}
}
- public void testRewriteManagedPomDependencies()
+ public void testRewritePomReportPlugins()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-dependency" );
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-report-plugins" );
config.mapReleaseVersion( "groupId:subproject1", "1.0" );
config.mapReleaseVersion( "groupId:subproject2", "1.0" );
config.mapReleaseVersion( "groupId:subproject3", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject4", "1.0" );
config.mapReleaseVersion( "groupId:artifactId", "1.0" );
phase.execute( config );
@@ -234,10 +375,10 @@
assertTrue( compareFiles( config.getReactorProjects() ) );
}
- public void testRewriteManagedPomUnmappedDependencies()
+ public void testRewritePomUnmappedReportPlugins()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( "internal-managed-snapshot-dependency" );
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-snapshot-report-plugins" );
MavenProject project =
(MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject2" );
@@ -259,6 +400,27 @@
}
}
+ public void testRewritePomReportPluginsDifferentVersion()
+ throws Exception
+ {
+ ReleaseConfiguration config = createConfigurationFromProjects( "internal-differing-snapshot-report-plugins" );
+
+ config.mapReleaseVersion( "groupId:subproject1", "1.0" );
+ config.mapReleaseVersion( "groupId:subproject2", "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
{
@@ -439,7 +601,7 @@
String actual = FileUtils.fileRead( actualFile );
File expectedFile = new File( actualFile.getParentFile(), "expected-pom.xml" );
String expected = FileUtils.fileRead( expectedFile );
- assertEquals( "Check the transformed POM: " + expectedFile + " vs " + actualFile, expected, actual );
+ assertEquals( "Check the transformed POM", expected, actual );
}
return true;
}
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml Thu Apr 27 19:44:07 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-differing-snapshot-plugins/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml Thu Apr 27 19:44:07 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-differing-snapshot-plugins/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-plugins/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml Thu Apr 27 19:44:07 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-differing-snapshot-report-plugins/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml Thu Apr 27 19:44:07 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-differing-snapshot-report-plugins/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,37 @@
+<!--
+ ~ 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>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-differing-snapshot-report-plugins/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,46 @@
+<!--
+ ~ 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>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>0.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ <module>subproject3</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,46 @@
+<!--
+ ~ 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>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>0.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ <module>subproject3</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/expected-pom.xml Thu Apr 27 19:44:07 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-managed-snapshot-plugin/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/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-managed-snapshot-plugin/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/pom.xml Thu Apr 27 19:44:07 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-managed-snapshot-plugin/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/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-managed-snapshot-plugin/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject3</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/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-managed-snapshot-plugin/subproject3/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,39 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject3</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-managed-snapshot-plugin/subproject3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ 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>
+ <module>subproject3</module>
+ <module>subproject4</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ 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>
+ <module>subproject3</module>
+ <module>subproject4</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/subproject1/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,36 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>external</groupId>
+ <artifactId>plugin-artifactId</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/subproject1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,36 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>external</groupId>
+ <artifactId>plugin-artifactId</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/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-plugins/subproject2/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,36 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/subproject2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,36 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject2</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/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-plugins/subproject3/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,42 @@
+<!--
+ ~ 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>subproject3</artifactId>
+
+ <build>
+ <plugins>
+ <!-- Test different release version remains the same -->
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/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-plugins/subproject3/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,42 @@
+<!--
+ ~ 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>subproject3</artifactId>
+
+ <build>
+ <plugins>
+ <!-- Test different release version remains the same -->
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>0.5</version>
+ </plugin>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>subproject4</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,35 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject4</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugins/subproject4/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml?rev=397742&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml (added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml Thu Apr 27 19:44:07 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ 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>
+ <module>subproject3</module>
+ <module>subproject4</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/internal-snapshot-report-plugins/expected-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision