When in local mode, but not offline, Tycho should favour local system dependencies over remote ones in all cases.
249 lines
12 KiB
Diff
249 lines
12 KiB
Diff
From 2ddba330f84d010cb462848c3686d084667091ec Mon Sep 17 00:00:00 2001
|
|
From: Roland Grunberg <rgrunber@redhat.com>
|
|
Date: Tue, 12 Jun 2012 09:56:38 -0400
|
|
Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
|
|
|
|
Minor fixes of limited scope needed to have Tycho building on Fedora.
|
|
|
|
As of Fedora 17, the default JRE is JDK 1.7. This does not support
|
|
JSR14. Many Eclipse OSGi bundles use JSR14 for a build target but since
|
|
JDK 1.7 ignores certain information (eg. generics) we must be careful
|
|
when using those libraries.
|
|
|
|
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
|
|
|
|
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
|
|
---
|
|
pom.xml | 5 -----
|
|
tycho-artifactcomparator/pom.xml | 4 ++--
|
|
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
|
|
tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
|
|
.../tycho-standalone-p2-director/p2 Director.product | 1 -
|
|
tycho-compiler-jdt/pom.xml | 4 ----
|
|
.../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
|
|
.../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
|
|
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
|
|
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
|
|
10 files changed, 25 insertions(+), 33 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index dc7c1f5..1868f9a 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
|
|
<version>${jdtVersion}</version>
|
|
</dependency>
|
|
<dependency>
|
|
- <groupId>org.eclipse.tycho</groupId>
|
|
- <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
|
|
- <version>${jdtAptVersion}</version>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.apache.maven.surefire</groupId>
|
|
<artifactId>surefire-booter</artifactId>
|
|
<version>2.10</version>
|
|
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
|
|
index 775107a..11bcb70 100644
|
|
--- a/tycho-artifactcomparator/pom.xml
|
|
+++ b/tycho-artifactcomparator/pom.xml
|
|
@@ -24,7 +24,7 @@
|
|
<dependency>
|
|
<!-- CQ https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6591 -->
|
|
<groupId>org.ow2.asm</groupId>
|
|
- <artifactId>asm-debug-all</artifactId>
|
|
+ <artifactId>asm-all</artifactId>
|
|
<version>4.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
@@ -54,4 +54,4 @@
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
-</project>
|
|
\ No newline at end of file
|
|
+</project>
|
|
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
index 3e584f5..8b54310 100644
|
|
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
@@ -41,7 +41,6 @@
|
|
<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-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
|
|
index d23b885..1437dbd 100644
|
|
--- a/tycho-bundles/tycho-bundles-target/tycho.target
|
|
+++ b/tycho-bundles/tycho-bundles-target/tycho.target
|
|
@@ -4,10 +4,6 @@
|
|
<target name="Target platform for Tycho's bundles" sequenceNumber="7">
|
|
<locations>
|
|
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
|
|
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/>
|
|
-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/>
|
|
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/>
|
|
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/>
|
|
<repository location="http://download.eclipse.org/eclipse/updates/4.2"/>
|
|
</location>
|
|
</locations>
|
|
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
index dd80b5e..797b4ba 100644
|
|
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
@@ -41,7 +41,6 @@
|
|
<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-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
|
|
index 01b9a9e..c373e6a 100644
|
|
--- a/tycho-compiler-jdt/pom.xml
|
|
+++ b/tycho-compiler-jdt/pom.xml
|
|
@@ -38,10 +38,6 @@
|
|
<artifactId>org.eclipse.jdt.core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
- <groupId>org.eclipse.tycho</groupId>
|
|
- <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.codehaus.plexus</groupId>
|
|
<artifactId>plexus-compiler-api</artifactId>
|
|
</dependency>
|
|
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
|
|
index 2859ab7..993cc58 100644
|
|
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
|
|
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
|
|
@@ -25,7 +25,7 @@ public class OsgiManifest {
|
|
private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0];
|
|
|
|
private String location;
|
|
- private Headers<String, String> headers;
|
|
+ private Headers headers;
|
|
|
|
// cache for parsed values of commonly used headers
|
|
private String bundleSymbolicName;
|
|
@@ -78,7 +78,7 @@ public class OsgiManifest {
|
|
}
|
|
|
|
private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException {
|
|
- String value = headers.get(headerKey);
|
|
+ String value = (String)headers.get(headerKey);
|
|
if (value == null) {
|
|
throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found");
|
|
}
|
|
@@ -100,12 +100,12 @@ public class OsgiManifest {
|
|
&& "dir".equals(bundleShapeElements[0].getValue());
|
|
}
|
|
|
|
- public Headers<String, String> getHeaders() {
|
|
+ public Headers getHeaders() {
|
|
return headers;
|
|
}
|
|
|
|
public String getValue(String key) {
|
|
- return headers.get(key);
|
|
+ return (String)headers.get(key);
|
|
}
|
|
|
|
public String getBundleSymbolicName() {
|
|
@@ -141,7 +141,7 @@ public class OsgiManifest {
|
|
}
|
|
|
|
private ManifestElement[] parseHeader(String key) {
|
|
- String value = headers.get(key);
|
|
+ String value = (String)headers.get(key);
|
|
if (value == null) {
|
|
return null;
|
|
}
|
|
@@ -154,7 +154,7 @@ public class OsgiManifest {
|
|
|
|
public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException {
|
|
try {
|
|
- return ManifestElement.parseHeader(key, headers.get(key));
|
|
+ return ManifestElement.parseHeader(key, (String)headers.get(key));
|
|
} catch (BundleException e) {
|
|
throw new OsgiManifestParserException(location, e);
|
|
}
|
|
diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
|
|
index 42db7f6..a145c57 100644
|
|
--- a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
|
|
+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
|
|
@@ -36,7 +36,7 @@ public class StandalonePluginConverterTest {
|
|
converter.convertManifest(new File("src/test/resources/targetplatforms/pre-3.0/plugins/testjar_1.0.0.jar"), mf,
|
|
false, "3.2", true, null);
|
|
Assert.assertTrue(mf.isFile());
|
|
- Headers<String, String> headers = Headers.parseManifest(new FileInputStream(mf));
|
|
+ Headers headers = Headers.parseManifest(new FileInputStream(mf));
|
|
Assert.assertEquals("testjar", headers.get("Bundle-SymbolicName"));
|
|
}
|
|
|
|
@@ -44,14 +44,14 @@ public class StandalonePluginConverterTest {
|
|
public void testWriteManifest() throws PluginConversionException, BundleException, IOException {
|
|
File tmpManifestFile = folder.newFile("testManifest");
|
|
Hashtable<String, String> manifestToWrite = new Hashtable<String, String>();
|
|
- Headers<String, String> originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
|
|
+ Headers originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
|
|
"/manifests/valid.mf"));
|
|
for (Enumeration<String> keys = originalManifest.keys(); keys.hasMoreElements();) {
|
|
String key = keys.nextElement();
|
|
- manifestToWrite.put(key, originalManifest.get(key));
|
|
+ manifestToWrite.put(key, (String)originalManifest.get(key));
|
|
}
|
|
converter.writeManifest(tmpManifestFile, manifestToWrite, false);
|
|
- Headers<String, String> writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
|
|
+ Headers writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
|
|
assertEquals(originalManifest.size(), writtenManifest.size());
|
|
for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
|
|
String key = keys.nextElement();
|
|
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 5c4dcb3..9830aee 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
|
|
@@ -97,12 +97,11 @@ public abstract class AbstractTychoIntegrationTest {
|
|
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;
|
|
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
index a9d80d3..3ddbe9c 100644
|
|
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
@@ -37,6 +37,14 @@ public class EmptyLifecycleExecutor implements LifecycleExecutor {
|
|
return null;
|
|
}
|
|
|
|
+ public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean bool, String... tasks)
|
|
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
|
|
+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
|
|
+ PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
|
|
+ PluginVersionResolutionException {
|
|
+ return null;
|
|
+ }
|
|
+
|
|
public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks)
|
|
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
|
|
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
|
|
--
|
|
1.7.11.2
|
|
|