[Releng] Replace old Orbit repository by direct from Maven artifacts
or get the javax.inject/annotation providing jakarta bundles from the
eclipse-sdk repository.
Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net>
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
Change-Id: I53826bf6810e05840832440876d1424e915ec9c3
diff --git a/plugins/org.eclipse.xwt.css/META-INF/MANIFEST.MF b/plugins/org.eclipse.xwt.css/META-INF/MANIFEST.MF
index c3a9d2f..52e6c6f 100644
--- a/plugins/org.eclipse.xwt.css/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xwt.css/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
Bundle-Version: 1.7.0.qualifier
Require-Bundle: org.eclipse.xwt;bundle-version="[1.4.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.115.100,4.0.0)",
- org.eclipse.e4.ui.css.core;bundle-version="[0.12.1400,1.0.0)",
- org.w3c.css.sac;bundle-version="[1.3.1,2.0.0)"
+ org.eclipse.e4.ui.css.core;bundle-version="[0.12.1400,1.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.xwt.css
+Import-Package: org.w3c.css.sac;version="[1.3.0,2.0.0)"
Bundle-Vendor: Eclipse XWT
diff --git a/plugins/org.eclipse.xwt.e4/META-INF/MANIFEST.MF b/plugins/org.eclipse.xwt.e4/META-INF/MANIFEST.MF
index b1becd4..e4450bf 100644
--- a/plugins/org.eclipse.xwt.e4/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xwt.e4/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .
Require-Bundle: org.eclipse.xwt,
- javax.inject;bundle-version="[1.0.0,2.0.0)",
- javax.annotation;bundle-version="1.1.0",
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.e4.core.di;bundle-version="1.7.100",
org.eclipse.swt;bundle-version="3.110.100",
@@ -18,4 +16,6 @@
Export-Package: org.eclipse.xwt.e4,
org.eclipse.xwt.e4.internal.converters,
org.eclipse.xwt.e4.internal.widgets
+Import-Package: javax.annotation;version="[1.3.5,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
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 0dd8854..f2e29f5 100644
--- a/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xwt.ui.workbench/META-INF/MANIFEST.MF
@@ -22,9 +22,7 @@
org.eclipse.xwt.emf;bundle-version="[1.4.0,2.0.0)",
org.eclipse.e4.ui.services;bundle-version="[1.3.700,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[1.11.600,2.0.0)",
- org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.900,3.0.0)",
- javax.inject;bundle-version="[1.0.0,2.0.0)",
- javax.annotation;bundle-version="[1.3.5,2.0.0)"
+ org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.900,3.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xwt.ui.workbench,
@@ -48,3 +46,5 @@
org.eclipse.jface.resource,
org.eclipse.xwt.databinding,
org.eclipse.swt.widgets"
+Import-Package: javax.annotation;version="[1.3.5,1.4.0)",
+ javax.inject;version="[1.0.0,2.0.0)"
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 b8b8b7f..472dab3 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,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="XWT Main" sequenceNumber="1702893203">
+<target name="XWT Main" sequenceNumber="1703172091">
<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"/>
- <unit id="javax.inject" version="1.0.0.v20091030"/>
- <unit id="javax.annotation" version="1.3.5.v20200909-1856"/>
- <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+ <unit id="org.pushingpixels.trident" version="1.3.0.v20231219-1530"/>
+ <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swt" version="0.0.0"/>
+ <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+ <unit id="jakarta.annotation-api" version="1.3.5"/>
<repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -31,7 +30,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/release/3.18.0"/>
</location>
</locations>
</target>
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 937c632..962c7cd 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
@@ -1,25 +1,24 @@
target "XWT Main" with requirements source
-// I-build should be referenced lazily due to their volatility, unless a specific version is needed
+// I-build should be referenced lazily due to their volatility, unless a specific version is needed
/*** Manual referencing ***/
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" {
- org.pushingpixels.trident lazy
- org.pushingpixels.trident.source lazy
- javax.inject 1.0.0
- javax.annotation [1.3.5,1.4.0)
- org.w3c.css.sac [1.3.1,2.0.0)
+// manualUpdate
+location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest" {
+ org.pushingpixels.trident [1.3.0,2.0.0)
+ org.eclipse.orbit.xml-apis-ext [1.0.0,2.0.0] // for org.w3c.css.sac package
}
/*** Update from simrel ***/
-
-//updateFrom("Eclipse",0)
+// updateFrom("Eclipse",0)
location platform "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110" {
org.eclipse.sdk.feature.group lazy
org.eclipse.swt lazy
+ jakarta.inject.jakarta.inject-api [1.0.0,1.1.0)
+ jakarta.annotation-api [1.3.5,1.4.0)
}
-//updateFrom("EMF (Core)",0)
+// updateFrom("EMF (Core)",0)
location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0" {
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.xsd.sdk.feature.group lazy
@@ -30,12 +29,14 @@
org.eclipse.swtbot.feature.group lazy
}
-//updateFrom("Web Tools Platform",0)
+// updateFrom("Web Tools Platform",0)
location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/" {
org.eclipse.wst.xml_ui.feature.feature.group lazy
}
-//updateFrom("GEF",0)
-location gef "https://download.eclipse.org/tools/gef/classic/releases/3.18.0" {
+// updateFrom("GEF",0)
+location gef "https://download.eclipse.org/tools/gef/classic/release/3.18.0" {
org.eclipse.gef.sdk.feature.group lazy
}
+
+
diff --git a/tests/org.eclipse.xwt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xwt.tests/META-INF/MANIFEST.MF
index 9266b18..06ce600 100644
--- a/tests/org.eclipse.xwt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xwt.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@
org.eclipse.xwt.css;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
org.eclipse.e4.ui.css.swt;bundle-version="[0.13.1200,1.0.0)";resolution:=optional,
org.eclipse.e4.ui.css.core;bundle-version="[0.12.1400,1.0.0)";resolution:=optional,
- org.w3c.css.sac;bundle-version="[1.3.1,2.0.0)";resolution:=optional,
org.eclipse.xwt.xml;bundle-version="[1.4.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.8.100,2.0.0)",
org.eclipse.xwt.forms;bundle-version="[1.4.0,2.0.0)",
@@ -133,4 +132,5 @@
org.eclipse.xwt.tests.view,
org.eclipse.xwt.tests.wizard,
org.eclipse.xwt.tests.xaml
+Import-Package: org.w3c.css.sac;version="[1.3.0,2.0.0)"
Bundle-Vendor: Eclipse XWT
