Bug 530093 - Product to include more recent JRE installable unit
a.jre.javase 1.6.0 was used as default. Since p2 now understands BREE
and osgi.ee requirements, it has highlighted that this version of the
JRE iu isn't sufficient to resolve more recent bundles.
Moved to the maximum known compatible version: JavaSE-9.
Change-Id: I925b3b69163029c5e4534e1ed4290b8450f3af49
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product.p2inf b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product.p2inf
new file mode 100644
index 0000000..3eb8d6d
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product.p2inf
@@ -0,0 +1,7 @@
+# Bug 530093: make sure we have latest version of a.jre.javase included with product
+requires.0.namespace=org.eclipse.equinox.p2.iu
+requires.0.name=a.jre.javase
+requires.0.range=[9.0.0,9.0.0]
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=config.a.jre.javase
+requires.1.range=[9.0.0,9.0.0]
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
index eab7fd5..45ea459 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
@@ -62,6 +62,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
+ <executionEnvironment>JavaSE-9</executionEnvironment>
<strictBinIncludes>true</strictBinIncludes>
<includePackedArtifacts>false</includePackedArtifacts>
<sourceReferences>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
index 689bcbb..a110388 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
@@ -25,3 +25,11 @@
#units.1.instructions.configure=ln(linkTarget:rt.app/Contents/MacOS/rt,targetDir:${installFolder},linkName:rt);
# remove link, from bug 407775
#units.1.instructions.unconfigure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/rt);
+
+# Bug 530093: make sure we have latest version of a.jre.javase included with product
+requires.0.namespace=org.eclipse.equinox.p2.iu
+requires.0.name=a.jre.javase
+requires.0.range=[9.0.0,9.0.0]
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=config.a.jre.javase
+requires.1.range=[9.0.0,9.0.0]
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 8f47981..ff480f7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -42,6 +42,7 @@
<artifactId>target-platform-configuration</artifactId>
<configuration>
<resolver>p2</resolver>
+ <executionEnvironment>JavaSE-9</executionEnvironment>
<environments>
<environment>
<os>linux</os>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 67c2a7c..838d889 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -16,6 +16,14 @@
requires.2.range=[1.0.0,1.0.0]
requires.2.greedy=true
+# Bug 530093: make sure we have latest version of a.jre.javase included with product
+requires.3.namespace=org.eclipse.equinox.p2.iu
+requires.3.name=a.jre.javase
+requires.3.range=[9.0.0,9.0.0]
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=config.a.jre.javase
+requires.4.range=[9.0.0,9.0.0]
+
units.1.id=toolingorg.eclipse.configuration.macosx
units.1.version=1.0.0
units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index 32febd2..54f181f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -33,6 +33,14 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <executionEnvironment>JavaSE-9</executionEnvironment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index 25e58b8..e4b9b20 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -16,6 +16,14 @@
requires.2.range=[1.0.0,1.0.0]
requires.2.greedy=true
+# Bug 530093: make sure we have latest version of a.jre.javase included with product
+requires.3.namespace=org.eclipse.equinox.p2.iu
+requires.3.name=a.jre.javase
+requires.3.range=[9.0.0,9.0.0]
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=config.a.jre.javase
+requires.4.range=[9.0.0,9.0.0]
+
units.1.id=toolingorg.eclipse.platform.configuration.macosx
units.1.version=1.0.0
units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index d26a2d6..9a6c8df 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -41,6 +41,14 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <executionEnvironment>JavaSE-9</executionEnvironment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index c4397d8..806de93 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -40,6 +40,14 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <executionEnvironment>JavaSE-9</executionEnvironment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 497257c..88a1118 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -16,6 +16,14 @@
requires.2.range=[1.0.0,1.0.0]
requires.2.greedy=true
+# Bug 530093: make sure we have latest version of a.jre.javase included with product
+requires.3.namespace=org.eclipse.equinox.p2.iu
+requires.3.name=a.jre.javase
+requires.3.range=[9.0.0,9.0.0]
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=config.a.jre.javase
+requires.4.range=[9.0.0,9.0.0]
+
units.1.id=toolingorg.eclipse.sdk.configuration.macosx
units.1.version=1.0.0
units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
