From 80c25441163dd816d42984ea0b7c2e72ceb61a6d Mon Sep 17 00:00:00 2001 From: Matthias Gradl Date: Fri, 19 Aug 2011 10:51:16 +0200 Subject: [PATCH] 353384 Adapt artifactIds in ITS projects to match Eclipse IDs Modify artifactIds so that they are equal to the bundle/feature IDs. (Using this direction because adapting the Eclipse IDs would have required a lot more changes in tests and test data.) --- tycho-its/projects/MNGECLIPSE1026/pom.xml | 2 +- tycho-its/projects/MNGECLIPSE937/bundle.tests/pom.xml | 2 +- .../build01/build01.bundle01/pom.xml | 2 +- .../build01/build01.bundle02/pom.xml | 2 +- .../build01/build01.bundle03/pom.xml | 2 +- .../build01/build01.feature01/pom.xml | 2 +- .../build02/build02.bundle02/pom.xml | 2 +- .../build02/build02.feature01/pom.xml | 2 +- .../build03/build03.bundle01/pom.xml | 2 +- tycho-its/projects/TYCHO0290appArgs/pom.xml | 2 +- tycho-its/projects/TYCHO0356runSingleTest/pom.xml | 2 +- .../projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml | 2 +- .../projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml | 2 +- .../TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml | 2 +- tycho-its/projects/TYCHO0432configurableFailIfNoTests/pom.xml | 2 +- .../projects/TYCHO109product/plugin-rcp-app/bundle/pom.xml | 2 +- tycho-its/projects/TYCHO170/bundle.tests/pom.xml | 2 +- .../org.eclipse.tycho.testExtraClasspathTest1/pom.xml | 2 +- .../org.eclipse.tycho.testExtraClasspathTest2/pom.xml | 2 +- .../org.eclipse.tycho.testExtraClasspathTest3/pom.xml | 2 +- .../projects/TYCHO309pomDependencyConsider/feature/pom.xml | 2 +- tycho-its/projects/TYCHO32/bundle.tests/pom.xml | 2 +- .../TYCHO340explodedTestDependencies/tycho340.plugin/pom.xml | 2 +- .../TYCHO340explodedTestDependencies/tycho340.test/pom.xml | 2 +- tycho-its/projects/TYCHO351testSystemProperties/pom.xml | 2 +- tycho-its/projects/TYCHO353frameworkExtensions/pom.xml | 2 +- tycho-its/projects/TYCHO359corruptedArtifactDownloads/pom.xml | 2 +- tycho-its/projects/target.httpAuthentication/pom.xml | 2 +- tycho-its/projects/toolchains/pom.xml | 2 +- tycho-its/projects/tycho154/bundle.tests/pom.xml | 2 +- tycho-its/projects/tycho98/bundle.tests/pom.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tycho-its/projects/MNGECLIPSE1026/pom.xml b/tycho-its/projects/MNGECLIPSE1026/pom.xml index dbb9b0e3..0990f226 100644 --- a/tycho-its/projects/MNGECLIPSE1026/pom.xml +++ b/tycho-its/projects/MNGECLIPSE1026/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.eclipse.tycho.tycho-its.MNGECLIPSE1026 - MNGECLIPSE1026 + my.group.my.plugin2 eclipse-plugin 1.0.0 diff --git a/tycho-its/projects/MNGECLIPSE937/bundle.tests/pom.xml b/tycho-its/projects/MNGECLIPSE937/bundle.tests/pom.xml index 26254fbc..c0056cd4 100644 --- a/tycho-its/projects/MNGECLIPSE937/bundle.tests/pom.xml +++ b/tycho-its/projects/MNGECLIPSE937/bundle.tests/pom.xml @@ -6,6 +6,6 @@ parent 0.0.1-SNAPSHOT - bundle.test + bundle.tests eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/pom.xml index 761b17a1..297e93a9 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build01.bundle01 + org.codehaus.tycho.tychoits.tycho0209.build01.bundle01 eclipse-plugin diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/pom.xml index 39f44187..82dc07a8 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build01.bundle02 + org.codehaus.tycho.tychoits.tycho0209.build01.bundle02 eclipse-plugin diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/pom.xml index 2d181715..2048cfab 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build01.bundle03 + org.codehaus.tycho.tychoits.tycho0209.build01.bundle03 eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.feature01/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.feature01/pom.xml index 13552b25..581d53b6 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.feature01/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.feature01/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build01.feature01 + org.codehaus.tycho.tychoits.tycho0209.build01.feature01 eclipse-feature diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/pom.xml index 34534b36..30d31c3f 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build02.bundle02 + org.codehaus.tycho.tychoits.tycho0209.build02.bundle02 eclipse-plugin diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.feature01/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.feature01/pom.xml index a4e68f97..e16ceadf 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.feature01/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.feature01/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build02.feature01 + org.codehaus.tycho.tychoits.tycho0209.build02.feature01 eclipse-feature diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/pom.xml index d40b7636..dfb24adb 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho0209.build03.bundle01 + org.codehaus.tycho.tychoits.tycho0209.build03.bundle01 eclipse-plugin diff --git a/tycho-its/projects/TYCHO0290appArgs/pom.xml b/tycho-its/projects/TYCHO0290appArgs/pom.xml index d2e15f30..ef648bf2 100644 --- a/tycho-its/projects/TYCHO0290appArgs/pom.xml +++ b/tycho-its/projects/TYCHO0290appArgs/pom.xml @@ -3,7 +3,7 @@ 4.0.0 TYCHO0290appArgs - test + TYCHO0290appArgs 0.0.1-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0356runSingleTest/pom.xml b/tycho-its/projects/TYCHO0356runSingleTest/pom.xml index cadd1227..a694790e 100644 --- a/tycho-its/projects/TYCHO0356runSingleTest/pom.xml +++ b/tycho-its/projects/TYCHO0356runSingleTest/pom.xml @@ -3,7 +3,7 @@ 4.0.0 TYCHO0356runSingleTest - bundle.test + TYCHO0356runSingleTest 1.0.0-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml index 5c068348..643e938f 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml @@ -4,7 +4,7 @@ 4.0.0 TYCHO0367localRepositoryCrosstalk - bundle01 + TYCHO0367localRepositoryCrosstalk.bundle01 1.0.0-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml index ed73eac2..b2c4988c 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 4.0.0 TYCHO0367localRepositoryCrosstalk - bundle02 + TYCHO0367localRepositoryCrosstalk.bundle02 1.0.0-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml b/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml index 49c27782..cbe79ed0 100644 --- a/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml +++ b/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 TYCHO0380twoJunitVersions - bundle.test + featureDotQualifier.feature 1.0.0-SNAPSHOT eclipse-feature diff --git a/tycho-its/projects/TYCHO0432configurableFailIfNoTests/pom.xml b/tycho-its/projects/TYCHO0432configurableFailIfNoTests/pom.xml index 118b6b8d..5574a5f3 100644 --- a/tycho-its/projects/TYCHO0432configurableFailIfNoTests/pom.xml +++ b/tycho-its/projects/TYCHO0432configurableFailIfNoTests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.eclipse.tycho.tychoits.TYCHO0432configurableFailIfNoTests - bundle.test + TYCHO0432configurableFailIfNoTests 1.0.0-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO109product/plugin-rcp-app/bundle/pom.xml b/tycho-its/projects/TYCHO109product/plugin-rcp-app/bundle/pom.xml index cc77b98a..9cbcfc21 100644 --- a/tycho-its/projects/TYCHO109product/plugin-rcp-app/bundle/pom.xml +++ b/tycho-its/projects/TYCHO109product/plugin-rcp-app/bundle/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT - bundle + HeadlessProduct 1.0.0 eclipse-plugin diff --git a/tycho-its/projects/TYCHO170/bundle.tests/pom.xml b/tycho-its/projects/TYCHO170/bundle.tests/pom.xml index dd5cb75c..3634b5bf 100644 --- a/tycho-its/projects/TYCHO170/bundle.tests/pom.xml +++ b/tycho-its/projects/TYCHO170/bundle.tests/pom.xml @@ -6,6 +6,6 @@ parent 0.0.1-SNAPSHOT - bundle.test + bundle.tests eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml index 09b45882..395a429e 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.eclipse.tycho.TYCHO253extraClassPathEntries - TYCHO253extraClassPathEntries.testExtraClasspathTest1 + org.sonatype.tycho.testExtraClasspathTest1 eclipse-plugin 1.0.0-SNAPSHOT diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml index 3215a1e3..a3945182 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.eclipse.tycho.TYCHO253extraClassPathEntries - TYCHO253extraClassPathEntries.testExtraClasspathTest2 + org.sonatype.tycho.testExtraClasspathTest2 eclipse-plugin 1.0.0-SNAPSHOT diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml index 234745f7..ff23b66f 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.eclipse.tycho.TYCHO253extraClassPathEntries - TYCHO253extraClassPathEntries.testExtraClasspathTest3 + org.sonatype.tycho.testExtraClasspathTest3 eclipse-plugin 1.0.0-SNAPSHOT diff --git a/tycho-its/projects/TYCHO309pomDependencyConsider/feature/pom.xml b/tycho-its/projects/TYCHO309pomDependencyConsider/feature/pom.xml index dfc7c424..e24fa221 100644 --- a/tycho-its/projects/TYCHO309pomDependencyConsider/feature/pom.xml +++ b/tycho-its/projects/TYCHO309pomDependencyConsider/feature/pom.xml @@ -6,6 +6,6 @@ parent 0.0.1-SNAPSHOT - feature + tycho309.feature eclipse-feature diff --git a/tycho-its/projects/TYCHO32/bundle.tests/pom.xml b/tycho-its/projects/TYCHO32/bundle.tests/pom.xml index 2779dbbf..3d046e10 100644 --- a/tycho-its/projects/TYCHO32/bundle.tests/pom.xml +++ b/tycho-its/projects/TYCHO32/bundle.tests/pom.xml @@ -6,7 +6,7 @@ parent 0.0.1-SNAPSHOT - bundle.test + build.tests eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.plugin/pom.xml b/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.plugin/pom.xml index 1c1748b4..520b0e28 100644 --- a/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.plugin/pom.xml +++ b/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.plugin/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho340.plugin + org.codehaus.tycho.tychoits.tycho0340.plugin eclipse-plugin diff --git a/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.test/pom.xml b/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.test/pom.xml index fc00e78f..095d7513 100644 --- a/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.test/pom.xml +++ b/tycho-its/projects/TYCHO340explodedTestDependencies/tycho340.test/pom.xml @@ -17,7 +17,7 @@ 0.0.1-SNAPSHOT - org.eclipse.tycho.tychoits.tycho340.test + org.codehaus.tycho.tychoits.tycho0340.test eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO351testSystemProperties/pom.xml b/tycho-its/projects/TYCHO351testSystemProperties/pom.xml index c928cc0d..f470ba73 100644 --- a/tycho-its/projects/TYCHO351testSystemProperties/pom.xml +++ b/tycho-its/projects/TYCHO351testSystemProperties/pom.xml @@ -3,7 +3,7 @@ 4.0.0 TYCHO351testSystemProperties - test + TYCHO351testSystemProperties 0.0.1-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO353frameworkExtensions/pom.xml b/tycho-its/projects/TYCHO353frameworkExtensions/pom.xml index 09027596..83ad6c8d 100644 --- a/tycho-its/projects/TYCHO353frameworkExtensions/pom.xml +++ b/tycho-its/projects/TYCHO353frameworkExtensions/pom.xml @@ -3,7 +3,7 @@ 4.0.0 TYCHO353frameworkExtensions - test + TYCHO351testSystemProperties 0.0.1-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/TYCHO359corruptedArtifactDownloads/pom.xml b/tycho-its/projects/TYCHO359corruptedArtifactDownloads/pom.xml index ecf0a64c..bfa2e87d 100644 --- a/tycho-its/projects/TYCHO359corruptedArtifactDownloads/pom.xml +++ b/tycho-its/projects/TYCHO359corruptedArtifactDownloads/pom.xml @@ -10,7 +10,7 @@ 4.0.0 TYCHO319passwordProtectedP2Repository - bundle + TYCHO359corruptedArtifactDownloads.bundle 0.0.1-SNAPSHOT eclipse-plugin diff --git a/tycho-its/projects/target.httpAuthentication/pom.xml b/tycho-its/projects/target.httpAuthentication/pom.xml index b3154403..a458668e 100644 --- a/tycho-its/projects/target.httpAuthentication/pom.xml +++ b/tycho-its/projects/target.httpAuthentication/pom.xml @@ -10,7 +10,7 @@ 4.0.0 TYCHO319passwordProtectedP2Repository - bundle + TYCHO319passwordProtectedP2Repository.bundle 0.0.1-SNAPSHOT eclipse-plugin diff --git a/tycho-its/projects/toolchains/pom.xml b/tycho-its/projects/toolchains/pom.xml index 12c472ad..7ba812dd 100644 --- a/tycho-its/projects/toolchains/pom.xml +++ b/tycho-its/projects/toolchains/pom.xml @@ -3,7 +3,7 @@ 4.0.0 toolchains - test + toolchains 0.0.1-SNAPSHOT eclipse-test-plugin diff --git a/tycho-its/projects/tycho154/bundle.tests/pom.xml b/tycho-its/projects/tycho154/bundle.tests/pom.xml index 158ac26a..330b990d 100644 --- a/tycho-its/projects/tycho154/bundle.tests/pom.xml +++ b/tycho-its/projects/tycho154/bundle.tests/pom.xml @@ -6,6 +6,6 @@ parent 0.0.1-SNAPSHOT - bundle.test + bundle.tests eclipse-test-plugin diff --git a/tycho-its/projects/tycho98/bundle.tests/pom.xml b/tycho-its/projects/tycho98/bundle.tests/pom.xml index 62a2490a..d77b481d 100644 --- a/tycho-its/projects/tycho98/bundle.tests/pom.xml +++ b/tycho-its/projects/tycho98/bundle.tests/pom.xml @@ -6,6 +6,6 @@ parent 0.0.1-SNAPSHOT - bundle.test + bundle.tests eclipse-test-plugin