Bug 512989 - [DSML Validation] The dsml validation extra should be moved
to incubation repository
- Really removing the dependency to DSML validation from rsa migration
- update target platforms to remove DSML validation, and also update
UML2 dependency to 5.3.0 (oxygen version)
- update the guava dependency (import-package rather than plugin
dependency)
- updating target platforms for tests also...
Change-Id: Ic52b6eda50e8c1bbcb57fac52e8d764582aeeb5b
Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
diff --git a/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
index d04060e..032477f 100644
--- a/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@
org.eclipse.gmf.runtime.notation;bundle-version="[1.7.0,2.0.0)",
org.eclipse.m2m.qvt.oml;bundle-version="[3.7.0,4.0.0)",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
- com.google.guava;bundle-version="21.0.0"
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.interoperability.common,
@@ -37,3 +36,5 @@
org.eclipse.papyrus.interoperability.common.utils,
org.eclipse.papyrus.interoperability.common.wizard,
org.eclipse.papyrus.interoperability.common.wizard.pages
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index e78c7eb..ba89e50 100644
--- a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317047">
+<?pde version="3.8"?><target name="TP for Interoperability - common" sequenceNumber="1465317047">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
@@ -23,8 +23,6 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.source.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -62,14 +60,14 @@
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<repository location="http://download.eclipse.org/tools/orbit/S-builds/S20170306214312/repository"/>
</location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
</location>
</locations>
</target>
diff --git a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index 8b430a4..80f2d35 100644
--- a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -9,10 +9,6 @@
<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
-<repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/>
@@ -23,8 +19,6 @@
<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.source.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -40,6 +34,7 @@
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -55,7 +50,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
-<repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+<repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
@@ -67,14 +62,14 @@
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<repository location="http://download.eclipse.org/tools/orbit/S-builds/S20170306214312/repository"/>
</location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
</location>
</locations>
</target>
diff --git a/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/META-INF/MANIFEST.MF b/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/META-INF/MANIFEST.MF
index c683cd4..fe84bc7 100644
--- a/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/META-INF/MANIFEST.MF
+++ b/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@
org.eclipse.papyrus.interoperability.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.interoperability.common.blackboxes;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.dsml.validation;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.documentation.profile;bundle-version="[1.2.0,2.0.0)",
org.eclipse.team.core,
org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
@@ -32,7 +31,6 @@
org.eclipse.swt,
org.eclipse.ui.workbench,
org.eclipse.ui.navigator;bundle-version="3.5.500",
- com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)"
@@ -68,3 +66,5 @@
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.interoperability.rsa;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/src/org/eclipse/papyrus/interoperability/rsa/transformation/ImportTransformation.java b/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/src/org/eclipse/papyrus/interoperability/rsa/transformation/ImportTransformation.java
index 32c578b..05d1371 100644
--- a/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/src/org/eclipse/papyrus/interoperability/rsa/transformation/ImportTransformation.java
+++ b/rsa/plugins/org.eclipse.papyrus.interoperability.rsa/src/org/eclipse/papyrus/interoperability/rsa/transformation/ImportTransformation.java
@@ -76,7 +76,6 @@
import org.eclipse.m2m.qvt.oml.util.ISessionData;
import org.eclipse.m2m.qvt.oml.util.Trace;
import org.eclipse.m2m.qvt.oml.util.WriterLog;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
@@ -904,7 +903,7 @@
protected ModelExtent getInProfileDefinitions() {
return new BasicModelExtent(Arrays.asList(new EPackage[] {
- PapyrusDSMLValidationRulePackage.eINSTANCE,
+ // PapyrusDSMLValidationRulePackage.eINSTANCE,
DocumentationPackage.eINSTANCE
}));
}
@@ -931,14 +930,14 @@
List<String> missingProfiles = new LinkedList<>();
List<EObject> allContents = new LinkedList<>();
- try {
- URI validationProfileURI = URI.createURI("pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml");
- Resource validationProfile = resourceSet.getResource(validationProfileURI, true);
- checkResource(validationProfile);
- allContents.addAll(validationProfile.getContents());
- } catch (WrappedException ex) {
- missingProfiles.add("Validation Rules Profile");
- }
+// try {
+// URI validationProfileURI = URI.createURI("pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml");
+// Resource validationProfile = resourceSet.getResource(validationProfileURI, true);
+// checkResource(validationProfile);
+// allContents.addAll(validationProfile.getContents());
+// } catch (WrappedException ex) {
+// missingProfiles.add("Validation Rules Profile");
+// }
try {
URI documentationProfileURI = URI.createURI("pathmap://PAPYRUS_DOCUMENTATION/Papyrus.profile.uml");
diff --git a/rsa/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target b/rsa/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
index 6f0550b..ef0b8e6 100644
--- a/rsa/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
+++ b/rsa/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
@@ -1,47 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317054">
+<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317055">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
<repository location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20161102-0315"/>
-<unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/>
-<repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
-<repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/oxygen"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
-<repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
@@ -51,14 +15,42 @@
<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
-<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20161102-0315"/>
+<unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/>
+<repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<repository location="http://download.eclipse.org/tools/orbit/S-builds/S20170306214312/repository"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
+<repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
+</location>
</locations>
</target>
diff --git a/rsa/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target b/rsa/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
index ac8a91e..f87953c 100644
--- a/rsa/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
+++ b/rsa/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317046">
+<?pde version="3.8"?><target name="TP for Interoperability - RSA Tests" sequenceNumber="1465317046">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
@@ -9,15 +9,6 @@
<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
-<repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.extra.dsml.validation.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
<repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
</location>
@@ -45,16 +36,17 @@
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
