Bug 577086 - [EASE][Modules] Support latest Papyrus version in Modeling
Module

Signed-off-by: Sebastien Revol <sebastien.revol@cea.fr>
Change-Id: Ibe6ce0ad907adc57fdb84be3d3fa396d5fd1fc16
diff --git a/plugins/org.eclipse.ease.modules.modeling/META-INF/MANIFEST.MF b/plugins/org.eclipse.ease.modules.modeling/META-INF/MANIFEST.MF
index e960499..27d56c3 100644
--- a/plugins/org.eclipse.ease.modules.modeling/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ease.modules.modeling/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
  org.eclipse.papyrus.infra.core;bundle-version="[1.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.0.0,6.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.0.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
diff --git a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target
index 0bbc81a..70fb11d 100644
--- a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target
+++ b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.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="2021-06" sequenceNumber="1634797185">
+<target name="2021-06" sequenceNumber="1637707059">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.21.0.v20210906-0842"/>
@@ -24,13 +24,16 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <repository id="eclipse-orbit-2021-09" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.infra.feature.feature.group" version="3.0.0.202012091059"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202012091059"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.feature.feature.group" version="3.0.0.202012091059"/>
-      <repository id="eclipse-2020-12" location="https://download.eclipse.org/releases/2020-12/"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus-2021-09" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+      <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.team.svn.feature.group" version="4.0.5.I20170425-1700"/>
diff --git a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
index 8fc6d42..e72167d 100644
--- a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
+++ b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
@@ -34,14 +34,17 @@
 location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" eclipse-orbit-2021-09 {
 // for java unit test of modules
 	org.mockito [2.13.0,3.0.0)
+	com.google.guava [27.1.0,28.0.0)
 }
 
-location "https://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
-	org.eclipse.papyrus.infra.feature.feature.group
-	org.eclipse.papyrus.infra.gmfdiag.feature.feature.group
-	org.eclipse.papyrus.uml.diagram.feature.feature.group
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09" papyrus-2021-09 {
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
 }
 
+location "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" xwt {
+	//xwt is needed by Papyrus
+	org.eclipse.xwt.feature.feature.group lazy
+}
 location "http://download.eclipse.org/technology/subversive/4.0/update-site/" {
 // svn module
 	org.eclipse.team.svn.feature.group