[Releng] Update references and dependencies to the latest 2019-12
- Change the feature license reference to point on the 2.0.2 version
- Update target platforms to the 2019-12 simrel
Change-Id: I4ea03b1fd45b1af3e88b17aea4131c2312a3e443
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/org.eclipse.xwt.feature/feature.xml b/org.eclipse.xwt.feature/feature.xml
index 2cb1129..a8301e7 100644
--- a/org.eclipse.xwt.feature/feature.xml
+++ b/org.eclipse.xwt.feature/feature.xml
@@ -5,7 +5,7 @@
version="1.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
+ license-feature-version="2.0.2">
<description>
%description
diff --git a/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target b/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
index 9e53c81..63a1b79 100755
--- a/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
+++ b/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="XWT Main" sequenceNumber="1563179285">
+<target name="XWT Main" sequenceNumber="1578652968">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.pushingpixels.trident" version="1.2.0.v201305152020"/>
- <unit id="org.pushingpixels.trident.source" version="1.2.0.v201305152020"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
+ <unit id="org.pushingpixels.trident" version="0.0.0"/>
+ <unit id="org.pushingpixels.trident.source" version="0.0.0"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.18.0.v20190528-0845"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.18.0.v20190323-1100"/>
- <repository id="emf_core" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+ <repository id="emf_core" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S202001070458"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.junit4_x" version="2.8.0.201906121535"/>
- <repository id="swtbot" location="http://download.eclipse.org/technology/swtbot/releases/2.8.0"/>
+ <unit id="org.eclipse.swtbot.junit4_x" version="0.0.0"/>
+ <repository id="swtbot" location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.14.0.v201905291408"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.14.0/R-3.14.0-20190612230649//repository"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.16.0/S-3.16.0.RC2-20191210070716/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
</locations>
</target>
diff --git a/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd b/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
index ed98c58..b8f6c81 100755
--- a/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
+++ b/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
@@ -3,35 +3,35 @@
/*** Manual referencing ***/
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/" {
- org.pushingpixels.trident
- org.pushingpixels.trident.source
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" {
+ org.pushingpixels.trident lazy
+ org.pushingpixels.trident.source lazy
}
/*** Update from simrel ***/
//updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800/" {
- org.eclipse.sdk.feature.group
+location platform "https://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610/" {
+ org.eclipse.sdk.feature.group lazy
}
//updateFrom("EMF (Core)",0)
-location emf_core "http://download.eclipse.org/modeling/emf/emf/builds/release/2.18" {
- org.eclipse.emf.sdk.feature.group
- org.eclipse.xsd.sdk.feature.group
+location emf_core "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S202001070458" {
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.xsd.sdk.feature.group lazy
}
// updateFrom("SWTBot",0)
-location swtbot "http://download.eclipse.org/technology/swtbot/releases/2.8.0" {
- org.eclipse.swtbot.junit4_x
+location swtbot "https://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
+ org.eclipse.swtbot.junit4_x lazy
}
-//updateFrom("Web Tools 3.14",0)
-location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.14.0/R-3.14.0-20190612230649//repository" {
- org.eclipse.wst.xml_ui.feature.feature.group
+//updateFrom("Web Tools Platform 3.16 for Simrel 2019-12",0)
+location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.16.0/S-3.16.0.RC2-20191210070716/repository/" {
+ org.eclipse.wst.xml_ui.feature.feature.group lazy
}
//updateFrom("GEF",0)
-location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
- org.eclipse.gef.sdk.feature.group
+location gef "https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
+ org.eclipse.gef.sdk.feature.group lazy
}
diff --git a/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF b/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
index a23b4de..5960292 100644
--- a/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
+++ b/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@
org.eclipse.xwt.emf;bundle-version="1.0.0",
org.eclipse.e4.ui.services;bundle-version="0.10.2",
org.eclipse.e4.ui.workbench;bundle-version="0.10.3",
- org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1"
+ org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
+ javax.inject;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xwt.ui.workbench,
diff --git a/org.eclipse.xwt.workbench.feature/feature.xml b/org.eclipse.xwt.workbench.feature/feature.xml
index 05639e5..6dae46c 100644
--- a/org.eclipse.xwt.workbench.feature/feature.xml
+++ b/org.eclipse.xwt.workbench.feature/feature.xml
@@ -15,7 +15,7 @@
version="1.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
+ license-feature-version="2.0.2">
<description>
%description
