tycho/tycho-fix-surefire.patch

131 lines
6.0 KiB
Diff
Raw Normal View History

2014-07-25 15:45:40 +00:00
From 30e2826ca933fd28d1f769f43fd818ce536b5363 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
2012-09-24 21:06:48 +00:00
Date: Fri, 21 Sep 2012 10:58:09 -0400
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
When running an Eclipse bundle's tests, Tycho Surefire resolves its
runtime dependencies using a class loader, which is in fact just looking
through Bundle-ClassPath. As a result, it must copy over and include
system jars in its Bundle-ClassPath. We use Fedora system jars to
satisfy these dependencies but even these jars differ slightly in terms
of provided classes. This patch addresses this issue.
Basically, the jars added to the Bundle-ClassPath in this patch, provide
the additional classes that are in the original jars used upstream.
2012-08-07 14:44:21 +00:00
2012-09-24 21:06:48 +00:00
Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
---
2012-08-07 14:44:21 +00:00
.../org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF | 5 +++--
tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
.../org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF | 4 +++-
tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
.../org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF | 4 +++-
tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++++
2012-09-24 21:06:48 +00:00
6 files changed, 34 insertions(+), 4 deletions(-)
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
2014-07-25 15:45:40 +00:00
index 0063b71..9087302 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
2014-07-25 15:45:40 +00:00
@@ -6,6 +6,7 @@ Bundle-Version: 0.21.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
2013-07-09 14:36:03 +00:00
-Bundle-ClassPath: jars/surefire-junit3-2.15.jar
+Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
2013-07-09 14:36:03 +00:00
+Bundle-ClassPath: jars/surefire-junit3-2.15.jar,
+ jars/common-junit3-2.15.jar
Bundle-Vendor: %providerName
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
2014-07-25 15:45:40 +00:00
index 341e317..5cd46d6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
2012-08-07 14:44:21 +00:00
@@ -44,6 +44,11 @@
<artifactId>surefire-junit3</artifactId>
<version>${surefire-version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit3</artifactId>
+ <version>${surefire-version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
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
2014-07-25 15:45:40 +00:00
index 861e0d7..a37db5f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
2014-07-25 15:45:40 +00:00
@@ -6,7 +6,9 @@ Bundle-Version: 0.21.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
2013-07-09 14:36:03 +00:00
-Bundle-ClassPath: jars/surefire-junit4-2.15.jar
+Bundle-ClassPath: jars/surefire-junit4-2.15.jar,
+ jars/common-junit3-2.15.jar,
+ jars/common-junit4-2.15.jar
2012-09-24 21:06:48 +00:00
Import-Package: junit.framework;version="3.0.0",
org.junit;version="4.0.0",
org.junit.runner;version="4.0.0",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
2014-07-25 15:45:40 +00:00
index 0cdea03..8156c49 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
2012-08-07 14:44:21 +00:00
@@ -44,6 +44,16 @@
<artifactId>surefire-junit4</artifactId>
<version>${surefire-version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit3</artifactId>
+ <version>${surefire-version}</version>
2012-09-24 21:06:48 +00:00
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit4</artifactId>
+ <version>${surefire-version}</version>
2012-08-07 14:44:21 +00:00
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
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
2014-07-25 15:45:40 +00:00
index 6e0cebb..69aecdd 100644
2012-08-07 14:44:21 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
2012-09-24 21:06:48 +00:00
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
2012-08-07 14:44:21 +00:00
Bundle-ClassPath: .,
2013-07-09 14:36:03 +00:00
jars/surefire-junit47-2.15.jar,
jars/common-junit48-2.15.jar,
- jars/surefire-grouper-2.15.jar
+ jars/surefire-grouper-2.15.jar,
+ jars/common-junit3-2.15.jar,
+ jars/common-junit4-2.15.jar
2012-09-24 21:06:48 +00:00
Import-Package: junit.framework;version="3.0.0",
2012-08-07 14:44:21 +00:00
org.junit;version="[4.7,5)",
org.junit.runner;version="[4.7,5)",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
2014-07-25 15:45:40 +00:00
index e217cdf..3e45493 100644
2012-08-07 14:44:21 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
2012-09-24 21:06:48 +00:00
@@ -54,6 +54,16 @@
<artifactId>surefire-grouper</artifactId>
2012-08-07 14:44:21 +00:00
<version>${surefire-version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit4</artifactId>
+ <version>${surefire-version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit3</artifactId>
+ <version>${surefire-version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
--
2014-07-25 15:45:40 +00:00
1.9.3