From bbbf2daa0cd8d0ae64e8e8508ad4ee1cb6649ab8 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 1 Mar 2009 19:53:41 +0000 Subject: [PATCH] o Moved IT artifacts into group id for issue nubmer git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@749080 13f79535-47bb-0310-9956-ffa450edef68 --- ...avenITmng2861RelocationsAndRangesTest.java | 28 ++++-------------- .../resources/mng-2861/MNG-2861/A/pom.xml | 19 +++++++++--- .../resources/mng-2861/MNG-2861/B/pom.xml | 21 +++++++++---- .../resources/mng-2861/MNG-2861/C/pom.xml | 21 +++++++++---- .../test/resources/mng-2861/MNG-2861/pom.xml | 6 +++- .../project/1.2/project-1.2.jar.md5 | 1 - .../project/1.2/project-1.2.jar.sha1 | 1 - .../project/1.2/project-1.2.pom.md5 | 1 - .../project/1.2/project-1.2.pom.sha1 | 1 - .../project/2.0/project-2.0.jar.md5 | 1 - .../project/2.0/project-2.0.jar.sha1 | 1 - .../project/2.0/project-2.0.pom.md5 | 1 - .../project/2.0/project-2.0.pom.sha1 | 1 - .../newgroupId/project/maven-metadata.xml.md5 | 1 - .../project/maven-metadata.xml.sha1 | 1 - .../project/1.0/project-1.0.jar.md5 | 1 - .../project/1.0/project-1.0.jar.sha1 | 1 - .../project/1.0/project-1.0.pom.md5 | 1 - .../project/1.0/project-1.0.pom.sha1 | 1 - .../project/1.1/project-1.1.jar.md5 | 1 - .../project/1.1/project-1.1.jar.sha1 | 1 - .../project/1.1/project-1.1.pom.md5 | 1 - .../project/1.1/project-1.1.pom.sha1 | 1 - .../project/1.2/project-1.2.pom.md5 | 1 - .../project/1.2/project-1.2.pom.sha1 | 1 - .../oldgroupId/project/maven-metadata.xml.md5 | 1 - .../project/maven-metadata.xml.sha1 | 1 - .../mng2861/new}/project/1.2/project-1.2.jar | Bin .../mng2861/new}/project/1.2/project-1.2.pom | 2 +- .../mng2861/new}/project/2.0/project-2.0.jar | Bin .../mng2861/new}/project/2.0/project-2.0.pom | 2 +- .../mng2861/new}/project/maven-metadata.xml | 2 +- .../mng2861/old}/project/1.0/project-1.0.jar | Bin .../mng2861/old}/project/1.0/project-1.0.pom | 2 +- .../mng2861/old}/project/1.1/project-1.1.jar | Bin .../mng2861/old}/project/1.1/project-1.1.pom | 2 +- .../mng2861/old}/project/1.2/project-1.2.pom | 4 +-- .../mng2861/old}/project/maven-metadata.xml | 2 +- 38 files changed, 65 insertions(+), 68 deletions(-) delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.sha1 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.md5 delete mode 100644 its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.sha1 rename its/core-it-suite/src/test/resources/mng-2861/repo/{newgroupId => org/apache/maven/its/mng2861/new}/project/1.2/project-1.2.jar (100%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{newgroupId => org/apache/maven/its/mng2861/new}/project/1.2/project-1.2.pom (90%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{newgroupId => org/apache/maven/its/mng2861/new}/project/2.0/project-2.0.jar (100%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{newgroupId => org/apache/maven/its/mng2861/new}/project/2.0/project-2.0.pom (90%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{newgroupId => org/apache/maven/its/mng2861/new}/project/maven-metadata.xml (84%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/1.0/project-1.0.jar (100%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/1.0/project-1.0.pom (88%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/1.1/project-1.1.jar (100%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/1.1/project-1.1.pom (90%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/1.2/project-1.2.pom (85%) rename its/core-it-suite/src/test/resources/mng-2861/repo/{oldgroupId => org/apache/maven/its/mng2861/old}/project/maven-metadata.xml (85%) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 33f1a9278d..cd642ff7a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -24,42 +24,24 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; - public class MavenITmng2861RelocationsAndRangesTest extends AbstractMavenIntegrationTestCase { + public MavenITmng2861RelocationsAndRangesTest() { super( "(2.0.8,)" ); } - public void testitMNG2861 () + public void testitMNG2861() throws Exception { - - - // The testdir is computed from the location of this - // file. File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2861" ); - Verifier verifier; - - /* - * We must first make sure that any artifact created - * by this test has been removed from the local - * repository. Failing to do this could cause - * unstable test results. Fortunately, the verifier - * makes it easy to do this. - */ - verifier = new Verifier( new File(testDir,"MNG-2861").getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.mng2861", "MNG-2861", "1.0-SNAPSHOT", "pom" ); - verifier.deleteArtifact( "org.apache.maven.its.mng2861", "A", "1.0-SNAPSHOT", "jar" ); - verifier.deleteArtifact( "org.apache.maven.its.mng2861", "B", "1.0-SNAPSHOT", "jar" ); - verifier.deleteArtifact( "org.apache.maven.its.mng2861", "C", "1.0-SNAPSHOT", "jar" ); - + Verifier verifier = new Verifier( new File( testDir, "MNG-2861" ).getAbsolutePath() ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2861" ); verifier.executeGoal( "install" ); - verifier.verifyErrorFreeLog(); - } + } diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml index 2165330b26..ac9fc0c6b1 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/A/pom.xml @@ -1,14 +1,19 @@ - + + + 4.0.0 + MNG-2861 org.apache.maven.its.mng2861 1.0-SNAPSHOT - 4.0.0 + A - A 1.0-SNAPSHOT + + A http://maven.apache.org + org.apache.maven.its.mng2861 @@ -21,11 +26,17 @@ 1.0-SNAPSHOT + id file:///${basedir}/../../repo - true + + ignore + + + false + diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml index 4fc4be688f..c131c0c019 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/B/pom.xml @@ -1,26 +1,37 @@ - + + + 4.0.0 + MNG-2861 org.apache.maven.its.mng2861 1.0-SNAPSHOT - 4.0.0 + B - B 1.0-SNAPSHOT + + B http://maven.apache.org + - oldgroupId + org.apache.maven.its.mng2861.old project [1.2,) + id file://localhost/${basedir}/../../repo - true + + ignore + + + false + diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml index 88d0384d1b..054acc2838 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/C/pom.xml @@ -1,26 +1,37 @@ - + + + 4.0.0 + MNG-2861 org.apache.maven.its.mng2861 1.0-SNAPSHOT - 4.0.0 + C - C 1.0-SNAPSHOT + + C http://maven.apache.org + - newgroupId + org.apache.maven.its.mng2861.new project [2.0,3.0) + id file:///${basedir}/../../repo - true + + ignore + + + false + diff --git a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml index fcaabd002d..2afd8743a6 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/MNG-2861/pom.xml @@ -1,12 +1,15 @@ 4.0.0 + org.apache.maven.its.mng2861 MNG-2861 - pom 1.0-SNAPSHOT + pom + MNG-2861 http://maven.apache.org + junit @@ -15,6 +18,7 @@ test + A B diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.md5 deleted file mode 100644 index 40cc3e65a0..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -1fe5ef0ab6b4d1c8926341f2035f50a4 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.sha1 deleted file mode 100644 index aeca784f50..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c1ee3de58820c588e73422f4d2068573edbe6fab \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.md5 deleted file mode 100644 index 0ff3080e53..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -7938848539389e07b287b4d8738e1860 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.sha1 deleted file mode 100644 index ea22501134..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -f43a739fc913e9e09c9d16d38b754c0e095e3b4c \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.md5 deleted file mode 100644 index 2df523bba0..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -595b0dfde7fe78e157b281ad19a7b213 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.sha1 deleted file mode 100644 index 1a3e33bcbc..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -79a503103228c65c8fc4f577d3e6bc8df7d58e70 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.md5 deleted file mode 100644 index 3be107ec51..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -bf5da02b56db7086721b3126655a274f \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.sha1 deleted file mode 100644 index ab1749db1f..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f7ed4c92aabbd653f7abd9e3cac5a61c75ff716 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.md5 deleted file mode 100644 index 315965bb6b..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -26802cd7695d5cba3ce55a445a3a4d38 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.sha1 deleted file mode 100644 index 0d06e1b1a9..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -759ce44fb6af0b8a351dc60c6d00d3ab1db9a59a \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.md5 deleted file mode 100644 index a7948b781c..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -884943b7d020cb76bb37e1001d826d52 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.sha1 deleted file mode 100644 index dfc42e067c..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7e896d2fa550520989f4a4475b4df57eb0edea60 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.md5 deleted file mode 100644 index 7e6aba8ace..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -5fe2afcb15ffe718ffe2c36fb278ddbb \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.sha1 deleted file mode 100644 index b3e7e0a909..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -f557bd0f2499ad748723cab496b1027f5964faf3 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.md5 deleted file mode 100644 index a979c825f5..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -b82f272080a0377c34d890a195812b26 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.sha1 deleted file mode 100644 index ad5066ce3d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b530516717ab5b3052fd3cdca860fc28574bd718 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.md5 deleted file mode 100644 index 69d2ad875d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -f2b6f8fa5226132008569b73dd95f69f \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.sha1 deleted file mode 100644 index ac194d865f..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -4176be3635903857072ddb7974e3ae44a1548048 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.md5 deleted file mode 100644 index bee8b4d064..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -MD5 (project-1.2.pom) = 5eb6d8e0d2e97515f072e3844d767c82 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.sha1 deleted file mode 100644 index 6c56b9bdc6..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -b8bcd7b551babda9b1c5e73db4c92246bb41be3aSHA1(project-1.2.pom)= 4d453b0c3fe9970a2124d3abc2bd2260c9ec9bba diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.md5 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.md5 deleted file mode 100644 index 18be7299ab..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -7b6a16f3694d56298ba7e6f18736c52c \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.sha1 deleted file mode 100644 index 06804554a8..0000000000 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -32932f915794448efaed9c42a416129343e1a97d \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.jar similarity index 100% rename from its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.jar rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.jar diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom similarity index 90% rename from its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom index 417e29fc15..941006d666 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/1.2/project-1.2.pom +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/1.2/project-1.2.pom @@ -1,7 +1,7 @@ 4.0.0 - newgroupId + org.apache.maven.its.mng2861.new project jar 1.2 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.jar similarity index 100% rename from its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.jar rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.jar diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom similarity index 90% rename from its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom index 6155239361..3ff17fc843 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/2.0/project-2.0.pom +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/2.0/project-2.0.pom @@ -1,7 +1,7 @@ 4.0.0 - newgroupId + org.apache.maven.its.mng2861.new project jar 2.0 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/maven-metadata.xml similarity index 84% rename from its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/maven-metadata.xml index cda2531a86..87d885102f 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/newgroupId/project/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/new/project/maven-metadata.xml @@ -1,5 +1,5 @@ - newgroupId + org.apache.maven.its.mng2861.new project 1.2 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.jar similarity index 100% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.jar rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.jar diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom similarity index 88% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom index 407bbd6691..031b8fb9ed 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.0/project-1.0.pom +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.0/project-1.0.pom @@ -1,6 +1,6 @@ 4.0.0 - oldgroupId + org.apache.maven.its.mng2861.old project project 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar similarity index 100% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.jar rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.jar diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom similarity index 90% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom index 683fea27ab..fffa3eaf6d 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.1/project-1.1.pom +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.1/project-1.1.pom @@ -1,7 +1,7 @@ 4.0.0 - oldgroupId + org.apache.maven.its.mng2861.old project jar 1.1 diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom similarity index 85% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom index 483c80d032..9402c308db 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/1.2/project-1.2.pom +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/1.2/project-1.2.pom @@ -1,7 +1,7 @@ 4.0.0 - oldgroupId + org.apache.maven.its.mng2861.old project jar 1.2 @@ -21,7 +21,7 @@ file://localhost/${basedir}/../repository - newgroupId + org.apache.maven.its.mng2861.new diff --git a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/maven-metadata.xml similarity index 85% rename from its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml rename to its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/maven-metadata.xml index ac778e443b..f222f6aac6 100644 --- a/its/core-it-suite/src/test/resources/mng-2861/repo/oldgroupId/project/maven-metadata.xml +++ b/its/core-it-suite/src/test/resources/mng-2861/repo/org/apache/maven/its/mng2861/old/project/maven-metadata.xml @@ -1,5 +1,5 @@ - oldgroupId + org.apache.maven.its.mng2861.old project 1.1