diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index 2d1b8f3959..a415d9daf9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -20,6 +20,11 @@ package org.apache.maven.it; */ import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; @@ -36,7 +41,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest public MavenITmng3379ParallelArtifactDownloadsTest() { - super( ALL_MAVEN_VERSIONS ); + super( "[2.0.5,3.0-alpha-1),[3.0-alpha-2,)" ); } /** @@ -53,7 +58,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest verifier.deleteArtifacts( "org.apache.maven.its.mng3379.a" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3379.b" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3379.c" ); - verifier.deleteArtifacts( "org.apache.maven.its.mng3379.c" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng3379.d" ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.getCliOptions().add( "--settings" ); verifier.getCliOptions().add( "settings.xml" ); @@ -61,32 +66,93 @@ public class MavenITmng3379ParallelArtifactDownloadsTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.a", "x", "0.1", "", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.a", "x", "0.1", "", "pom" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.a", "x", "0.1", "tests", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.a", "x", "0.1", "sources", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.a", "x", "0.1", "test-javadoc", "jar" ); + String gid = "org.apache.maven.its.mng3379."; + assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "", "jar", + "69c041c12f35894230c7c23c49cd245886c6fb6f" ); + assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "", "pom", + "10235b64a161e86e91cc6ff7245a4b9c6fdc7d5d" ); + assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "tests", "jar", + "69c041c12f35894230c7c23c49cd245886c6fb6f" ); + assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "sources", "jar", + "166f8bef02b9e92f99ec3b163d8321dd1d087e34" ); + assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "javadoc", "jar", + "4d96e09f7e93870685a317c574f851b407224415" ); + assertMetadata( verifier, gid + "a", "x", "0.2-SNAPSHOT", + "e1cfc3a77657fc46bb624dee25c61b290e5b4dd7" ); + + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "jar", + "efb7c4046565774cd7e44645e02f06ecdf91098d" ); + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "pom", + "1c816cc9eaaca1272f24887c461aa359503394f5" ); + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "tests", "jar", + "efb7c4046565774cd7e44645e02f06ecdf91098d" ); + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "sources", "jar", + "9ad231fc04ea1114987c377cc5cbccfbf83e3dbf" ); + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "javadoc", "jar", + "7807daefd3af3be73d3b92f9c5ab1b52510c0767" ); + assertMetadata( verifier, gid + "b", "x", "0.2-SNAPSHOT", + "5ccc4edfb503f9a5ccadedf102dff8943250d830" ); + assertMetadata( verifier, gid + "b", "x", + "8f38b1041871f22dcb031544d8a3436c335bfcdb" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.b", "x", "0.1", "", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.b", "x", "0.1", "", "pom" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.b", "x", "0.1", "tests", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.b", "x", "0.1", "sources", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.b", "x", "0.1", "test-javadoc", "jar" ); + assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "", "jar", + "1eb0d5a421b3074e8a69b0dcca7e325c0636a932" ); + assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "", "pom", + "bd9a24117d3ce4f8ef3b8fcfe79a08e5ea141a9b" ); + assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "tests", "jar", + "1eb0d5a421b3074e8a69b0dcca7e325c0636a932" ); + assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "sources", "jar", + "82f9664b3a910fb861fc4ed2b79e39d8f95e3675" ); + assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "javadoc", "jar", + "64a3bfe19b294f67b1c52a2514c58922b88e5f97" ); + assertMetadata( verifier, gid + "c", "x", "0.2-SNAPSHOT", + "b31ef40a51bdab4e6e44bfe3f2d1da42e5e42e46" ); + assertMetadata( verifier, gid + "c", "x", + "c4848e60d226ec6304df3abd9eba8fdb301b3660" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.c", "x", "0.1", "", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.c", "x", "0.1", "", "pom" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.c", "x", "0.1", "tests", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.c", "x", "0.1", "sources", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.c", "x", "0.1", "test-javadoc", "jar" ); - - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.d", "x", "0.1", "", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.d", "x", "0.1", "", "pom" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.d", "x", "0.1", "tests", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.d", "x", "0.1", "sources", "jar" ); - assertArtifactPresent( verifier, "org.apache.maven.its.mng3379.d", "x", "0.1", "test-javadoc", "jar" ); + assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "", "jar", + "3d606c564625a594165bcbbe4a24c8f11b18b5a0" ); + assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "", "pom", + "70a3c9795b2871fdd8a66e8fe312359f08d77c7d" ); + assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "tests", "jar", + "3d606c564625a594165bcbbe4a24c8f11b18b5a0" ); + assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "sources", "jar", + "35a7e140307f4bb67984dc72aa551f0faabacd36" ); + assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "javadoc", "jar", + "2fe3487f496fe66f23772b1bada066ec6bd9222f" ); + assertMetadata( verifier, gid + "d", "x", "0.2-SNAPSHOT", + "a0d0b5efd5d6f6a921a3f7c1a6a503359fccef04" ); + assertMetadata( verifier, gid + "d", "x", + "1d2bf926862f2131f1229328e588b906b087bdb3" ); } - private void assertArtifactPresent( Verifier verifier, String gid, String aid, String ver, String cls, String ext ) + private void assertArtifact( Verifier verifier, String gid, String aid, String ver, String cls, String ext, String sha1 ) + throws Exception + { + File file = getFile( verifier, gid, aid, ver, cls, ext ); + assertTrue( file.getAbsolutePath(), file.isFile() ); + assertEquals( sha1, calcHash( file, "SHA-1" ) ); + } + + private void assertMetadata( Verifier verifier, String gid, String aid, String ver, String sha1 ) + throws Exception + { + File file = getFile( verifier, gid, aid, ver, "", "pom" ); + file = new File( file.getParent(), "maven-metadata-maven-core-it.xml" ); + assertTrue( file.getAbsolutePath(), file.isFile() ); + assertEquals( sha1, calcHash( file, "SHA-1" ) ); + } + + private void assertMetadata( Verifier verifier, String gid, String aid, String sha1 ) + throws Exception + { + File file = getFile( verifier, gid, aid, "0.2", "", "pom" ); + file = new File( file.getParentFile().getParent(), "maven-metadata-maven-core-it.xml" ); + assertTrue( file.getAbsolutePath(), file.isFile() ); + assertEquals( sha1, calcHash( file, "SHA-1" ) ); + } + + private File getFile( Verifier verifier, String gid, String aid, String ver, String cls, String ext ) { StringBuffer buffer = new StringBuffer( 256 ); buffer.append( verifier.localRepo ); @@ -99,8 +165,46 @@ public class MavenITmng3379ParallelArtifactDownloadsTest buffer.append( '-' ).append( cls ); } buffer.append( '.' ).append( ext ); - File file = new File( buffer.toString() ); - assertTrue( file.getAbsolutePath(), file.isFile() ); + return new File( buffer.toString() ); + } + + private String calcHash( File file, String algo ) + throws IOException, NoSuchAlgorithmException + { + MessageDigest digester = MessageDigest.getInstance( algo ); + + FileInputStream is = new FileInputStream( file ); + try + { + DigestInputStream dis = new DigestInputStream( is, digester ); + + for ( byte[] buffer = new byte[1024 * 4]; dis.read( buffer ) >= 0; ) + { + // just read it + } + } + finally + { + is.close(); + } + + byte[] digest = digester.digest(); + + StringBuffer hash = new StringBuffer( digest.length * 2 ); + + for ( int i = 0; i < digest.length; i++ ) + { + int b = digest[i] & 0xFF; + + if ( b < 0x10 ) + { + hash.append( '0' ); + } + + hash.append( Integer.toHexString( b ) ); + } + + return hash.toString(); } } diff --git a/its/core-it-suite/src/test/resources/mng-3379/pom.xml b/its/core-it-suite/src/test/resources/mng-3379/pom.xml index 8b8b7c7dcc..800b4aa9e2 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/pom.xml @@ -38,97 +38,97 @@ under the License. org.apache.maven.its.mng3379.a x - 0.1 + [0.2-SNAPSHOT,) org.apache.maven.its.mng3379.a x - 0.1 + [0.2-SNAPSHOT,) tests org.apache.maven.its.mng3379.a x - 0.1 + [0.2-SNAPSHOT,) sources org.apache.maven.its.mng3379.a x - 0.1 - test-javadoc + [0.2-SNAPSHOT,) + javadoc org.apache.maven.its.mng3379.b x - 0.1 + [0.2-SNAPSHOT,) org.apache.maven.its.mng3379.b x - 0.1 + [0.2-SNAPSHOT,) tests org.apache.maven.its.mng3379.b x - 0.1 + [0.2-SNAPSHOT,) sources org.apache.maven.its.mng3379.b x - 0.1 - test-javadoc + [0.2-SNAPSHOT,) + javadoc org.apache.maven.its.mng3379.c x - 0.1 + [0.2-SNAPSHOT,) org.apache.maven.its.mng3379.c x - 0.1 + [0.2-SNAPSHOT,) tests org.apache.maven.its.mng3379.c x - 0.1 + [0.2-SNAPSHOT,) sources org.apache.maven.its.mng3379.c x - 0.1 - test-javadoc + [0.2-SNAPSHOT,) + javadoc org.apache.maven.its.mng3379.d x - 0.1 + [0.2-SNAPSHOT,) org.apache.maven.its.mng3379.d x - 0.1 + [0.2-SNAPSHOT,) tests org.apache.maven.its.mng3379.d x - 0.1 + [0.2-SNAPSHOT,) sources org.apache.maven.its.mng3379.d x - 0.1 - test-javadoc + [0.2-SNAPSHOT,) + javadoc diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar deleted file mode 100644 index 0112b922ab..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar.sha1 deleted file mode 100644 index 29a4c78d9f..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb6f88879780e05b80766d0eff83e930f2b86601 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar deleted file mode 100644 index d7104d9f12..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar.sha1 deleted file mode 100644 index 02d0d121ca..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-test-javadoc.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fd805d41bd0ccd03e85c990298a0210eecfcc3a0 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar deleted file mode 100644 index b3a61aee1f..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar.sha1 deleted file mode 100644 index 906db2ec10..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1-tests.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -70bab2c72a200ed93aea963ffb0cdfe238ac6ba6 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar deleted file mode 100644 index 8cecec21b0..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar.sha1 deleted file mode 100644 index 2fa6f3fac6..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b71e548e0427e3a92b1c130d27be6fa52d84c576 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom.sha1 deleted file mode 100644 index 3d469f2747..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -5904b07e6c250f792643b8ca9d8237bdbacd5acf \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000000..7094866819 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng3379.a + x + 0.2-SNAPSHOT + + + 20100119.121141 + 1 + + 20100119121141 + + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-javadoc.jar new file mode 100644 index 0000000000..fd55c43c7d Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-javadoc.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-sources.jar new file mode 100644 index 0000000000..f74c1acbd5 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-sources.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-tests.jar new file mode 100644 index 0000000000..b975cd85ca Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1-tests.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.jar new file mode 100644 index 0000000000..b975cd85ca Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.pom similarity index 93% rename from its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom rename to its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.pom index 980702b602..8ff8d7cd75 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.1/x-0.1.pom +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/0.2-SNAPSHOT/x-0.2-20100119.121141-1.pom @@ -24,11 +24,10 @@ under the License. org.apache.maven.its.mng3379.a x - 0.1 + 0.2-SNAPSHOT jar - true diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml index b1a2001b0c..a44da16473 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml @@ -1,12 +1,12 @@ - + + org.apache.maven.its.mng3379.a x - 0.1 + 0.2-SNAPSHOT - 0.1 - 0.1 + 0.2-SNAPSHOT - 20090208133354 + 20100119121141 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml.sha1 deleted file mode 100644 index 28103a3e9e..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/a/x/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -4398fbb8bb8bba7064c300326fb20aa5ad28611b \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar deleted file mode 100644 index 376482c5af..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar.sha1 deleted file mode 100644 index 1dc448639d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a0c93a349a53312dc3ee58343f8393a88e78482 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar deleted file mode 100644 index 9e790d9268..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar.sha1 deleted file mode 100644 index 6da5a05c57..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-test-javadoc.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0523c551c85a92127b9c18bb2795d5728d5174f3 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar deleted file mode 100644 index 99f75ddf0e..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar.sha1 deleted file mode 100644 index 4364da846f..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1-tests.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b5a09051f138d407d2600c0f016f48179a6be75 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar deleted file mode 100644 index b8a736c1ba..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar.sha1 deleted file mode 100644 index 05801333f2..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5cf583eab02c011806a2fba761915a8cfa7d77a \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom.sha1 deleted file mode 100644 index 53928ac3a5..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -6840d0bf1653fc445d4486c4a5e280813087a1a5 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000000..514f4065d5 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng3379.b + x + 0.2-SNAPSHOT + + + 20100119.121231 + 1 + + 20100119121231 + + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-javadoc.jar new file mode 100644 index 0000000000..bdf702c667 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-javadoc.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-sources.jar new file mode 100644 index 0000000000..bbeeb2f4c7 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-sources.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-tests.jar new file mode 100644 index 0000000000..c36150cd3e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1-tests.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.jar new file mode 100644 index 0000000000..c36150cd3e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.pom similarity index 93% rename from its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom rename to its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.pom index 4ef23ffefa..415835fb23 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.1/x-0.1.pom +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/0.2-SNAPSHOT/x-0.2-20100119.121231-1.pom @@ -24,11 +24,10 @@ under the License. org.apache.maven.its.mng3379.b x - 0.1 + 0.2-SNAPSHOT jar - true diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml index d506be4e5c..bffb3f995f 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml @@ -1,12 +1,12 @@ - + + org.apache.maven.its.mng3379.b x - 0.1 + 0.2-SNAPSHOT - 0.1 - 0.1 + 0.2-SNAPSHOT - 20090208133454 + 20100119121231 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml.sha1 deleted file mode 100644 index db3a1dc20e..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/b/x/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -a24c3b15d87466e4b9ed731895e6047e9b529f6c \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar deleted file mode 100644 index 3858a94b5f..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar.sha1 deleted file mode 100644 index 8306ce8350..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -16ba8eb2c5586bc40092d6e74a10d558ad420c11 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar deleted file mode 100644 index ba881296ed..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar.sha1 deleted file mode 100644 index 44e9bcbb77..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-test-javadoc.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -46f9b349dba7b94e0ea103f265e71881c41755e0 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar deleted file mode 100644 index 51b3c81884..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar.sha1 deleted file mode 100644 index d8803858b7..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1-tests.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca12b841a47fb2eeb5ff7f90db342b91401a2b2e \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar deleted file mode 100644 index d5ea8c8a04..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar.sha1 deleted file mode 100644 index 345998a449..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -267b6326ac40acae70084d39f8d6653109195ce2 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom.sha1 deleted file mode 100644 index 3ad47e66b3..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -eae1c10beecc02eb0e4edd5a25e1cb964057b3e5 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000000..4b603b2344 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng3379.c + x + 0.2-SNAPSHOT + + + 20100119.121243 + 1 + + 20100119121244 + + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-javadoc.jar new file mode 100644 index 0000000000..ada61c7892 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-javadoc.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-sources.jar new file mode 100644 index 0000000000..457eb3a5fa Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-sources.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-tests.jar new file mode 100644 index 0000000000..8d2219125e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1-tests.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.jar new file mode 100644 index 0000000000..8d2219125e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.pom similarity index 93% rename from its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom rename to its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.pom index 0bc4a4ae2d..b55fd936da 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.1/x-0.1.pom +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/0.2-SNAPSHOT/x-0.2-20100119.121243-1.pom @@ -24,11 +24,10 @@ under the License. org.apache.maven.its.mng3379.c x - 0.1 + 0.2-SNAPSHOT jar - true diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml index 66d765470f..b682b12a30 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml @@ -1,12 +1,12 @@ - + + org.apache.maven.its.mng3379.c x - 0.1 + 0.2-SNAPSHOT - 0.1 - 0.1 + 0.2-SNAPSHOT - 20090208133508 + 20100119121243 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml.sha1 deleted file mode 100644 index f9f21ce139..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/c/x/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -22a882ba475e2c2eda7a7db17bd3d7ff753e7b5c \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar deleted file mode 100644 index 111644e3a5..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar.sha1 deleted file mode 100644 index b263d04d80..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-sources.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -573b4260baec255421e1bb7ffded4569d91e1867 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar deleted file mode 100644 index b0eb8bf356..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar.sha1 deleted file mode 100644 index b55b9352cb..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-test-javadoc.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4bea5c6f80eab61b814b5ab005476a79dd05ada5 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar deleted file mode 100644 index c9691859e6..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar.sha1 deleted file mode 100644 index 11d59b7f95..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1-tests.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -beb42cc5880099fb3df64bffb4b18afdb49dcf6a \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar deleted file mode 100644 index aad7104d61..0000000000 Binary files a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar and /dev/null differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar.sha1 deleted file mode 100644 index 511a9a8b82..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f0d975441aea90243d1b89183512aac7420b757 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom.sha1 deleted file mode 100644 index 9a8eff0723..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -dc011fe3156096fddc8368528b3443c162f33983 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000000..1acbc24802 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng3379.d + x + 0.2-SNAPSHOT + + + 20100119.121254 + 1 + + 20100119121254 + + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-javadoc.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-javadoc.jar new file mode 100644 index 0000000000..511963d998 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-javadoc.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-sources.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-sources.jar new file mode 100644 index 0000000000..0eb04b8f07 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-sources.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-tests.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-tests.jar new file mode 100644 index 0000000000..4f9c997d7a Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1-tests.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.jar b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.jar new file mode 100644 index 0000000000..4f9c997d7a Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.pom similarity index 93% rename from its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom rename to its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.pom index ef6b4df2ee..6bee722fd4 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.1/x-0.1.pom +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/0.2-SNAPSHOT/x-0.2-20100119.121254-1.pom @@ -24,11 +24,10 @@ under the License. org.apache.maven.its.mng3379.d x - 0.1 + 0.2-SNAPSHOT jar - true diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml index 0511f6fb91..8c3e8ca8a0 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml @@ -1,12 +1,12 @@ - + + org.apache.maven.its.mng3379.d x - 0.1 + 0.2-SNAPSHOT - 0.1 - 0.1 + 0.2-SNAPSHOT - 20090208133536 + 20100119121254 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml.sha1 deleted file mode 100644 index aa1b7b5331..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3379/repo/org/apache/maven/its/mng3379/d/x/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5dc27ae9e5680b70cee0c767bfe78362a134aff \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-3379/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3379/settings-template.xml index 5c0011a63e..84f73bcadc 100644 --- a/its/core-it-suite/src/test/resources/mng-3379/settings-template.xml +++ b/its/core-it-suite/src/test/resources/mng-3379/settings-template.xml @@ -28,8 +28,7 @@ under the License. maven-core-it @baseurl@/repo - - fail + ignore ignore