diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index b946efa..b422b29 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -1,4 +1,4 @@ -From 51411f57cb7c92fc6370e321753bf011a35dfa7b Mon Sep 17 00:00:00 2001 +From 33bb1bece17d1b6f6e81b149828fa1287aa61093 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 09:56:38 -0400 Subject: [PATCH] Fix the Tycho build to work on Fedora. @@ -16,9 +16,7 @@ so we must provide a way to disable it. Disable by default. Update to using Jetty 9 API. -Add support for compact profiles (http://openjdk.java.net/jeps/161). - -Update to using plexus-archiver 2.6. +Update to using maven-surefire 2.18. Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 --- @@ -28,12 +26,12 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 .../tycho-bundles-external/tycho-bundles-external.product | 1 - .../tycho-standalone-p2-director/p2 Director.product | 1 - .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++- - .../tycho/plugins/p2/director/ProductArchiverMojo.java | 9 +++------ + .../eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java | 2 +- .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------ - 8 files changed, 19 insertions(+), 19 deletions(-) + 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF -index ad42ac5..b9d68f6 100644 +index 4243cfd..eca4c01 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF +++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Fragment-Host: org.eclipse.tycho.p2.maven.repository @@ -46,7 +44,7 @@ index ad42ac5..b9d68f6 100644 org.eclipse.tycho.repository.local.testutil, org.eclipse.tycho.repository.streaming.testutil, diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java -index 6773a40..c66c991 100644 +index 7afa13e..82962f9 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java @@ -59,7 +59,7 @@ class CustomEEResolutionHandler extends ExecutionEnvironmentResolutionHandler { @@ -59,7 +57,7 @@ index 6773a40..c66c991 100644 } else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) { result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version)); diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java -index 42c6a5a..47423e5 100644 +index 6e65627..eefc753 100644 --- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java +++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java @@ -17,6 +17,11 @@ import java.util.List; @@ -85,7 +83,7 @@ index 42c6a5a..47423e5 100644 jetty.addConnector(connector); diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 76516e5..7c99168 100644 +index 814afe1..0dc0980 100644 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product @@ -43,7 +43,6 @@ @@ -97,7 +95,7 @@ index 76516e5..7c99168 100644 diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -index 6739b3a..af9237b 100644 +index 771d4f7..eabd0d9 100644 --- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product +++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product @@ -42,7 +42,6 @@ @@ -109,10 +107,10 @@ index 6739b3a..af9237b 100644 diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java -index b71b858..1160f6c 100644 +index b00c344..bc05c2d 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java -@@ -84,7 +84,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic +@@ -102,7 +102,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic } private void validate(List projects) throws MavenExecutionException { @@ -123,11 +121,24 @@ index b71b858..1160f6c 100644 validateUniqueBaseDirs(projects); } +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java +index 26afcd4..19eeab9 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java +@@ -84,7 +84,7 @@ public class OsgiSurefireBooter { + extractProviderProperties(testProps), null, false); + StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary, + StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir, +- trimStacktrace, null, "TESTHASH", false); ++ trimStacktrace, null, "TESTHASH", false, 0); + ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig); + // API indicates we should use testClassLoader below but surefire also tries + // to load surefire classes using this classloader diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java -index a8173df..cf2cf57 100644 +index 097bdeb..f90b10c 100644 --- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java +++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java -@@ -110,12 +110,11 @@ public abstract class AbstractTychoIntegrationTest { +@@ -115,12 +115,11 @@ public abstract class AbstractTychoIntegrationTest { verifier.getCliOptions().add(customOptions); } @@ -146,5 +157,5 @@ index a8173df..cf2cf57 100644 return verifier; -- -1.9.3 +2.1.0 diff --git a/tycho.spec b/tycho.spec index 7b08e62..8f04ec7 100644 --- a/tycho.spec +++ b/tycho.spec @@ -425,6 +425,7 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li %changelog * Thu Jun 25 2015 Roland Grunberg - 0.23.0-5 - fedoraproject-p2: Do not generate requires for fragments. +- Update to work with maven-surefire 2.18. * Fri Jun 19 2015 Fedora Release Engineering - 0.23.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild