rpms/tycho
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
fe165dabcc
tycho/tycho-fix-surefire.patch

131 lines
6.0 KiB
Diff
Raw Normal View History

Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
From 30e2826ca933fd28d1f769f43fd818ce536b5363 Mon Sep 17 00:00:00 2001
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
From: Roland Grunberg <rgrunber@redhat.com>
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
Date: Fri, 21 Sep 2012 10:58:09 -0400
Update with support for XMvn and Maven Surefire 2.13. Use TYCHO_MVN_{LOCAL,RPMBUILD} to determine how maven was called and update sources to reflect API changes in Maven Surefire 2.13.
2013-01-24 20:25:04 +00:00
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
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.
Update to 0.16.0 SNAPSHOT.
2012-08-07 14:44:21 +00:00
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
---
Update to 0.16.0 SNAPSHOT.
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 ++++++++++
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
6 files changed, 34 insertions(+), 4 deletions(-)
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index 0063b71..9087302 100644
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
@@ -6,6 +6,7 @@ Bundle-Version: 0.21.0
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
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)"
Update to use maven-surefire 2.15 API.
2013-07-09 14:36:03 +00:00
-Bundle-ClassPath: jars/surefire-junit3-2.15.jar
Set the global default execution environment to JavaSE-1.6. This has changed from JavaSE-1.6 (Tycho 0.16.0) to J2SE-1.5 in Tycho 0.17.0-SNAPSHOT. It must be JavaSE-1.6 for Fedora.
2013-02-25 19:15:25 +00:00
+Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
Update to use maven-surefire 2.15 API.
2013-07-09 14:36:03 +00:00
+Bundle-ClassPath: jars/surefire-junit3-2.15.jar,
+ jars/common-junit3-2.15.jar
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index 341e317..5cd46d6 100644
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
Update to 0.16.0 SNAPSHOT.
2012-08-07 14:44:21 +00:00
@@ -44,6 +44,11 @@
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
<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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index 861e0d7..a37db5f 100644
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
@@ -6,7 +6,9 @@ Bundle-Version: 0.21.0
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
Update to use maven-surefire 2.15 API.
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
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
Import-Package: junit.framework;version="3.0.0",
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index 0cdea03..8156c49 100644
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
Update to 0.16.0 SNAPSHOT.
2012-08-07 14:44:21 +00:00
@@ -44,6 +44,16 @@
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
<artifactId>surefire-junit4</artifactId>
<version>${surefire-version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit3</artifactId>
+ <version>${surefire-version}</version>
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
+ </artifactItem>
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
+ <artifactItem>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>common-junit4</artifactId>
+ <version>${surefire-version}</version>
Update to 0.16.0 SNAPSHOT.
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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index 6e0cebb..69aecdd 100644
Update to 0.16.0 SNAPSHOT.
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
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Update to 0.16.0 SNAPSHOT.
2012-08-07 14:44:21 +00:00
Bundle-ClassPath: .,
Update to use maven-surefire 2.15 API.
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
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
Import-Package: junit.framework;version="3.0.0",
Update to 0.16.0 SNAPSHOT.
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
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
index e217cdf..3e45493 100644
Update to 0.16.0 SNAPSHOT.
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
Update to latest 0.16.0 SNAPSHOT.
2012-09-24 21:06:48 +00:00
@@ -54,6 +54,16 @@
<artifactId>surefire-grouper</artifactId>
Update to 0.16.0 SNAPSHOT.
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>
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
--
Update to 0.21.0 Release.
2014-07-25 15:45:40 +00:00
1.9.3
Fix Surfire test plugin. 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.
2012-05-29 19:04:45 +00:00
Reference in New Issue Copy Permalink