Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2018-01-22 14:40:11 +0000
committerMickael Istria2018-01-22 15:44:09 +0000
commit8c7a5fc64e7e39119999bc76f8391054260f3f31 (patch)
tree05ea455bc8ae90a5f9c4d1c4175e6166de114883
parentf9aa08342ebb15ff096cbf663fbede6d34de39a5 (diff)
downloadeclipse.platform.releng.aggregator-8c7a5fc64e7e39119999bc76f8391054260f3f31.tar.gz
eclipse.platform.releng.aggregator-8c7a5fc64e7e39119999bc76f8391054260f3f31.tar.xz
eclipse.platform.releng.aggregator-8c7a5fc64e7e39119999bc76f8391054260f3f31.zip
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>
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product.p2inf7
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf8
10 files changed, 65 insertions, 0 deletions
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 00000000..3eb8d6d4
--- /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 eab7fd5d..45ea4592 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 689bcbbf..a110388c 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 @@ instructions.configure=org.eclipse.equinox.p2.touchpoint.natives.remove(path:${i
#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 8f479814..ff480f7d 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 67c2a7cd..838d8899 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.filter=(!(osgi.os=macosx))
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 32febd29..54f181fd 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 25e58b8b..e4b9b20b 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.filter=(!(osgi.os=macosx))
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 d26a2d6c..9a6c8dfc 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 c4397d8a..806de938 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 497257cf..88a11186 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.filter=(!(osgi.os=macosx))
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

Back to the top