tycho/tycho-fix-build.patch

162 lines
9.4 KiB
Diff
Raw Normal View History

From 33bb1bece17d1b6f6e81b149828fa1287aa61093 Mon Sep 17 00:00:00 2001
2012-06-12 15:06:31 +00:00
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
2012-06-12 15:06:31 +00:00
Minor fixes of limited scope needed to have Tycho building on Fedora.
2012-08-07 14:44:21 +00:00
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
2012-09-24 21:06:48 +00:00
Tycho upstream currently depends upon 0.15.0 when building
0.16.0-SNAPSHOT, which doesn't have reactor plugin version checking. In
Fedora we depend on the previously built version which has that version
checking. We must keep previous build version strings different to avoid
a cyclic dependency, but doing so causes the version checking to fail,
so we must provide a way to disable it. Disable by default.
2013-02-28 19:02:25 +00:00
Update to using Jetty 9 API.
Update to using maven-surefire 2.18.
2012-06-12 15:06:31 +00:00
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
2014-11-25 16:48:43 +00:00
.../META-INF/MANIFEST.MF | 2 +-
.../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../src/main/java/org/eclipse/tycho/test/util/HttpServer.java | 8 ++++++--
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
.../tycho-standalone-p2-director/p2 Director.product | 1 -
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
.../eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java | 2 +-
2014-11-25 16:48:43 +00:00
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
8 files changed, 17 insertions(+), 14 deletions(-)
2012-06-12 15:06:31 +00:00
2013-10-24 18:52:56 +00:00
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 4243cfd..eca4c01 100644
2013-10-24 18:52:56 +00:00
--- 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
Require-Bundle: org.junit,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.ds,
- org.mockito
+ org.mockito.mockito-core
Import-Package: org.eclipse.tycho.locking.facade,
org.eclipse.tycho.repository.local.testutil,
org.eclipse.tycho.repository.streaming.testutil,
2012-10-17 16:06:40 +00:00
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 7afa13e..82962f9 100644
2012-10-17 16:06:40 +00:00
--- 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 {
String name = capability.getName();
String version = capability.getVersion().toString();
- if (JREAction.NAMESPACE_OSGI_EE.equals(namespace)) {
+ if ("osgi.ee".equals(namespace)) {
result.add(new SystemCapability(Type.OSGI_EE, name, version));
} else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) {
result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version));
2013-02-28 19:02:25 +00:00
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 6e65627..eefc753 100644
2013-02-28 19:02:25 +00:00
--- 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
2014-11-25 16:48:43 +00:00
@@ -17,6 +17,11 @@ import java.util.List;
2013-04-02 15:40:08 +00:00
import java.util.Map;
import java.util.Random;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
2013-02-28 19:02:25 +00:00
+import org.eclipse.jetty.server.AbstractNetworkConnector;
2014-11-25 16:48:43 +00:00
+import org.eclipse.jetty.server.Connector;
2013-02-28 19:02:25 +00:00
import org.eclipse.jetty.server.Server;
2014-11-25 16:48:43 +00:00
import org.eclipse.jetty.server.ServerConnector;
2013-02-28 19:02:25 +00:00
import org.eclipse.jetty.servlet.ServletContextHandler;
2014-11-25 16:48:43 +00:00
@@ -76,8 +81,7 @@ public class HttpServer extends ExternalResource {
2013-02-28 19:02:25 +00:00
2013-04-02 15:40:08 +00:00
private static RunningServer startServerOnPort(int port) throws Exception {
Server jetty = new Server();
2014-11-25 16:48:43 +00:00
- ServerConnector connector = new ServerConnector(jetty);
- connector.setHost("localhost");
2013-04-02 15:40:08 +00:00
+ AbstractNetworkConnector connector = new ServerConnector(jetty);
2013-02-28 19:02:25 +00:00
connector.setPort(port);
2013-04-02 15:40:08 +00:00
jetty.addConnector(connector);
2012-08-07 14:44:21 +00:00
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 814afe1..0dc0980 100644
2012-08-07 14:44:21 +00:00
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
2014-07-25 15:45:40 +00:00
@@ -43,7 +43,6 @@
2012-08-07 14:44:21 +00:00
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.concurrent"/>
<plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
index 771d4f7..eabd0d9 100644
2012-08-07 14:44:21 +00:00
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
2013-04-02 15:40:08 +00:00
@@ -42,7 +42,6 @@
2012-08-07 14:44:21 +00:00
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.concurrent"/>
<plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
2012-09-24 21:06:48 +00:00
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 b00c344..bc05c2d 100644
2012-09-24 21:06:48 +00:00
--- 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
@@ -102,7 +102,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
2012-09-24 21:06:48 +00:00
}
private void validate(List<MavenProject> projects) throws MavenExecutionException {
- validateConsistentTychoVersion(projects);
+ if (System.getProperty("tycho.enableVersionCheck") != null) {
2012-09-24 21:06:48 +00:00
+ validateConsistentTychoVersion(projects);
+ }
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
2012-08-07 14:44:21 +00:00
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 097bdeb..f90b10c 100644
2012-08-07 14:44:21 +00:00
--- 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
@@ -115,12 +115,11 @@ public abstract class AbstractTychoIntegrationTest {
2012-08-07 14:44:21 +00:00
verifier.getCliOptions().add(customOptions);
}
- if (System.getProperty(SYSPROP_STATELOCATION) != null) {
- verifier.setForkJvm(false);
- String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
- if (m2eresolver != null) {
- verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
- }
+ String m2eState = System.getProperty("m2eclipse.workspace.state");
+ String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
+
+ if (m2eState != null && m2eResolver != null) {
+ verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
}
return verifier;
2012-06-12 15:06:31 +00:00
--
2.1.0
2012-06-12 15:06:31 +00:00