diff --git a/diagram-definition/features/org.eclipse.papyrus.interoperability.dd.feature/feature.xml b/diagram-definition/features/org.eclipse.papyrus.interoperability.dd.feature/feature.xml
index f699a98..6111420 100755
--- a/diagram-definition/features/org.eclipse.papyrus.interoperability.dd.feature/feature.xml
+++ b/diagram-definition/features/org.eclipse.papyrus.interoperability.dd.feature/feature.xml
@@ -5,10 +5,6 @@
       version="0.7.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
-   <description url="http://www.example.com/description">
-      
-   </description>
-
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2016 CEA LIST.
 All rights reserved.   This program and the accompanying materials
diff --git a/diagram-definition/plugins/org.eclipse.papyrus.notation.qvt/src/org/eclipse/papyrus/notation/qvt/NotationUtilities.java b/diagram-definition/plugins/org.eclipse.papyrus.notation.qvt/src/org/eclipse/papyrus/notation/qvt/NotationUtilities.java
index 3137cb8..a5cc18f 100755
--- a/diagram-definition/plugins/org.eclipse.papyrus.notation.qvt/src/org/eclipse/papyrus/notation/qvt/NotationUtilities.java
+++ b/diagram-definition/plugins/org.eclipse.papyrus.notation.qvt/src/org/eclipse/papyrus/notation/qvt/NotationUtilities.java
@@ -26,6 +26,7 @@
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PointList;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.text.TextFlow;
 import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
@@ -282,8 +283,8 @@
 				}
 			} else if (figure instanceof ConstraintFigure) {
 				ConstraintFigure cf = (ConstraintFigure) figure;
-				r = cf.getTextFlow().getBounds();
-				cf.getTextFlow().translateToAbsolute(r);
+				r = ((TextFlow)cf.getPageFlow().getChildren().get(0)).getBounds();
+				((TextFlow)cf.getPageFlow().getChildren().get(0)).translateToAbsolute(r);
 			}
 
 			Bounds b = NotationFactory.eINSTANCE.createBounds();
diff --git a/diagram-definition/releng/main/pom.xml b/diagram-definition/releng/main/pom.xml
index 7453b35..d07cea4 100644
--- a/diagram-definition/releng/main/pom.xml
+++ b/diagram-definition/releng/main/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.interoperability.dd.releng</artifactId>
 	<packaging>pom</packaging>
diff --git a/diagram-definition/releng/main/targetplatform/pom.xml b/diagram-definition/releng/main/targetplatform/pom.xml
index e4de72e..8f1596d 100644
--- a/diagram-definition/releng/main/targetplatform/pom.xml
+++ b/diagram-definition/releng/main/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.dd.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen</module>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 88942ff..7ac20ea 100644
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.interoperability.releng</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
 	<parent>
 		<groupId>org.eclipse.papyrus.interoperability</groupId>
 		<artifactId>org.eclipse.papyrus.interoperability.all.releng</artifactId>
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 28de414..abd4dd2 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
@@ -70,8 +70,8 @@
 <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.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"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/"/>
 </location>
 </locations>
diff --git a/releng/main/targetplatform/pom.xml b/releng/main/targetplatform/pom.xml
index c3c7106..d8a76bb 100644
--- a/releng/main/targetplatform/pom.xml
+++ b/releng/main/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.main.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.targetplatform.oxygen</module>
diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml
index 12db5f0..94794c3 100644
--- a/releng/tests/pom.xml
+++ b/releng/tests/pom.xml
@@ -8,7 +8,6 @@
 	</parent>
 	<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
 	<artifactId>org.eclipse.papyrus.interoperability.tests.releng</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<testConfig>CI_TESTS_CONFIG</testConfig>
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 dcfb999..f6cb562 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
@@ -74,7 +74,7 @@
 <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.eclipse.papyrus.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/"/>
 </location>
 </locations>
diff --git a/releng/tests/targetplatform/pom.xml b/releng/tests/targetplatform/pom.xml
index 2ef0f1e..a79cee4 100644
--- a/releng/tests/targetplatform/pom.xml
+++ b/releng/tests/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.tests.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.targetplatform.oxygen</module>
diff --git a/rpy/features/org.eclipse.papyrus.interoperability.rpy.feature/feature.xml b/rpy/features/org.eclipse.papyrus.interoperability.rpy.feature/feature.xml
index 9ec2a0b..8342b5a 100644
--- a/rpy/features/org.eclipse.papyrus.interoperability.rpy.feature/feature.xml
+++ b/rpy/features/org.eclipse.papyrus.interoperability.rpy.feature/feature.xml
@@ -104,18 +104,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.papyrus.uml.m2m.qvto.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.doc/pom.xml b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.doc/pom.xml
index 2a1a766..627e240 100644
--- a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.doc/pom.xml
+++ b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.doc/pom.xml
@@ -8,7 +8,6 @@
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.interoperability.rpy.doc</artifactId>
-		<version>0.7.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<build>
diff --git a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.parser/.launch/Launch Runtime Eclipse.launch b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.parser/.launch/Launch Runtime Eclipse.launch
index e589568..802aec2 100644
--- a/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.parser/.launch/Launch Runtime Eclipse.launch
+++ b/rpy/plugins/org.eclipse.papyrus.interoperability.rpy.parser/.launch/Launch Runtime Eclipse.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m 
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="show_selected_only" value="false"/>
diff --git a/rpy/releng/main/pom.xml b/rpy/releng/main/pom.xml
index 5fb6f01..8610174 100755
--- a/rpy/releng/main/pom.xml
+++ b/rpy/releng/main/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.interoperability.rpy.releng</artifactId>
 	<packaging>pom</packaging>
diff --git a/rpy/releng/main/targetplatform/pom.xml b/rpy/releng/main/targetplatform/pom.xml
index 727c5d2..6c649a6 100755
--- a/rpy/releng/main/targetplatform/pom.xml
+++ b/rpy/releng/main/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.rpy.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen</module>
diff --git a/rpy/releng/tests/targetplatform/pom.xml b/rpy/releng/tests/targetplatform/pom.xml
index 0a5fa64..1bf42e3 100755
--- a/rpy/releng/tests/targetplatform/pom.xml
+++ b/rpy/releng/tests/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.rpy.tests.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.7.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen</module>
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 fb66db4..45ffeff 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
@@ -27,7 +27,7 @@
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.swt,
  org.eclipse.ui.workbench,
diff --git a/rsa/releng/main/pom.xml b/rsa/releng/main/pom.xml
index ac0e7b3..f54d749 100644
--- a/rsa/releng/main/pom.xml
+++ b/rsa/releng/main/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.interoperability.rsa.releng</artifactId>
 	<packaging>pom</packaging>
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 7a70f94..5871867 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317057">
+<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317058">
 <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"/>
@@ -53,8 +53,8 @@
 <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.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"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/"/>
 </location>
 </locations>
diff --git a/rsa/releng/main/targetplatform/pom.xml b/rsa/releng/main/targetplatform/pom.xml
index f7a68e2..8a1b40e 100644
--- a/rsa/releng/main/targetplatform/pom.xml
+++ b/rsa/releng/main/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.rsa.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.4.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen</module>
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 684f305..c526450 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
@@ -61,7 +61,7 @@
 <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.extra.dsml.validation.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/"/>
 </location>
 </locations>
diff --git a/rsa/releng/tests/targetplatform/pom.xml b/rsa/releng/tests/targetplatform/pom.xml
index b0b823b..1399364 100644
--- a/rsa/releng/tests/targetplatform/pom.xml
+++ b/rsa/releng/tests/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.rsa.tests.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.4.0-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.rsa.targetplatform.oxygen</module>
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
index 328556e..05f2828 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
@@ -41,20 +41,6 @@
    <includes
          id="org.eclipse.papyrus.sysml14.feature"
          version="0.0.0"/>
-   
-   <plugin
-         id="org.eclipse.papyrus.uml.m2m.qvto.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.eclipse.papyrus.interoperability.sysml14.sysml"
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
index afbfa67..e450242 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml.doc/pom.xml
@@ -7,7 +7,6 @@
 		<version>0.10.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.doc</artifactId>
-	<version>0.10.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
index a53ee0c..b2e8a88 100644
--- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
+++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.m2m.qvto.common;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.m2m.qvt.oml;bundle-version="[3.7.0,4.0.0)",
diff --git a/sysml14/releng/main/pom.xml b/sysml14/releng/main/pom.xml
index d352efd..d31f35c 100644
--- a/sysml14/releng/main/pom.xml
+++ b/sysml14/releng/main/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</artifactId>
 	<packaging>pom</packaging>
diff --git a/sysml14/releng/main/targetplatform/pom.xml b/sysml14/releng/main/targetplatform/pom.xml
index d12ac47..e130b06 100644
--- a/sysml14/releng/main/targetplatform/pom.xml
+++ b/sysml14/releng/main/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.10.1-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</module>
diff --git a/sysml14/releng/tests/targetplatform/pom.xml b/sysml14/releng/tests/targetplatform/pom.xml
index 795cb8c..dd6354d 100644
--- a/sysml14/releng/tests/targetplatform/pom.xml
+++ b/sysml14/releng/tests/targetplatform/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -10,7 +11,6 @@
 
 	<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.target.parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.10.1-SNAPSHOT</version>
 
 	<modules>
 		<module>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</module>