From 354a8a3e10fac409b9d0115d1cb377ee711d2025 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Mon, 19 Nov 2012 10:33:43 -0500
Subject: [PATCH] Minor fixes of limited scope to get a Tycho bootstrapped
 build.

Eclipse p2 repositories can change subtly (disappear, become composites)
causing bizare failures in resolving from the reactor cache so we must
keep the URLs up to date.

When doing a bootstrap build, we're using upstream jars with class files
compiled as 'jsr14' (Allows running on 1.4 JDK and can compile against
1.5 sources). JDK 1.7 is not backwards compatible (eg. info on generics
is ignored in these jars).
---
 tycho-bundles/tycho-bundles-target/tycho.target              | 10 +++++-----
 .../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java  | 12 ++++++------
 tycho-surefire/pom.xml                                       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
index 3436ba6..67ba8c6 100644
--- a/tycho-bundles/tycho-bundles-target/tycho.target
+++ b/tycho-bundles/tycho-bundles-target/tycho.target
@@ -2,11 +2,11 @@
 <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="8">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120913-142258-7P7OG2BFLWUl7Unz-8OO8IEVz-8"/>
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20121002-0800"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120913-170722-84FAgGhRFnbPjaFro9s2VXtitW"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N8BHpPGMMn84SxoTtoj_mfujQDR"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121002-0800"/>
+<unit id="org.eclipse.equinox.executable.feature.group"/>
+<unit id="org.eclipse.sdk.ide"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121113-0800"/>
 </location>
 </locations>
 </target>
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 37ce827..4cc7644 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 StandardExecutionEnvironment[] EMPTY_EXEC_ENV = new StandardExecutionEnvironment[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-surefire/pom.xml b/tycho-surefire/pom.xml
index eab06be..6622176 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -41,7 +41,7 @@
 		<repository>
 			<id>eclipse</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/indigo</url>
+			<url>http://download.eclipse.org/releases/indigo/201202240900</url>
 		</repository>
 	</repositories>
 
-- 
1.7.11.7