rpms
/
tycho
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
tycho/tycho-fix-build.patch

135 lines
7.1 KiB
Diff
Raw Blame History

--- ./tycho-0.14.0.old/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-06 10:26:59.000000000 -0500
+++ ./tycho-0.14.0/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-10 16:25:37.000000000 -0500
@@ -37,6 +37,14 @@
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,
--- ./tycho-0.14.0.old/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-06 10:26:59.000000000 -0500
+++ ./tycho-0.14.0/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-10 15:39:49.723000889 -0500
@@ -36,7 +36,7 @@
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 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();
--- ./tycho-0.14.0.old/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-06 10:26:59.000000000 -0500
+++ ./tycho-0.14.0/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-10 15:36:32.000000000 -0500
@@ -25,7 +25,7 @@
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 @@
}
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 @@
&& "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 @@
}
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 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);
}
--- ./tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
+++ ./tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-14 12:04:02.275017810 -0500
@@ -6,6 +6,6 @@
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)"
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
Bundle-ClassPath: jars/surefire-junit3-2.10.jar
Bundle-Vendor: %providerName
--- ./tycho-0.14.x.old/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-02-24 06:40:15.000000000 -0500
+++ ./tycho-0.14.x/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-05-03 14:09:09.000000000 -0400
@@ -18,7 +18,7 @@
public enum EEType {
// order is significant for comparison
- OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JAVA_SE("JavaSE");
+ OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JRE("JRE"), JAVA_SE("JavaSE");
private final String profileName;
--- ./tycho-0.14.x.old/tycho-core/src/main/java/org/eclipse/tycho/core/utils/ExecutionEnvironment.java 2012-02-24 06:40:15.000000000 -0500
+++ ./tycho-0.14.x/tycho-core/src/main/java/org/eclipse/tycho/core/utils/ExecutionEnvironment.java 2012-05-03 14:09:09.000000000 -0400
@@ -50,8 +50,9 @@
private EEVersion parseEEVersion(String systemCaps) {
if (systemCaps == null && "JRE-1.1".equals(profileName)) {
- // system capabilities entry is missing for JRE-1.1
- return new EEVersion(Version.parseVersion("1.1"), EEType.JAVA_SE);
+ // system capabilities entry is missing for JRE-1.1
+ // TODO remove workaround when https://bugs.eclipse.org/377277 is fixed
+ return new EEVersion(Version.parseVersion("1.1"), EEType.JRE);
}
List<EEVersion> eeVersions = new ArrayList<EEVersion>();
try {
Reference in New Issue View Git Blame Copy Permalink