TCI - Update target to 2021-03 release
Update target files to use:
- 2021-03
- 4.19
- emfforms 1.26
All dependencies to equinox.ds and felix.scr needed to be removed,
as they are not exported anymore.
Change-Id: I351ed34c095859059a190f49d1a09f44afc5b8bc
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
index d8a6855..64a2ef1 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
@@ -5,7 +5,7 @@
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_125"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_126"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
@@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2020-12"/>
+<repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
</locations>
</target>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
index d8a6855..0e2a6e8 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
@@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2020-12"/>
+<repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
</locations>
</target>
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
index 2e926e5..06d1f90 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
@@ -47,7 +47,6 @@
<requires>
<import plugin="org.eclipse.equinox.event"/>
- <import plugin="org.eclipse.equinox.ds"/>
</requires>
<plugin
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
index d1a2026..ca691e6 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
@@ -30,7 +30,6 @@
version="0.0.0"/>
<requires>
- <import plugin="org.eclipse.equinox.ds"/>
<import plugin="org.eclipse.equinox.event"/>
</requires>
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index d8cf0bc..a331c59 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -76,13 +76,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.ds"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.registry"
download-size="0"
install-size="0"
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
index 1cf55b8..aa56202 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
@@ -141,7 +141,6 @@
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.concurrent"/>
- <plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
index 32b415f..1473bb8 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
+++ b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
@@ -151,7 +151,6 @@
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.console"/>
- <plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.http.registry"/>
<plugin id="org.eclipse.equinox.http.servlet"/>
<plugin id="org.eclipse.equinox.http.servletbridge"/>
@@ -186,7 +185,6 @@
<configurations>
<plugin id="org.eclipse.emf.ecp.rap" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="1" />
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index 7ab9d11..fb0bcd0 100644
--- a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
@@ -308,12 +308,6 @@
</includes>
<testFailureIgnore>true</testFailureIgnore>
<failIfNoTests>false</failIfNoTests>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.equinox.ds</artifactId>
- </dependency>
- </dependencies>
</configuration>
</plugin>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index 5c524d0..0294424 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP" sequenceNumber="1612366034">
+<target name="ECP RAP" sequenceNumber="1616590745">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
@@ -64,8 +64,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
- <repository location="http://download.eclipse.org/releases/2020-12"/>
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
index 3f591e1..93a5874 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
@@ -4,7 +4,7 @@
include "../org.eclipse.emf.ecp.target.rcp/ecp.tpd"
-location "http://download.eclipse.org/releases/2020-12" {
+location "http://download.eclipse.org/releases/2021-03" {
org.eclipse.rap.equinox.target.feature.feature.group lazy
org.eclipse.rap.feature.feature.group lazy
org.eclipse.rap.sdk.feature.feature.group lazy
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index 176635e..e4900a0 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP with ECP" sequenceNumber="1612366061">
+<target name="ECP RAP with ECP" sequenceNumber="1616590749">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
@@ -64,8 +64,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
- <repository location="http://download.eclipse.org/releases/2020-12"/>
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
@@ -81,7 +81,7 @@
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/ecp/releases/releases_target_125"/>
+ <repository location="http://download.eclipse.org/ecp/releases/releases_target_126"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
index 6699970..330587f 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
@@ -4,7 +4,7 @@
include "ecpRAP.tpd"
-location "http://download.eclipse.org/ecp/releases/releases_target_125"{
+location "http://download.eclipse.org/ecp/releases/releases_target_126"{
org.eclipse.emf.ecp.rap.sdk.feature.feature.group lazy
org.eclipse.emf.ecp.rap.util.feature.feature.group lazy
org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group lazy
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
index 06fc1aa..e543599 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RCP" sequenceNumber="1612361697">
+<target name="ECP RCP" sequenceNumber="1616590745">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -69,8 +69,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
- <repository location="http://download.eclipse.org/releases/2020-12"/>
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
index 386d3d4..363b0da 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
@@ -10,7 +10,7 @@
org.eclipse.swtbot.feature.group lazy
}
-location "http://download.eclipse.org/eclipse/updates/4.18" {
+location "http://download.eclipse.org/eclipse/updates/4.19" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.ide lazy
}
@@ -53,7 +53,7 @@
org.eclipse.nebula.widgets.grid.feature.feature.group lazy
}
-location "http://download.eclipse.org/releases/2020-12" {
+location "http://download.eclipse.org/releases/2021-03" {
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
@@ -68,7 +68,7 @@
org.eclipse.xpand.sdk.feature.group lazy
org.eclipse.xtend.sdk.feature.group lazy
org.eclipse.xtext.sdk.feature.group lazy
- com.google.guava [27.1.0,28.0.0)
+ com.google.guava [30.1.0,31.0.0)
}
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
index 18be171..0e6b994 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="emfforms_spreadsheet" sequenceNumber="1612366488">
+<target name="emfforms_spreadsheet" sequenceNumber="1616590747">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.19"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -53,8 +53,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
- <repository location="http://download.eclipse.org/releases/2020-12"/>
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <repository location="http://download.eclipse.org/releases/2021-03"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.commons.codec" version="0.0.0"/>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
index 6d632af..98f4f70 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
@@ -38,11 +38,6 @@
<id>org.eclipse.emf.ecp.target.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
index e18806a..da51d40 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
@@ -37,11 +37,6 @@
<id>org.eclipse.emf.ecp.target.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
index 9ad5b9b..9ccf53d 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
@@ -11,8 +11,7 @@
org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,1.10.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.equinox.ds
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.concurrent.test
Import-Package: org.eclipse.core.runtime;version="0.0.0",
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
index 03abe33..5c150e6 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
@@ -27,21 +27,6 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
index ec97f7a..500b888 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
@@ -42,11 +42,6 @@
<id>org.eclipse.emf.ecp.emfforms.runtime.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
index 75d826a..f0ede54 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@
org.eclipse.emf.ecp.view.internal.context;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.27.0,1.28.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
index a536fc6..e773fde 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
@@ -55,11 +55,6 @@
<id>org.eclipse.emf.ecp.emfforms.runtime.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
index 4265a95..fa7e074 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
@@ -39,11 +39,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.databinding.featurepath</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
index 7c7395b..73f3c8b 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
@@ -39,11 +39,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.databinding.featurepath</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
index 32cfae9..7a79d2b 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
@@ -33,21 +33,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${mav-surefire-version}</version>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
index 7ea00b8..4922c88 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
@@ -39,11 +39,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.databinding.featurepath</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
index bca0307..18145c1 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emf.ecp.view.model.edit</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
index b516bbb..aefbc7e 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
@@ -39,11 +39,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.databinding.featurepath</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
index 9fca9e6..1a3f4ab 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
org.eclipse.emf.ecp.core;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.core.rap;bundle-version="[1.27.0,1.28.0)",
org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
org.eclipse.emf.ecp.workspace.core;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.workspace.ui.rap.test
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
index e2e7bde..52a9991 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
@@ -24,21 +24,6 @@
<useUIThread>true</useUIThread>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
index 30aa4e2..b0a24da 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
@@ -32,11 +32,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.emf</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
index a75ad0d..3ef4a1a 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
index dbc9cc0..1c7ca24 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
@@ -25,21 +25,6 @@
<useUIThread>true</useUIThread>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
index 29b9838..3202c9b 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
@@ -30,11 +30,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.localization</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
index 7ffe205..195f48b 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.domainexpander.default</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
index aa7f2d1..d0f8162 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.emf</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
index 750d7c1..4ab9df3 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.domainexpander.default</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
index 92bbf05..b36d999 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
@@ -30,11 +30,6 @@
</requirement>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.localization</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
index 63e90b8..2164a56 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
index 66f052d..fdfcb5b 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
index bd51e35..a75a4381 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
index 42c5e2a..ca267a1 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
index ae12198..d6f6c3b 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.emf</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index e563f70..3dbd7a1 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.emf</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
index 83eea64..6ae0390 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
@@ -16,22 +16,5 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index 633a2b5..adc0b8e 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
org.eclipse.emfforms.internal.core.services.tests;version="1.27.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.tests
diff --git a/tests/org.eclipse.emfforms.core.services.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
index ae43548..b03d172 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
@@ -38,11 +38,6 @@
<id>org.eclipse.emf.ecp.viewmodel.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
index 43ea363..be5b700 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
@@ -34,11 +34,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emf.ecp.view.model.edit</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
index 289a36d..9bde74a 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
@@ -34,11 +34,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emf.ecp.view.model.edit</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
index 2f4005a..5482128 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
@@ -26,21 +26,6 @@
<useUIThread>false</useUIThread>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
index 2f29b22..039284e 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
@@ -25,11 +25,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.segments.featurepath</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
index b1303fd..b86d514 100644
--- a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.27.0";x-internal:=true,
org.eclipse.emfforms.spi.localization;version="1.27.0"
Require-Bundle: org.junit;bundle-version="4.11.0",
- org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
+ org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.localization.tests
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
index 80ab819..222c078 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
@@ -35,21 +35,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${mav-surefire-version}</version>
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
index 164f548..61427d8 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
@@ -8,6 +8,8 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.felix.scr;version="[1.3.0,2.0.0)",
- org.osgi.framework;version="[1.5.0,2.0.0)"
+Import-Package: org.apache.felix.scr.component;version="1.1.0",
+ org.osgi.framework;version="[1.5.0,2.0.0)",
+ org.osgi.service.component.runtime;version="1.4.0",
+ org.osgi.service.component.runtime.dto;version="1.4.0"
Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.27.0";x-internal:=true
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
index 936583b..c8bbb80 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
@@ -25,11 +25,6 @@
<dependency-resolution>
<extraRequirements>
<requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
<type>eclipse-feature</type>
<id>org.eclipse.emf.ecp.emfforms.sdk.feature</id>
<versionRange>0.0.0</versionRange>
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/src/org/eclipse/emfforms/internal/sdk/integration/test/NoImmediateServices_PTest.java b/tests/org.eclipse.emfforms.sdk.integration.test/src/org/eclipse/emfforms/internal/sdk/integration/test/NoImmediateServices_PTest.java
index 2767bdf..d646df2 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/src/org/eclipse/emfforms/internal/sdk/integration/test/NoImmediateServices_PTest.java
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/src/org/eclipse/emfforms/internal/sdk/integration/test/NoImmediateServices_PTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2021 EclipseSource Muenchen GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -16,29 +16,30 @@
import static org.junit.Assert.fail;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.felix.scr.Component;
-import org.apache.felix.scr.ScrService;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.runtime.ServiceComponentRuntime;
+import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-@SuppressWarnings("deprecation")
public class NoImmediateServices_PTest {
@Test
public void test() {
- final BundleContext bundleContext = FrameworkUtil.getBundle(ScrService.class).getBundleContext();
- final ServiceReference<ScrService> serviceReference = bundleContext.getServiceReference(ScrService.class);
- final ScrService service = bundleContext.getService(serviceReference);
- final Component[] components = service.getComponents();
+ final BundleContext bundleContext = FrameworkUtil.getBundle(NoImmediateServices_PTest.class).getBundleContext();
+ final ServiceReference<ServiceComponentRuntime> serviceReference = bundleContext
+ .getServiceReference(ServiceComponentRuntime.class);
+ final ServiceComponentRuntime service = bundleContext.getService(serviceReference);
+ final Collection<ComponentDescriptionDTO> components = service.getComponentDescriptionDTOs();
final List<String> immediateComponents = new ArrayList<String>();
- for (final Component component : components) {
- if (component.isImmediate() && component.getClassName().contains("emf")) { //$NON-NLS-1$
- immediateComponents.add(component.getClassName());
+ for (final ComponentDescriptionDTO component : components) {
+ if (component.immediate && component.implementationClass.contains("emf")) { //$NON-NLS-1$
+ immediateComponents.add(component.implementationClass);
}
}
bundleContext.ungetService(serviceReference);
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
index a0a15fa..7b0d281 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
@@ -42,11 +42,6 @@
<id>org.eclipse.emf.ecp.emfforms.runtime.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
index b43dc02..14a9e12 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
@@ -35,21 +35,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${mav-surefire-version}</version>
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index 987eae7..fe2427c 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
@@ -42,11 +42,6 @@
<id>org.eclipse.emf.ecp.emfforms.runtime.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
index 285e224..f6cd85e 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
@@ -26,21 +26,6 @@
<useUIThread>false</useUIThread>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
index e45671b..6b632a3 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
@@ -34,11 +34,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emfforms.core.services.legacy</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index 82b1676..f56a1a6 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
@@ -61,11 +61,6 @@
<extraRequirements>
<requirement>
<type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>p2-installable-unit</type>
<id>org.eclipse.emf.ecp.view.label.ui.swt</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
index 47d4fb5..80218e6 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@
org.eclipse.emfforms.view.model.localization.tests;version="1.27.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.27.0,1.28.0)",
- org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.27.0,1.28.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.view.model.localization.tests
Import-Package: org.eclipse.emfforms.spi.localization;version="[1.27.0,1.28.0)"
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/pom.xml b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/pom.xml
index e319f3e..4ce55d4 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/pom.xml
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/pom.xml
@@ -27,21 +27,6 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/pom.xml b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/pom.xml
index ddeccef..bf2d3cd 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/pom.xml
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/pom.xml
@@ -27,21 +27,6 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/pom.xml b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/pom.xml
index a3c34a1..223afe5 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/pom.xml
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/pom.xml
@@ -34,11 +34,6 @@
<dependency-resolution>
<extraRequirements>
<requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
<type>eclipse-feature</type>
<id>org.eclipse.emfforms.spreadsheet.feature</id>
<versionRange>0.0.0</versionRange>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/pom.xml b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/pom.xml
index 5b826ea..4044a4e 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/pom.xml
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/pom.xml
@@ -34,11 +34,6 @@
<dependency-resolution>
<extraRequirements>
<requirement>
- <type>p2-installable-unit</type>
- <id>org.eclipse.equinox.ds</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
<type>eclipse-feature</type>
<id>org.eclipse.emfforms.spreadsheet.feature</id>
<versionRange>0.0.0</versionRange>
