[releng] Maintenance Update

- Update targets and target definition
- Update cdo.search.ui MANIFEST (guava version must be between 14 and 19 excluded because of xtext)
- Reintegrated header check (tests) but can be deactivated by changing the profile IP activeByDefault to false

- self contained targetplatform

Change-Id: I7857d01426c127443d613f3d475be1a66fbc68a5
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

7 files changed, 262 insertions, 208 deletions

diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
index 10db54da..0386bbfb 100755
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
  org.eclipse.papyrus.cdo.ui;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
+ com.google.guava,
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/pom.xml b/pom.xml
index 9e089c0e..303e5710 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 	<modules>
 		<module>plugins</module>
 		<module>releng</module>
-		<!-- <module>tests</module> -->
+		<module>tests</module>
 	</modules>
 	
 </project>	
diff --git a/releng/.project b/releng/.project
new file mode 100755
index 00000000..9a0ee5bb
--- /dev/null
+++ b/releng/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Papyrus-CollaborativeModeling_releng</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index 3f4489a5..f2bc9e80 100755
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,112 +1,128 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1488905956">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1497549504">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.db.h2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <unit id="org.apache.commons.lang" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.ui" version="0.0.0"/>
-      <unit id="org.apache.log4j" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.draw2d" version="0.0.0"/>
+      <unit id="org.eclipse.gef" version="0.0.0"/>
+      <unit id="org.eclipse.xwt" version="0.0.0"/>
       <repository id="eclipse-oxygen" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
-      <repository id="papyrus-master-extra" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
-      <repository id="papyrus-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
+      <repository id="papyrus" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/RC4/main"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
-      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20170131-0606"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+      <repository id="ecf" location="file:/home/data/httpd/download.eclipse.org/rt/ecf/3.13.7/site.p2"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.13milestones/"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.7.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/releases"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <repository id="xtend" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/releases"/>
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
+      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.3.0/S201706132000"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.9.0/R-3.9.0-20170613094504/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.zest.layouts" version="0.0.0"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.3.0/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones"/>
+      <unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.dawn.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20170531-1203"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/interim/6.3.0"/>
+      <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+      <repository id="mwe2" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+      <unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.14.0M7-201705161212/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.2.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.7.0/S201702010226"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository/"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.inject" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.edit" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp" version="0.0.0"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201701271543"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201706130827"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.14.0M5-201701312008/"/>
+      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="org.apache.commons.io" version="0.0.0"/>
+      <unit id="org.apache.commons.io.source" version="0.0.0"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
+      <unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.batik.xml" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.log4j" version="0.0.0"/>
+      <unit id="org.apache.commons.lang" version="0.0.0"/>
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index 72d1f020..a561b32a 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,117 +1,128 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1492705545">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1497549504">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.db.h2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <unit id="org.apache.commons.lang" version="0.0.0"/>
-      <unit id="org.eclipse.net4j.ui" version="0.0.0"/>
-      <unit id="org.apache.log4j" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.draw2d" version="0.0.0"/>
+      <unit id="org.eclipse.gef" version="0.0.0"/>
+      <unit id="org.eclipse.xwt" version="0.0.0"/>
       <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
-      <repository id="papyrus-master-extra" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
-      <repository id="papyrus-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
+      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/RC4/main"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
-      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20170131-0606"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+      <repository id="ecf" location="http://download.eclipse.org/rt/ecf/3.13.7/site.p2"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.13milestones/"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
+      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/releases"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <repository id="xtend" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/releases"/>
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
+      <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
+      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.3.0/S201706132000"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/R-3.9.0-20170613094504/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.zest.layouts" version="0.0.0"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.3.0/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones"/>
+      <unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.dawn.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
+      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20170531-1203"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.3.0"/>
+      <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+      <repository id="mwe2" location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-      <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
-      <unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
-      <unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
-      <unit id="org.apache.batik.xml" version="1.6.0.v201011041432"/>
-      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+      <unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/milestones/S-0.14.0M7-201705161212/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
-      <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.2.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+      <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0/S201702010226"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+      <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository/"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
+      <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.inject" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+      <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.edit" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.rcp" version="0.0.0"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201701271543"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201706130827"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/milestones/S-0.14.0M5-201701312008/"/>
+      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="org.apache.commons.io" version="0.0.0"/>
+      <unit id="org.apache.commons.io.source" version="0.0.0"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
+      <unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.batik.xml" version="1.6.0.v201011041432"/>
+      <unit id="org.apache.log4j" version="0.0.0"/>
+      <unit id="org.apache.commons.lang" version="0.0.0"/>
+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
     </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
index f6a8f8a3..717fd1ed 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
@@ -2,149 +2,159 @@ target "Collaborative Modeling Target Platform"
 
 location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
  org.eclipse.platform.feature.group lazy
+ org.eclipse.sdk.feature.group lazy
  org.eclipse.rcp.feature.group lazy
  org.eclipse.jdt.feature.group lazy
  org.eclipse.equinox.p2.discovery.feature.feature.group lazy
  org.eclipse.equinox.executable.feature.group lazy
  
- org.eclipse.net4j.db.feature.group lazy
- org.eclipse.net4j.db.h2.feature.group lazy
- org.eclipse.emf.workspace.feature.group lazy
- org.apache.commons.lang lazy
- org.eclipse.net4j.ui lazy
- org.apache.log4j lazy
- 
- org.eclipse.sdk.feature.group lazy
- 
  org.eclipse.papyrus.sdk.feature.feature.group lazy
  org.eclipse.papyrus.infra.gmfdiag.feature.feature.group lazy
  org.eclipse.papyrus.infra.services.feature.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" papyrus-master-extra {
+ 
+ org.eclipse.draw2d lazy
+ org.eclipse.gef lazy
+ org.eclipse.xwt lazy
+}
+
+//emf.transaction requires emf.validation
+//cdo.dawn.ui requires draw2d
+//gmf.runtime.diagram.ui require gef
+//papyrus.infra.properties.ui requires xwt
+//papyrus.infra.gmfdiag.tooling.runtime requires org.eclipse.ocl
+//org.eclipse.papyrus.uml.diagram.wizards requires org.eclipse.m2m.qvt.oml
+//papyrus.views.properties.model.xwt requires org.eclipse.wst.xml.core
+//org.eclipse.papyrus.uml.search.ui requires org.eclipse.ocl.pivot.uml> ocl.pivot > ...
+//org.eclipse.papyrus.uml.search.ui requires org.eclipse.ocl.examples.xtext.console> ...
+//org.eclipse.ocl.examples.debug.vm.ui requires bundle org.eclipse.xtext.ui
+
+//manulaUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" {
 	org.eclipse.papyrus.junit.utils lazy
 	org.eclipse.papyrus.junit.framework lazy
 }
 
-// Temporary fix as the latest Milestone containing the recent toolsmiths changes is not yet published
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/" papyrus-master {
+// Temporary fix as the latest Milestone sdk does not 
+//updateFrom ("Papyrus",0)
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.0/RC4/main" {
 	org.eclipse.papyrus.views.properties.toolsmiths lazy
-	org.eclipse.papyrus.views.properties.model.xwt lazy
 }
 
 
 // CDO
-
-//updateFrom("EMF CDO",0) 
-
-location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20170131-0606" {
-	org.eclipse.net4j.feature.group lazy
-	org.eclipse.emf.cdo.server.feature.group lazy
-	org.eclipse.emf.cdo.dawn.feature.group lazy
-	org.eclipse.emf.cdo.feature.group lazy
-	org.eclipse.emf.cdo.server.db.feature.group lazy
+//updateFrom("ECF",0)
+location ecf "http://download.eclipse.org/rt/ecf/3.13.7/site.p2"{
+ org.eclipse.ecf.filetransfer.feature.feature.group lazy
+ org.eclipse.ecf.core.feature.feature.group lazy
 }
-//updateFrom("EMF (Core)",0)
 
-location emf "http://download.eclipse.org/modeling/emf/emf/updates/2.13milestones/" {
-	org.eclipse.emf.sdk.feature.group lazy
+//updateFrom("QVT Operational",0) 
+location qvto "http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0" {
+ org.eclipse.m2m.qvt.oml.sdk.feature.group lazy
 }
 
-//updateFrom("EMF TRANSACTION",0)
-
-location emfTransaction "http://download.eclipse.org/modeling/emf/transaction/updates/releases" {
-	org.eclipse.emf.transaction.sdk.feature.group lazy
+//updateFrom("Xtext, Xtend",0) 
+location xtend "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/" {
+ org.eclipse.xtext.sdk.feature.group lazy
+ org.eclipse.xtend.sdk.feature.group lazy
 }
 
-//updateFrom("EMF VALIDATION",0)
-
-location emfValidation "http://download.eclipse.org/modeling/emf/validation/updates/releases" {
-	org.eclipse.emf.validation.sdk.feature.group lazy
+//updateFrom("M2T Xpand", 0)
+location xpand "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"{
+	org.eclipse.xpand.sdk.feature.group lazy
 }
 
-//updateFrom("GMF Notation",0)
-
-location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases" {
-	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+//updateFrom("Eclipse OCL 6.3",0) 
+location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.3.0/S201706132000" {
+ 	org.eclipse.ocl.core.sdk.feature.group lazy
+	org.eclipse.ocl.examples.classic.feature.group lazy
+	org.eclipse.ocl.examples.feature.group lazy
 }
 
-//updateFrom("GMF Runtime",0) 
-
-location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases" {
-	org.eclipse.gmf.runtime.sdk.feature.group lazy
+//updateFrom ("WebTools",0)
+location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.9.0/R-3.9.0-20170613094504/repository/" {
+ org.eclipse.wst.xml_ui.feature.feature.group lazy
+ org.eclipse.wst.common.fproj.feature.group lazy
+ org.eclipse.wst.server_ui.feature.feature.group lazy
 }
 
-//updateFrom("GEF",0)
-
-location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
-	org.eclipse.gef.feature.group lazy
-	org.eclipse.zest.layouts lazy
+//manualUpdate("Nebula")
+location nebula "http://download.eclipse.org/nebula/releases/1.3.0/"{
+	org.eclipse.nebula.widgets.cdatetime.feature.feature.group lazy
 }
 
-//updateFrom("MDT UML2",0) 
-
-location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones" {
-	org.eclipse.uml2.sdk.feature.group lazy
+//updateFrom("EMF CDO",0) 
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20170531-1203" {
+ 	org.eclipse.net4j.sdk.feature.group lazy
+	org.eclipse.emf.cdo.sdk.feature.group lazy
+	org.eclipse.emf.cdo.dawn.sdk.feature.group lazy
+	org.eclipse.emf.cdo.dawn.feature.group lazy
 }
 
-//updateFrom("Eclipse OCL 6.3",0) 
-
-location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.3.0" {
-	org.eclipse.ocl.examples.classic.feature.group lazy
-	org.eclipse.ocl.examples.feature.group lazy
+//updateFrom("EMFT MWE",0)
+location mwe2 "http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"{
+	org.eclipse.emf.mwe.sdk.feature.group lazy
+	org.eclipse.emf.mwe2.runtime.sdk.feature.group lazy
 }
 
-//manualUpdate
-
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
-	org.apache.commons.io lazy
-	org.apache.commons.io.source lazy
-	com.google.guava [21.0.0,22.0.1]
-	com.google.guava.source [21.0.0,22.0.1]
-	org.apache.batik.css [1.6.0,1.6.1)
-	org.apache.batik.util [1.6.0,1.6.1)
-	org.apache.batik.xml [1.6.0,1.6.1)
+//updateFrom("Graphiti",0)
+location graphiti "http://download.eclipse.org/graphiti/updates/milestones/S-0.14.0M7-201705161212/" {
+	org.eclipse.graphiti.sdk.feature.feature.group lazy
 }
 
-//updateFrom("XWT",0)
-
-location xwt "http://download.eclipse.org/xwt/release-1.2.0" {
-	org.eclipse.xwt.feature.feature.group lazy
+//updateFrom("EMF (Core)",0)
+location emf "http://download.eclipse.org/modeling/emf/emf/updates/2.13/" {
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.xsd.sdk.feature.group lazy
 }
 
-//updateFrom("QVT Operational",0)
-
-location qvto "http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0/S201702010226" {
-	org.eclipse.m2m.qvt.oml.sdk.feature.group lazy
+//updateFrom("EMF VALIDATION",0)
+location emfValidation "http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352" {
+	org.eclipse.emf.validation.sdk.feature.group lazy
 }
 
-//updateFrom("WebTools",0) 
+//updateFrom("EMF TRANSACTION",0)
+location emfTransaction "http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339" {
+	org.eclipse.emf.transaction.sdk.feature.group lazy
+ 	org.eclipse.emf.workspace.feature.group lazy
+}
 
-location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository/" {
-	org.eclipse.wst.xml_ui.feature.feature.group lazy
+//updateFrom("GMF Notation",0)
+location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354" {
+	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
 }
 
-//manualUpdate
+//updateFrom("GMF Runtime",0) 
+location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437" {
+	org.eclipse.gmf.runtime.sdk.feature.group lazy
+}
 
-location xtext "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/" {
-	com.google.inject lazy
-	org.eclipse.xtext.sdk.feature.group lazy
-	org.eclipse.xtend.sdk.feature.group lazy
-	org.eclipse.xtext.redist.feature.group lazy
+//updateFrom("MDT UML2",0) 
+location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3milestones" {
+	org.eclipse.uml2.sdk.feature.group lazy
 }
 
 //updateFrom("EMF COMPARE",0) 
-
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201701271543" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201706130827" {
 	org.eclipse.emf.compare.diagram.gmf.source.feature.group lazy
 	org.eclipse.emf.compare.source.feature.group lazy
 	org.eclipse.emf.compare.uml2.source.feature.group lazy
-	org.eclipse.emf.compare.edit lazy
-	org.eclipse.emf.compare.rcp lazy
+	org.eclipse.emf.compare.ide.ui.feature.group lazy
+	org.eclipse.emf.compare.rcp.ui.feature.group lazy
 }
 
-//updateFrom("Graphiti",0)
-
-location graphiti "http://download.eclipse.org/graphiti/updates/milestones/S-0.14.0M5-201701312008/" //
+//manualUpdate
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" {
+	com.google.inject lazy
+	org.apache.commons.io lazy
+	org.apache.commons.io.source lazy
+	com.google.guava [15.0.0, 16.0.0)
+	com.google.guava.source [15.0.0, 16.0.0)
+	org.apache.batik.css [1.6.0,1.6.1)
+	org.apache.batik.util [1.6.0,1.6.1)
+	org.apache.batik.xml [1.6.0,1.6.1)
+	org.apache.log4j lazy
+ 	org.apache.commons.lang lazy
+}
 
 // Revision Tool
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index 4af1fe94..01a91e10 100755
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,13 +6,13 @@
 
 	<!-- Parent POM (i.e., root POM of Requirements project) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.root</artifactId>
-		<version>0.0.7-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
+		<artifactId>org.eclipse.papyrus.collaborativemodeling.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.requirements.tests</artifactId>
+	<artifactId>org.eclipse.papyrus.collaborativemodeling.tests</artifactId>
 	<packaging>pom</packaging>
 	<name>Requirements Tests (Tests folder)</name>