Update flatpak products to Eclipse 4.12
Change-Id: I0646d4eb569917d7517410cf2f4bcc4540fec8dc
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Reviewed-on: https://git.eclipse.org/r/139215
diff --git a/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target b/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target
index 77c7f09..7c36f63 100644
--- a/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target
+++ b/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.8"?>
-
-<target name="eclipse-extra-prereqs">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="eclipse-extra-prereqs">
<locations>
<!-- Marketplace Client -->
- <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
- <unit id="org.eclipse.epp.mpc.dependencies.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/mpc/drops/1.7.3/v20181205-1546/" />
- </location>
<!-- Deps of Marketplace Client -->
- <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
- <unit id="org.eclipse.userstorage.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/usssdk/drops/release/1.1.0/" />
- </location>
+ <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
+ <unit id="org.eclipse.epp.mpc.feature.group" version="1.7.5.v20190313-2005"/>
+ <unit id="org.eclipse.epp.mpc.source.feature.group" version="1.7.5.v20190313-2005"/>
+ <repository location="https://download.eclipse.org/mpc/drops/1.7.5/v20190313-2005"/>
+ </location>
+ <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
+ <unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20190308-0433"/>
+ <unit id="org.eclipse.userstorage.sdk.feature.group" version="1.2.0.v20190308-0433"/>
+ <repository location="https://download.eclipse.org/usssdk/drops/milestone/S911-1.2-RC1"/>
+ </location>
</locations>
-</target>
+</target>
\ No newline at end of file
diff --git a/flatpak/eclipse-extra-prereqs/pom.xml b/flatpak/eclipse-extra-prereqs/pom.xml
index 1d190fd..ba68cc1 100644
--- a/flatpak/eclipse-extra-prereqs/pom.xml
+++ b/flatpak/eclipse-extra-prereqs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-flatpak-parent</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>eclipse-extra-prereqs</artifactId>
diff --git a/flatpak/platform/platform.p2.inf b/flatpak/platform/platform.p2.inf
index ea0afe9..68353a6 100644
--- a/flatpak/platform/platform.p2.inf
+++ b/flatpak/platform/platform.p2.inf
@@ -1,10 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.platform.configuration.macosx
@@ -53,7 +51,7 @@
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial 4.11 Release of the Eclipse Platform.
+properties.1.value = 4.12 Release of the Eclipse Platform.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/flatpak/platform/platform.product b/flatpak/platform/platform.product
index ab04697..7d7cd48 100644
--- a/flatpak/platform/platform.product
+++ b/flatpak/platform/platform.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.11.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.12.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -185,9 +185,9 @@
</features>
<configurations>
- <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
diff --git a/flatpak/platform/pom.xml b/flatpak/platform/pom.xml
index bf8f3aa..edc3158 100644
--- a/flatpak/platform/pom.xml
+++ b/flatpak/platform/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-flatpak-parent</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.platform.ide</artifactId>
diff --git a/flatpak/pom-aggregator.xml b/flatpak/pom-aggregator.xml
index 5d72291..a8994a8 100644
--- a/flatpak/pom-aggregator.xml
+++ b/flatpak/pom-aggregator.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse</groupId>
<artifactId>platform-flatpak-aggregator</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/flatpak/pom.xml b/flatpak/pom.xml
index 971d81d..bdfe2da 100644
--- a/flatpak/pom.xml
+++ b/flatpak/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse</groupId>
@@ -45,12 +45,12 @@
<artifact>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-sdk-prereqs</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</artifact>
<artifact>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-extra-prereqs</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</artifact>
</target>
<environments>
diff --git a/flatpak/sdk/pom.xml b/flatpak/sdk/pom.xml
index 396ea0c..63f0f5c 100644
--- a/flatpak/sdk/pom.xml
+++ b/flatpak/sdk/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-flatpak-parent</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.sdk.ide</artifactId>
diff --git a/flatpak/sdk/sdk.p2.inf b/flatpak/sdk/sdk.p2.inf
index 5c2c325..e0b1f6d 100644
--- a/flatpak/sdk/sdk.p2.inf
+++ b/flatpak/sdk/sdk.p2.inf
@@ -1,10 +1,8 @@
instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.11,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-03,name:2019-03);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-12,name:2018-12);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.12,name:The Eclipse Project Updates);\
+addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
+addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2019-06,name:2019-06);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
@@ -51,7 +49,7 @@
properties.0.value = true
properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = Initial 4.11 Release of the Eclipse SDK.
+properties.1.value = 4.12 Release of the Eclipse SDK.
properties.2.name = org.eclipse.equinox.p2.provider
properties.2.value = Eclipse.org
diff --git a/flatpak/sdk/sdk.product b/flatpak/sdk/sdk.product
index bc61705..62771e8 100644
--- a/flatpak/sdk/sdk.product
+++ b/flatpak/sdk/sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.11.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.12.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -181,16 +181,18 @@
<features>
<feature id="org.eclipse.sdk"/>
<feature id="org.eclipse.epp.mpc"/>
+ <feature id="org.eclipse.epp.mpc.source"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.equinox.p2.user.ui.source"/>
<feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
<feature id="org.eclipse.tips.feature" installMode="root"/>
+ <feature id="org.eclipse.tips.feature.source" installMode="root"/>
</features>
<configurations>
- <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
