|
 |
4c9427 |
From 3d497c3a1f153eeff65b5c336c3735afc2f5e02c Mon Sep 17 00:00:00 2001
|
|
|
4c9427 |
From: Jan Sievers <jan.sievers@sap.com>
|
|
|
4c9427 |
Date: Tue, 4 Sep 2012 16:02:52 +0200
|
|
|
4c9427 |
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
|
|
|
4c9427 |
|
|
|
4c9427 |
When running an Eclipse bundle's tests, Tycho Surefire resolves its
|
|
|
4c9427 |
runtime dependencies using a class loader, which is in fact just looking
|
|
|
4c9427 |
through Bundle-ClassPath. As a result, it must copy over and include
|
|
|
4c9427 |
system jars in its Bundle-ClassPath. We use Fedora system jars to
|
|
|
4c9427 |
satisfy these dependencies but even these jars differ slightly in terms
|
|
|
4c9427 |
of provided classes. This patch addresses this issue.
|
|
|
4c9427 |
|
|
|
4c9427 |
Basically, the jars added to the Bundle-ClassPath in this patch, provide
|
|
|
4c9427 |
the additional classes that are in the original jars used upstream.
|
|
|
4c9427 |
|
|
|
4c9427 |
Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
|
|
|
4c9427 |
---
|
|
|
4c9427 |
.../org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF | 5 +++--
|
|
|
4c9427 |
tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
|
|
|
4c9427 |
.../org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF | 4 +++-
|
|
|
4c9427 |
tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
|
|
|
4c9427 |
.../org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF | 4 +++-
|
|
|
4c9427 |
tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++++
|
|
|
4c9427 |
.../org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF | 3 ++-
|
|
|
4c9427 |
tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
|
|
|
4c9427 |
8 files changed, 41 insertions(+), 5 deletions(-)
|
|
|
4c9427 |
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
|
|
|
4c9427 |
index 985c901..d0ae690 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
|
|
|
4c9427 |
@@ -6,6 +6,7 @@ Bundle-Version: 0.22.0
|
|
|
4c9427 |
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
|
|
|
4c9427 |
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
|
|
|
4c9427 |
JavaSE-1.6
|
|
|
4c9427 |
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
|
|
|
4c9427 |
-Bundle-ClassPath: jars/surefire-junit3-2.17.jar
|
|
|
4c9427 |
+Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
|
|
|
4c9427 |
+Bundle-ClassPath: jars/surefire-junit3-2.17.jar,
|
|
|
4c9427 |
+ jars/common-junit3-2.17.jar
|
|
|
4c9427 |
Bundle-Vendor: %providerName
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
|
|
4c9427 |
index 108286e..4093a2f 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
|
|
4c9427 |
@@ -44,6 +44,11 @@
|
|
|
4c9427 |
<artifactId>surefire-junit3</artifactId>
|
|
|
4c9427 |
<version>${surefire-version}</version>
|
|
|
4c9427 |
</artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.apache.maven.surefire</groupId>
|
|
|
4c9427 |
+ <artifactId>common-junit3</artifactId>
|
|
|
4c9427 |
+ <version>${surefire-version}</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
</artifactItems>
|
|
|
4c9427 |
</configuration>
|
|
|
4c9427 |
</execution>
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
|
|
4c9427 |
index 41cf2a4..1f554ba 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
|
|
|
4c9427 |
@@ -6,7 +6,9 @@ Bundle-Version: 0.22.0
|
|
|
4c9427 |
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
|
|
|
4c9427 |
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
|
|
|
4c9427 |
JavaSE-1.6
|
|
|
4c9427 |
-Bundle-ClassPath: jars/surefire-junit4-2.17.jar
|
|
|
4c9427 |
+Bundle-ClassPath: jars/surefire-junit4-2.17.jar,
|
|
|
4c9427 |
+ jars/common-junit3-2.17.jar,
|
|
|
4c9427 |
+ jars/common-junit4-2.17.jar
|
|
|
4c9427 |
Import-Package: junit.framework;version="3.0.0",
|
|
|
4c9427 |
org.junit;version="4.0.0",
|
|
|
4c9427 |
org.junit.runner;version="4.0.0",
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
|
|
4c9427 |
index 8b5cf64..ae3b3b1 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
|
|
4c9427 |
@@ -44,6 +44,16 @@
|
|
|
4c9427 |
<artifactId>surefire-junit4</artifactId>
|
|
|
4c9427 |
<version>${surefire-version}</version>
|
|
|
4c9427 |
</artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.apache.maven.surefire</groupId>
|
|
|
4c9427 |
+ <artifactId>common-junit3</artifactId>
|
|
|
4c9427 |
+ <version>${surefire-version}</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.apache.maven.surefire</groupId>
|
|
|
4c9427 |
+ <artifactId>common-junit4</artifactId>
|
|
|
4c9427 |
+ <version>${surefire-version}</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
</artifactItems>
|
|
|
4c9427 |
</configuration>
|
|
|
4c9427 |
</execution>
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
|
|
|
4c9427 |
index 6bb3710..ebac243 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
|
|
|
4c9427 |
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
|
|
4c9427 |
Bundle-ClassPath: .,
|
|
|
4c9427 |
jars/surefire-junit47-2.17.jar,
|
|
|
4c9427 |
jars/common-junit48-2.17.jar,
|
|
|
4c9427 |
- jars/surefire-grouper-2.17.jar
|
|
|
4c9427 |
+ jars/surefire-grouper-2.17.jar,
|
|
|
4c9427 |
+ jars/common-junit3-2.17.jar,
|
|
|
4c9427 |
+ jars/common-junit4-2.17.jar
|
|
|
4c9427 |
Import-Package: junit.framework;version="3.0.0",
|
|
|
4c9427 |
org.junit;version="[4.7,5)",
|
|
|
4c9427 |
org.junit.runner;version="[4.7,5)",
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
|
|
|
4c9427 |
index ba08dc0..afadf96 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
|
|
|
4c9427 |
@@ -54,6 +54,16 @@
|
|
|
4c9427 |
<artifactId>surefire-grouper</artifactId>
|
|
|
4c9427 |
<version>${surefire-version}</version>
|
|
|
4c9427 |
</artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.apache.maven.surefire</groupId>
|
|
|
4c9427 |
+ <artifactId>common-junit4</artifactId>
|
|
|
4c9427 |
+ <version>${surefire-version}</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.apache.maven.surefire</groupId>
|
|
|
4c9427 |
+ <artifactId>common-junit3</artifactId>
|
|
|
4c9427 |
+ <version>${surefire-version}</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
</artifactItems>
|
|
|
4c9427 |
</configuration>
|
|
|
4c9427 |
</execution>
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
|
|
|
4c9427 |
index 6c9a366..dfe22ae 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
|
|
|
4c9427 |
@@ -7,7 +7,8 @@ Bundle-Version: 0.22.0
|
|
|
4c9427 |
Bundle-ClassPath: .,
|
|
|
4c9427 |
jars/surefire-booter-2.17.jar,
|
|
|
4c9427 |
jars/surefire-api-2.17.jar,
|
|
|
4c9427 |
- jars/maven-surefire-common-2.17.jar
|
|
|
4c9427 |
+ jars/maven-surefire-common-2.17.jar,
|
|
|
4c9427 |
+ jars/plexus-utils-3.0.jar
|
|
|
4c9427 |
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
|
|
|
4c9427 |
Bundle-ManifestVersion: 2
|
|
|
4c9427 |
Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
|
|
|
4c9427 |
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
|
|
4c9427 |
index e457dce..6fd329f 100644
|
|
|
4c9427 |
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
|
|
4c9427 |
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
|
|
4c9427 |
@@ -57,6 +57,11 @@
|
|
|
4c9427 |
<artifactId>maven-surefire-common</artifactId>
|
|
|
4c9427 |
<version>${surefire-version}</version>
|
|
|
4c9427 |
</artifactItem>
|
|
|
4c9427 |
+ <artifactItem>
|
|
|
4c9427 |
+ <groupId>org.codehaus.plexus</groupId>
|
|
|
4c9427 |
+ <artifactId>plexus-utils</artifactId>
|
|
|
4c9427 |
+ <version>3.0</version>
|
|
|
4c9427 |
+ </artifactItem>
|
|
|
4c9427 |
</artifactItems>
|
|
|
4c9427 |
</configuration>
|
|
|
4c9427 |
</execution>
|
|
|
4c9427 |
--
|
|
|
4c9427 |
1.9.3
|
|
|
4c9427 |
|