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

163 lines
7.6 KiB
Diff
Raw Normal View History

Update to 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
From 3d497c3a1f153eeff65b5c336c3735afc2f5e02c Mon Sep 17 00:00:00 2001
From: Jan Sievers <jan.sievers@sap.com>
Date: Tue, 4 Sep 2012 16:02:52 +0200
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 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
.../org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF | 3 ++-
tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
8 files changed, 41 insertions(+), 5 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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index 985c901..d0ae690 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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
@@ -6,6 +6,7 @@ Bundle-Version: 0.22.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 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
-Bundle-ClassPath: jars/surefire-junit3-2.17.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 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
+Bundle-ClassPath: jars/surefire-junit3-2.17.jar,
+ jars/common-junit3-2.17.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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index 108286e..4093a2f 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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index 41cf2a4..1f554ba 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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
@@ -6,7 +6,9 @@ Bundle-Version: 0.22.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 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
-Bundle-ClassPath: jars/surefire-junit4-2.17.jar
+Bundle-ClassPath: jars/surefire-junit4-2.17.jar,
+ jars/common-junit3-2.17.jar,
+ jars/common-junit4-2.17.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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index 8b5cf64..ae3b3b1 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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index 6bb3710..ebac243 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 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
jars/surefire-junit47-2.17.jar,
jars/common-junit48-2.17.jar,
- jars/surefire-grouper-2.17.jar
+ jars/surefire-grouper-2.17.jar,
+ jars/common-junit3-2.17.jar,
+ jars/common-junit4-2.17.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.22.0 pre-release.
2014-11-25 16:48:43 +00:00
index ba08dc0..afadf96 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>
Update to 0.22.0 pre-release.
2014-11-25 16:48:43 +00:00
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
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
index 6c9a366..dfe22ae 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Version: 0.22.0
Bundle-ClassPath: .,
jars/surefire-booter-2.17.jar,
jars/surefire-api-2.17.jar,
- jars/maven-surefire-common-2.17.jar
+ jars/maven-surefire-common-2.17.jar,
+ jars/plexus-utils-3.0.jar
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index e457dce..6fd329f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -57,6 +57,11 @@
<artifactId>maven-surefire-common</artifactId>
<version>${surefire-version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0</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