2013-03-17 01:19:47 +00:00
|
|
|
From b0beb9a65686760c7a086043774a24aebb3a731f Mon Sep 17 00:00:00 2001
|
2012-11-17 18:04:34 +00:00
|
|
|
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).
|
2013-03-17 01:19:47 +00:00
|
|
|
|
|
|
|
Upstream is still building with Jetty 8 so our bootstrap build must do
|
|
|
|
the same.
|
|
|
|
|
|
|
|
Change-Id: Ib8f471e5df40eb06da4f2d4ca6c2d3ab14f5dc99
|
2012-11-17 18:04:34 +00:00
|
|
|
---
|
2013-03-17 01:19:47 +00:00
|
|
|
.../main/java/org/eclipse/tycho/test/util/HttpServer.java | 5 ++---
|
|
|
|
.../tycho-bundles-target/tycho-bundles-target.target | 8 ++++----
|
2012-11-17 18:04:34 +00:00
|
|
|
.../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
|
|
|
|
tycho-surefire/pom.xml | 2 +-
|
2013-03-17 01:19:47 +00:00
|
|
|
4 files changed, 13 insertions(+), 14 deletions(-)
|
2012-11-17 18:04:34 +00:00
|
|
|
|
2013-03-17 01:19:47 +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 eb110dc..1a27b00 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
|
|
|
|
@@ -20,10 +20,9 @@ import java.util.Random;
|
|
|
|
import org.eclipse.jetty.security.ConstraintMapping;
|
|
|
|
import org.eclipse.jetty.security.ConstraintSecurityHandler;
|
|
|
|
import org.eclipse.jetty.security.HashLoginService;
|
|
|
|
-import org.eclipse.jetty.server.AbstractNetworkConnector;
|
|
|
|
import org.eclipse.jetty.server.Connector;
|
|
|
|
import org.eclipse.jetty.server.Server;
|
|
|
|
-import org.eclipse.jetty.server.ServerConnector;
|
|
|
|
+import org.eclipse.jetty.server.bio.SocketConnector;
|
|
|
|
import org.eclipse.jetty.servlet.ServletContextHandler;
|
|
|
|
import org.eclipse.jetty.servlet.ServletHolder;
|
|
|
|
import org.eclipse.jetty.util.security.Constraint;
|
|
|
|
@@ -69,7 +68,7 @@ public class HttpServer {
|
|
|
|
|
|
|
|
private static HttpServer doStartServer(String username, String password, int port) throws Exception {
|
|
|
|
Server server = new Server();
|
|
|
|
- AbstractNetworkConnector connector = new ServerConnector(server);
|
|
|
|
+ Connector connector = new SocketConnector();
|
|
|
|
connector.setPort(port);
|
|
|
|
server.addConnector(connector);
|
|
|
|
|
|
|
|
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
|
|
|
|
index 8e105b4..2c66607 100644
|
|
|
|
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
|
|
|
|
+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
|
|
|
|
@@ -2,10 +2,10 @@
|
|
|
|
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="13">
|
2012-11-17 18:04:34 +00:00
|
|
|
<locations>
|
|
|
|
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
|
2013-03-17 01:19:47 +00:00
|
|
|
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130124-220434-7J7IFkRFFt6ZrOZqtTHsTRYeW"/>
|
|
|
|
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130130-2000"/>
|
|
|
|
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20121023-201113-85FAoGkcFoYTldRygAi3fkdtMT"/>
|
|
|
|
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130115-150500-9N8OI2RGMMn85Z2AELstv0CF0LCR"/>
|
2012-11-17 18:04:34 +00:00
|
|
|
+<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"/>
|
2013-03-17 01:19:47 +00:00
|
|
|
<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M5-201301302000/"/>
|
2012-11-17 18:04:34 +00:00
|
|
|
</location>
|
|
|
|
</locations>
|
|
|
|
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
|
2013-03-17 01:19:47 +00:00
|
|
|
index 985e8f3..46bef81 100644
|
2012-11-17 18:04:34 +00:00
|
|
|
--- 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>
|
|
|
|
|
|
|
|
--
|
2013-03-17 01:19:47 +00:00
|
|
|
1.8.1.4
|
2012-11-17 18:04:34 +00:00
|
|
|
|