[Releng] Update 2020-09 compatibility
Change-Id: I4c28a00140716e9ab282cc996317266b2aa2c9f7
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
index 1c249c7..4aaac1f 100644
--- a/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@
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",
- javax.inject;bundle-version="[1.0.0,2.0.0)"
+ javax.inject;bundle-version="[1.0.0,2.0.0)",
+ javax.annotation;bundle-version="[1.3.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xwt.ui.workbench,
diff --git a/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target b/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
index 34c0978..196cf83 100755
--- a/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
+++ b/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.target
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="XWT Main" sequenceNumber="1597923077">
+<target name="XWT Main" sequenceNumber="1600676560">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<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/S20200817205214/repository"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.17-I-builds/I20200729-1800/"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<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="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202007281438"/>
+ <repository id="emf_core" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.swtbot.junit4_x" version="0.0.0"/>
@@ -23,7 +23,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<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.19.0/S-3.19.0.M2-20200801030538/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.19.0/R-3.19.0-20200828030223/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd b/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
index dced5d0..ca2bd25 100755
--- a/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
+++ b/releng/org.eclipse.xwt.releng/targetPlatform/org.eclipse.xwt.target.tpd
@@ -3,7 +3,7 @@
/*** Manual referencing ***/
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/S20200817205214/repository" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository" {
org.pushingpixels.trident lazy
org.pushingpixels.trident.source lazy
}
@@ -11,12 +11,12 @@
/*** Update from simrel ***/
//updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.17-I-builds/I20200729-1800/" {
+location platform "https://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/" {
org.eclipse.sdk.feature.group lazy
}
//updateFrom("EMF (Core)",0)
-location emf_core "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202007281438" {
+location emf_core "https://download.eclipse.org/modeling/emf/emf/builds/release/2.23" {
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.xsd.sdk.feature.group lazy
}
@@ -27,7 +27,7 @@
}
//updateFrom("Web Tools Platform 3.19 for Simrel 2020-09",0)
-location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.19.0/S-3.19.0.M2-20200801030538/repository/" {
+location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.19.0/R-3.19.0-20200828030223/repository/" {
org.eclipse.wst.xml_ui.feature.feature.group lazy
}
