Author: brett
Date: Tue Sep 21 07:57:29 2010
New Revision: 999262
URL: http://svn.apache.org/viewvc?rev=999262&view=rev
Log:
[MRELEASE-318] use the version determined by the project at this instance in
time to accomodate ranges.
Added test to exhibit problem with resolving dependency ranges (adjustment
needed to not conflict with existing test case).
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/
- copied from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.jar
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.jar.md5
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.jar.sha1
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.md5
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.sha1
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.jar
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.jar
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.jar.md5
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.jar.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.jar.sha1
- copied unchanged from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.jar.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.md5
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.sha1
- copied, changed from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1
maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/
maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml
Removed:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.jar.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.jar
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.jar.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.jar.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.pom
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.pom.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-1.0.pom.sha1
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.sha1
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Tue Sep 21 07:57:29 2010
@@ -146,7 +146,7 @@ public class CheckDependencySnapshotsPha
if ( checkArtifact( artifact, originalVersions, artifactMap,
releaseDescriptor ) )
{
- snapshotDependencies.add( artifact );
+ snapshotDependencies.add( artifactMap.get(
ArtifactUtils.versionlessKey( artifact ) ) );
}
}
}
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
Tue Sep 21 07:57:29 2010
@@ -66,6 +66,29 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ public void testNoSnapshotRangeDependencies()
+ throws Exception
+ {
+ CheckDependencySnapshotsPhase phase =
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE,
"check-dependency-snapshots" );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects(
"no-snapshot-range-dependencies" );
+
+ Mock mockPrompter = createMockPrompter( "yes", "1", "yes",
"1.2-SNAPSHOT" );
+ phase.setPrompter( (Prompter) mockPrompter.proxy() );
+
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
+
+ mockPrompter = createMockPrompter( "yes", "1", "yes", "1.2-SNAPSHOT" );
+ phase.setPrompter( (Prompter) mockPrompter.proxy() );
+
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(),
reactorProjects );
+
+ // successful execution is verification enough
+ assertTrue( true );
+ }
+
public void testSnapshotDependenciesInProjectOnly()
throws Exception
{
@@ -986,6 +1009,11 @@ public class CheckDependencySnapshotsPha
return createMockPrompter( new String[] { response1, response2 } );
}
+ private Mock createMockPrompter( String response1, String response2,
String response3 )
+ {
+ return createMockPrompter( new String[] { response1, response2,
response3 } );
+ }
+
private Mock createMockPrompter( String response1, String response2,
String response3, String response4 )
{
return createMockPrompter( new String[] { response1, response2,
response3, response4 } );
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom
Tue Sep 21 07:57:29 2010
@@ -21,10 +21,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>1.0-20060424.060453-1</version>
<description>POM was created from deploy:deploy-file</description>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.md5
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.md5?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.md5&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.md5
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.md5
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-44148d339e7d64b85a477aee18bca101
*./external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
+MD5(artifactId-release-range-1.0-20060424.060453-1.pom)=
3e0868e3cddf722119b94df64a353c0f
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.sha1
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.sha1?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.sha1&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom.sha1
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/artifactId-release-range-1.0-20060424.060453-1.pom.sha1
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-5c8512cadf84196c2b487b0367f8e551e1ab9dfe
*./external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
+SHA1(artifactId-release-range-1.0-20060424.060453-1.pom)=
b931083e4428004591556812f1a54221b1bd2dbd
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml
Tue Sep 21 07:57:29 2010
@@ -20,7 +20,7 @@
<metadata>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>1.0-SNAPSHOT</version>
<versioning>
<snapshot>
@@ -29,4 +29,4 @@
</snapshot>
<lastUpdated>20060424060453</lastUpdated>
</versioning>
-</metadata>
\ No newline at end of file
+</metadata>
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.md5?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.md5
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.md5
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-656bff97f37b06c278b6e3b4aac602b3
*./external/artifactId/1.0-SNAPSHOT/maven-metadata.xml
+MD5(maven-metadata.xml)= 8ccd5a28b2fcb9844018f84b0db4aec6
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.sha1?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.sha1
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0-SNAPSHOT/maven-metadata.xml.sha1
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-1c7b7950e60aaa4e50c19d040eda5557acafea44
*./external/artifactId/1.0-SNAPSHOT/maven-metadata.xml
+SHA1(maven-metadata.xml)= 25e899e646d1eb4bdb2626ae1eca1e7d1f088f8e
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom
Tue Sep 21 07:57:29 2010
@@ -21,10 +21,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>1.0</version>
<description>POM was created from deploy:deploy-file</description>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.md5
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.md5)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.md5?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.md5&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.md5&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.md5
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.md5
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-6d47c44e285b0b576683a64e1617616c *./external/artifactId/1.0/artifactId-1.0.pom
+MD5(artifactId-release-range-1.0.pom)= 8911189c83c5a61ec5f13c997fa0cb6c
Copied:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.sha1
(from r999228,
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.sha1)
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.sha1?p2=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.sha1&p1=maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.sha1&r1=999228&r2=999262&rev=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.0/artifactId-1.0.pom.sha1
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/1.0/artifactId-release-range-1.0.pom.sha1
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-673eb9d720104a477a1c2f4de868573111c6cad9
*./external/artifactId/1.0/artifactId-1.0.pom
+SHA1(artifactId-release-range-1.0.pom)=
65cfe03ec5ff27a7c3f49022c382d1b2e81df7f2
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml
Tue Sep 21 07:57:29 2010
@@ -20,7 +20,7 @@
<metadata>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>1.0-SNAPSHOT</version>
<versioning>
<versions>
@@ -29,4 +29,4 @@
</versions>
<lastUpdated>20060424060506</lastUpdated>
</versioning>
-</metadata>
\ No newline at end of file
+</metadata>
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.md5?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.md5
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.md5
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-471d5bbfb085d3e838ff4057e2247038 *./external/artifactId/maven-metadata.xml
+1d3532459db40d5817eb615ead605803 *./external/artifactId/maven-metadata.xml
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.sha1?rev=999262&r1=999228&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.sha1
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId-release-range/maven-metadata.xml.sha1
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-2261281a948f90c41a7db3a48177230bd739c7b8
*./external/artifactId/maven-metadata.xml
+c56e5b040bd09428077ee94e818a9a0f3597d7d4
*./external/artifactId/maven-metadata.xml
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+dummy
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.md5?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.md5
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.md5
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+f02e326f800ee26f04df7961adbf7c0a
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.sha1?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.sha1
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.jar.sha1
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+f161ebd29699d93411cec0915c5133c0f3229a28
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom
Tue Sep 21 07:57:29 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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>external</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-20080128.141330-1</version>
+ <description>POM was created from deploy:deploy-file</description>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.md5?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.md5
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.md5
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+af2dfc03fd863a82a3ad9f13dd3fb10c
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.sha1?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.sha1
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/artifactId-1.1-20080128.141330-1.pom.sha1
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+dec8952e5e3e1cab65d1129edfe8d3aeec893c7a
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml
Tue Sep 21 07:57:29 2010
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ -->
+
+<metadata>
+ <groupId>external</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20080128.141330</timestamp>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20080128141330</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.md5
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+6fe5bf9ccd53e28d8e147ca4117affc3
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1
(added)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml.sha1
Tue Sep 21 07:57:29 2010
@@ -0,0 +1 @@
+13b0a8bd55fccdcc0da4f86ccd48188b6bbd465e
\ No newline at end of file
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml
Tue Sep 21 07:57:29 2010
@@ -26,7 +26,8 @@
<versions>
<version>1.0-SNAPSHOT</version>
<version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</versions>
- <lastUpdated>20060424060506</lastUpdated>
+ <lastUpdated>20080128141330</lastUpdated>
</versioning>
</metadata>
\ No newline at end of file
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.md5
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-471d5bbfb085d3e838ff4057e2247038 *./external/artifactId/maven-metadata.xml
+bbe61a1874b375f9b7f46beac0b29e3b
\ No newline at end of file
Modified:
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1
(original)
+++
maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/maven-metadata.xml.sha1
Tue Sep 21 07:57:29 2010
@@ -1 +1 @@
-2261281a948f90c41a7db3a48177230bd739c7b8
*./external/artifactId/maven-metadata.xml
+f1dc2196c824762a815a7a65d5971ef25cc93184
\ No newline at end of file
Added:
maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml?rev=999262&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml
(added)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml
Tue Sep 21 07:57:29 2010
@@ -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>
+
+ <dependencies>
+ <dependency>
+ <groupId>external</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>[1.0,1.1)</version>
+ </dependency>
+ </dependencies>
+</project>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
Tue Sep 21 07:57:29 2010
@@ -48,7 +48,7 @@
<dependencies>
<dependency>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
Modified:
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/pom.xml?rev=999262&r1=999261&r2=999262&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/pom.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/external-range-dependency/pom.xml
Tue Sep 21 07:57:29 2010
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>external</groupId>
- <artifactId>artifactId</artifactId>
+ <artifactId>artifactId-release-range</artifactId>
<version>[1.0,2.0)</version>
</dependency>
</dependencies>
