Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/bundle/META-INF/MANIFEST.MF (renamed from tycho-its/projects/367637_autoNoSourceBundle/bundle/META-INF/MANIFEST.MF)0
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/bundle/build.properties (renamed from tycho-its/projects/367637_autoNoSourceBundle/bundle/build.properties)0
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/bundle/pom.xml (renamed from tycho-its/projects/367637_autoNoSourceBundle/bundle/pom.xml)2
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/feature/build.properties (renamed from tycho-its/projects/367637_autoNoSourceBundle/feature/build.properties)0
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/feature/feature.xml (renamed from tycho-its/projects/367637_autoNoSourceBundle/feature/feature.xml)0
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/feature/pom.xml (renamed from tycho-its/projects/367637_autoNoSourceBundle/feature/pom.xml)2
-rw-r--r--tycho-its/projects/sourceBundle.autoSkip/pom.xml (renamed from tycho-its/projects/367637_autoNoSourceBundle/pom.xml)2
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/META-INF/MANIFEST.MF (renamed from tycho-its/projects/sourcebundle.nestedjars/META-INF/MANIFEST.MF)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/build.properties (renamed from tycho-its/projects/sourcebundle.nestedjars/build.properties)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/pom.xml (renamed from tycho-its/projects/sourcebundle.nestedjars/pom.xml)2
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/src/Main.java (renamed from tycho-its/projects/sourcebundle.nestedjars/src/Main.java)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/src_bar1/Bar1.java (renamed from tycho-its/projects/sourcebundle.nestedjars/src_bar1/Bar1.java)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/src_bar2/Bar2.java (renamed from tycho-its/projects/sourcebundle.nestedjars/src_bar2/Bar2.java)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/src_foo1/Foo1.java (renamed from tycho-its/projects/sourcebundle.nestedjars/src_foo1/Foo1.java)0
-rw-r--r--tycho-its/projects/sourceBundle.nestedJars/src_foo2/Foo2.java (renamed from tycho-its/projects/sourcebundle.nestedjars/src_foo2/Foo2.java)0
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java (renamed from tycho-its/src/test/java/org/eclipse/tycho/test/bug367637_autoNoSourceBundle/AutoNoSourceBundleTest.java)10
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java (renamed from tycho-its/src/test/java/org/eclipse/tycho/test/sourcebundles/SourceBundlesNestedJarsTest.java)5
17 files changed, 10 insertions, 13 deletions
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/sourceBundle.autoSkip/bundle/META-INF/MANIFEST.MF
index 54661ec7a..54661ec7a 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/bundle/META-INF/MANIFEST.MF
+++ b/tycho-its/projects/sourceBundle.autoSkip/bundle/META-INF/MANIFEST.MF
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/bundle/build.properties b/tycho-its/projects/sourceBundle.autoSkip/bundle/build.properties
index 5f22cdd44..5f22cdd44 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/bundle/build.properties
+++ b/tycho-its/projects/sourceBundle.autoSkip/bundle/build.properties
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/bundle/pom.xml b/tycho-its/projects/sourceBundle.autoSkip/bundle/pom.xml
index 28ab3f8c6..f49bb7e2c 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/bundle/pom.xml
+++ b/tycho-its/projects/sourceBundle.autoSkip/bundle/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>tycho-its-project</groupId>
+ <groupId>tycho-its-project.sourceBundle.autoSkip</groupId>
<artifactId>367637_autoNoSourceBundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/feature/build.properties b/tycho-its/projects/sourceBundle.autoSkip/feature/build.properties
index 64f93a9f0..64f93a9f0 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/feature/build.properties
+++ b/tycho-its/projects/sourceBundle.autoSkip/feature/build.properties
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/feature/feature.xml b/tycho-its/projects/sourceBundle.autoSkip/feature/feature.xml
index 7e1945675..7e1945675 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/feature/feature.xml
+++ b/tycho-its/projects/sourceBundle.autoSkip/feature/feature.xml
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/feature/pom.xml b/tycho-its/projects/sourceBundle.autoSkip/feature/pom.xml
index b3a25e0cc..25a5b6fd7 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/feature/pom.xml
+++ b/tycho-its/projects/sourceBundle.autoSkip/feature/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>tycho-its-project</groupId>
+ <groupId>tycho-its-project.sourceBundle.autoSkip</groupId>
<artifactId>367637_autoNoSourceBundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/tycho-its/projects/367637_autoNoSourceBundle/pom.xml b/tycho-its/projects/sourceBundle.autoSkip/pom.xml
index aed4664ce..f329edf71 100644
--- a/tycho-its/projects/367637_autoNoSourceBundle/pom.xml
+++ b/tycho-its/projects/sourceBundle.autoSkip/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>tycho-its-project</groupId>
+ <groupId>tycho-its-project.sourceBundle.autoSkip</groupId>
<artifactId>367637_autoNoSourceBundle</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/tycho-its/projects/sourcebundle.nestedjars/META-INF/MANIFEST.MF b/tycho-its/projects/sourceBundle.nestedJars/META-INF/MANIFEST.MF
index add67add5..add67add5 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/META-INF/MANIFEST.MF
+++ b/tycho-its/projects/sourceBundle.nestedJars/META-INF/MANIFEST.MF
diff --git a/tycho-its/projects/sourcebundle.nestedjars/build.properties b/tycho-its/projects/sourceBundle.nestedJars/build.properties
index c39b8a803..c39b8a803 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/build.properties
+++ b/tycho-its/projects/sourceBundle.nestedJars/build.properties
diff --git a/tycho-its/projects/sourcebundle.nestedjars/pom.xml b/tycho-its/projects/sourceBundle.nestedJars/pom.xml
index 07371e403..ebe401271 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/pom.xml
+++ b/tycho-its/projects/sourceBundle.nestedJars/pom.xml
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>tychoits.sourcebundle.nestedjars</groupId>
+ <groupId>tycho-its-project.sourceBundle.nestedJars</groupId>
<artifactId>test.distinct.sourceroots</artifactId>
<version>1.0.0</version>
diff --git a/tycho-its/projects/sourcebundle.nestedjars/src/Main.java b/tycho-its/projects/sourceBundle.nestedJars/src/Main.java
index cdf4b2502..cdf4b2502 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/src/Main.java
+++ b/tycho-its/projects/sourceBundle.nestedJars/src/Main.java
diff --git a/tycho-its/projects/sourcebundle.nestedjars/src_bar1/Bar1.java b/tycho-its/projects/sourceBundle.nestedJars/src_bar1/Bar1.java
index fc183c3b5..fc183c3b5 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/src_bar1/Bar1.java
+++ b/tycho-its/projects/sourceBundle.nestedJars/src_bar1/Bar1.java
diff --git a/tycho-its/projects/sourcebundle.nestedjars/src_bar2/Bar2.java b/tycho-its/projects/sourceBundle.nestedJars/src_bar2/Bar2.java
index 5ac555dd2..5ac555dd2 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/src_bar2/Bar2.java
+++ b/tycho-its/projects/sourceBundle.nestedJars/src_bar2/Bar2.java
diff --git a/tycho-its/projects/sourcebundle.nestedjars/src_foo1/Foo1.java b/tycho-its/projects/sourceBundle.nestedJars/src_foo1/Foo1.java
index dae07028f..dae07028f 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/src_foo1/Foo1.java
+++ b/tycho-its/projects/sourceBundle.nestedJars/src_foo1/Foo1.java
diff --git a/tycho-its/projects/sourcebundle.nestedjars/src_foo2/Foo2.java b/tycho-its/projects/sourceBundle.nestedJars/src_foo2/Foo2.java
index 3342a2c54..3342a2c54 100644
--- a/tycho-its/projects/sourcebundle.nestedjars/src_foo2/Foo2.java
+++ b/tycho-its/projects/sourceBundle.nestedJars/src_foo2/Foo2.java
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/bug367637_autoNoSourceBundle/AutoNoSourceBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java
index 3cb910e6c..828e14b82 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/bug367637_autoNoSourceBundle/AutoNoSourceBundleTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java
@@ -8,9 +8,7 @@
* Contributors:
* Sonatype Inc. - initial API and implementation
*******************************************************************************/
-package org.eclipse.tycho.test.bug367637_autoNoSourceBundle;
-
-import java.util.Arrays;
+package org.eclipse.tycho.test.sourceBundle;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
@@ -22,11 +20,11 @@ public class AutoNoSourceBundleTest extends AbstractTychoIntegrationTest {
@Test
public void test() throws Exception {
- // the point of the test is to make sure Tycho does NOT allow references to missing source bundles
+ // the point of the test is to make sure Tycho does NOT allow references to missing source bundles (see bug 367637)
- Verifier verifier = getVerifier("/367637_autoNoSourceBundle", false);
+ Verifier verifier = getVerifier("/sourceBundle.autoSkip", false);
try {
- verifier.executeGoals(Arrays.asList("clean", "install"));
+ verifier.executeGoal("verify");
Assert.fail("Reference to a missing source bundle did not fail the build");
} catch (VerificationException expected) {
verifier.verifyTextInLog("feature.feature.group 1.0.0.qualifier requires 'bundle.source 0.0.0' but it could not be found");
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourcebundles/SourceBundlesNestedJarsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java
index de1b04f4a..ab9a4b3f4 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourcebundles/SourceBundlesNestedJarsTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java
@@ -8,8 +8,7 @@
* Contributors:
* SAP AG - initial API and implementation
*******************************************************************************/
-
-package org.eclipse.tycho.test.sourcebundles;
+package org.eclipse.tycho.test.sourceBundle;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
@@ -29,7 +28,7 @@ public class SourceBundlesNestedJarsTest extends AbstractTychoIntegrationTest {
@Test
public void testDistinctSourceRoots() throws Exception {
- Verifier verifier = getVerifier("sourcebundle.nestedjars", false);
+ Verifier verifier = getVerifier("sourceBundle.nestedJars", false);
verifier.executeGoal("package");
verifier.verifyErrorFreeLog();
File sourceJar = new File(verifier.getBasedir(), "target/test.distinct.sourceroots-1.0.0-sources.jar");

Back to the top