From 7310db0b3b2e8ee805fedf4bfd16baf438c89332 Mon Sep 17 00:00:00 2001
From: Florian Noyrit
Date: Tue, 9 Aug 2016 12:25:50 +0200
Subject: Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*

Bug 499554 - Oxygen release version number moved to 3.0.0.

Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007
---
 .../pom.xml                                        |  20 +-
 .../org.eclipse.papyrus.editor.feature/feature.xml |  20 +-
 .../org.eclipse.papyrus.editor.feature/pom.xml     |  22 +-
 .../feature.xml                                    | 342 ++++++++++++++++-----
 .../org.eclipse.papyrus.emf.facet.feature/pom.xml  |  20 +-
 .../org.eclipse.papyrus.infra.core.feature/pom.xml |  20 +-
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |  63 +++-
 .../org.eclipse.papyrus.infra.emf.feature/pom.xml  |  20 +-
 .../org.eclipse.papyrus.infra.feature/feature.xml  | 175 ++++++++---
 .../org.eclipse.papyrus.infra.feature/pom.xml      |  20 +-
 .../feature.xml                                    |  57 +++-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    | 214 ++++++++++---
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    | 144 +++++++--
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    | 135 ++++++--
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    | 102 +++++-
 .../org.eclipse.papyrus.infra.ui.feature/pom.xml   |  22 +-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  37 ++-
 .../pom.xml                                        |  22 +-
 .../org.eclipse.papyrus.sdk.feature/feature.xml    | 216 +++++++++----
 .../org.eclipse.papyrus.sdk.feature/pom.xml        |  20 +-
 .../feature.xml                                    |  57 +++-
 .../pom.xml                                        |  22 +-
 .../org.eclipse.papyrus.sysml.feature/feature.xml  |  30 +-
 .../org.eclipse.papyrus.sysml.feature/pom.xml      |  24 +-
 .../pom.xml                                        |  24 +-
 .../feature.xml                                    |  63 +++-
 .../pom.xml                                        |  24 +-
 .../pom.xml                                        |  24 +-
 .../feature.xml                                    |  53 +++-
 .../org.eclipse.papyrus.uml.alf.feature/pom.xml    |  20 +-
 .../feature.xml                                    |  35 ++-
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |  37 ++-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  23 +-
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |   2 +-
 .../pom.xml                                        |  20 +-
 .../org.eclipse.papyrus.uml.feature/feature.xml    | 208 ++++++++++---
 .../org.eclipse.papyrus.uml.feature/pom.xml        |  22 +-
 .../feature.xml                                    |  27 +-
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |   9 +-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  23 +-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  16 +-
 .../org.eclipse.papyrus.uml.search.feature/pom.xml |  22 +-
 .../feature.xml                                    | 234 ++++++++++----
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |  23 +-
 .../org.eclipse.papyrus.uml.tools.feature/pom.xml  |  20 +-
 .../org.eclipse.papyrus.uml.ui.feature/pom.xml     |  22 +-
 .../feature.xml                                    |  30 +-
 .../pom.xml                                        |  22 +-
 .../feature.xml                                    |  37 ++-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  20 +-
 .../pom.xml                                        |  20 +-
 .../pom.xml                                        |  20 +-
 .../feature.xml                                    |  20 +-
 .../pom.xml                                        |  22 +-
 .../pom.xml                                        |  20 +-
 69 files changed, 2331 insertions(+), 945 deletions(-)

(limited to 'features/papyrus-main-features')

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
index 389cfcd0d92..93fecf913b7 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.customization.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.customization.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.customization.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
index 25e63161519..c9edaee341a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.editor.feature" label="Papyrus editor" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.editor.feature"
+      label="Papyrus editor"
+      version="2.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -10,9 +15,14 @@ http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
-		%license
-	</license>
+      %license
+   </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.editor" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
index 02daf932ee6..1b6526f114b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.editor.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.editor.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.editor.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
index 5f8160f91b5..f8d2e241aee 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.emf.facet.feature" label="Papyrus Facet" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.emf.facet.feature"
+      label="Papyrus Facet"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -13,78 +18,263 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.common.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.common.sdk.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.common.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.metamodel" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.metamodel.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.metamodel.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.sdk.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.sdk.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.custom.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.catalog" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.metamodel" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.metamodel.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.efacet.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.java" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.java.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.java.metamodel" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.java.sdk.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.ocl.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.ocl.metamodel" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.emf.catalog" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.emf.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.emf.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.jface.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.pde.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.swt" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.util.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.widgets" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.widgets.celleditors" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.common.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.common.sdk.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.common.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.metamodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.metamodel.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.metamodel.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.sdk.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.sdk.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.custom.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.catalog"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.metamodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.metamodel.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.sdk.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.efacet.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.java"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.java.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.java.metamodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.java.sdk.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.ocl.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.ocl.metamodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.emf.catalog"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.emf.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.emf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.jface.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.pde.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.swt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.util.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.widgets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.widgets.celleditors"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
index daf6882877b..16d62ef9c4f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.emf.facet.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.emf.facet.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.emf.facet.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
index 04c21d5606e..de8bad2c97c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.core.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.core.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
index 57aeba28e7d..9a0755e8fb9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.discovery.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.discovery.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.discovery.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
index 980d6d01551..8b4b46ba70f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.infra.emf.feature" label="Papyrus Infra EMF" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.emf.feature"
+      label="Papyrus Infra EMF"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -14,18 +18,53 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.emf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.diagram.common" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.diagram.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.appearance" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.appearance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.readonly" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.types" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.types.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.readonly"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.gmf" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.types.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.gmf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
index 0c99f7bd244..489c6341b2b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index 577bdf7feee..f67fe994df4 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.feature"
+      label="Papyrus infra"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
@@ -14,42 +18,135 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.onefile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.hyperlink" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.doc" install-size="0" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.psf" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.newchild" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.newchild.edit" install-size="0" unpack="false" version="0.0.0"/>
-	
-	<plugin download-size="0" id="org.eclipse.papyrus.infra.sync" install-size="0" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.rulebased" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.filters" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.filters.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.properties" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.editor" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.onefile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.constraints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.constraints.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.constraints.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.hyperlink"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.psf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.newchild"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.newchild.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.sync"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.types.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.types.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.types.rulebased"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.filters"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.filters.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.properties.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.properties.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
index b9ed3b536ae..758582a9a5b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
index 5fbc2b525e9..4e7fb947664 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature" label="Papyrus CSS Feature" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.gmfdiag.css.feature"
+      label="Papyrus CSS Feature"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -13,18 +18,52 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.configuration" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css.configuration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.properties" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.theme" install-size="0" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css.theme"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.model" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.css.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
index 2dd369399c7..f2f7549fcd0 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
index 32bb682aeec..c1173747a38 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.feature" label="Papyrus GMF diagram" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.gmfdiag.feature"
+      label="Papyrus GMF diagram"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
@@ -17,50 +22,163 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.apache.log4j"/>
    </requires>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.commands" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.navigation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.outline" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.preferences" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.properties" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.widgets" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.common" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.gef" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.extensionpoints.editors" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.dnd" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.viewersearcher" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.controlmode" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.menu" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.export" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.assistant" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.assistant.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.assistant.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.assistant.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.canonical" install-size="0" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.welcome" install-size="0" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.navigation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.outline"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.widgets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.gef"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.extensionpoints.editors"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.dnd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.hyperlink"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.viewersearcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.controlmode"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.menu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.export"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.assistant"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.assistant.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.assistant.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.assistant.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.canonical"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.gmfdiag.welcome"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
index f56758baf18..0bf9d08ee31 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.gmfdiag.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
index 6bf9d614719..13e508827d0 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.nattable.feature" label="Papyrus Table - New Version" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.nattable.feature"
+      label="Papyrus Table - New Version"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="epl-v10.html">
       Copyright (c) 2013 CEA LIST
@@ -13,34 +18,109 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.common" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.views.config" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.views.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.nattable" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.controlmode" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.properties" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.gmfdiag" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.core" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="ca.odell.glazedlists" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.extension.glazedlists" install-size="0" unpack="false" version="0.0.0"/>
-   
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.model.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.model.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.views.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.views.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.emf.nattable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.controlmode"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.nattable.gmfdiag"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.nattable.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="ca.odell.glazedlists"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.nattable.extension.glazedlists"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
index b6cedc5428c..fd3c64dcd52 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.nattable.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
index 034d4dd38ef..69dd9b5ee07 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.services.feature" label="Papyrus services" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.services.feature"
+      label="Papyrus services"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -13,32 +18,102 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.controlmode" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.controlmode.history" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.decoration" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.markerlistener" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.validation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.labelprovider" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.semantic" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.viewersearch" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.viewlabelprovider" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.openelement" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.navigation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.localizer" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.infra.services.controlmode"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.controlmode.history"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.decoration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.markerlistener"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.resourceloading"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.labelprovider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.semantic"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.viewersearch"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.viewlabelprovider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.openelement"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.navigation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.services.localizer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
index ee959e859d0..e219e34805a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.services.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.services.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
index f692c1f6d3f..9fa48101689 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" provider-name="%featureProvider" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.ui.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%featureProvider">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
@@ -13,30 +18,95 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.onefile.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.onefile.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.ui.emf" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.ui.emf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.ui.resources" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.ui.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.ui" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.editor" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.constraints.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.types.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.edit.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.types.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.services.resourceloading.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.services.edit.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.properties.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.services.resourceloading.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.properties.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.newchild.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.editor.welcome"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.editor.welcome.nattable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.infra.newchild.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
index 908e0f77339..74334485293 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
index 824e9e4176c..38e97d48df8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.viewpoints.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.viewpoints.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
index 03355e2cb39..5b0cc1492e7 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.infra.widget.feature" label="Papyrus widgets" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.infra.widget.feature"
+      label="Papyrus widgets"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
-<copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0
@@ -10,13 +14,28 @@ http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
-		%license
-	</license>
+      %license
+   </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.widgets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets.toolbox" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.richtext" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.infra.widgets.toolbox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.richtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
index d64b2841a86..cff2bdac4ed 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index e5749b81a2b..a6e07118f37 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML" plugin="org.eclipse.papyrus.sdk" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.sdk.feature"
+      label="Papyrus UML"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project"
+      plugin="org.eclipse.papyrus.sdk">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others
@@ -13,78 +18,161 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <includes id="org.eclipse.papyrus.customization.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.customization.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.editor.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.editor.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.core.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.core.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.gmfdiag.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.gmfdiag.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.services.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.services.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.ui.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.ui.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.infra.widget.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.infra.widget.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.uml.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.uml.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.uml.modelexplorer.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.uml.modelexplorer.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.uml.properties.feature" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.uml.properties.feature"
+         version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.uml.tools.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.ui.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.views.modelexplorer.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.views.properties.feature" version="0.0.0"/>
-   
-   <includes id="org.eclipse.papyrus.views.references.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.diagram.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.infra.emf.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.textedit.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.alf.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.infra.discovery.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.views.validation.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.doc.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.views.search.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.search.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.xtext.integration.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.infra.nattable.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.nattable.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.infra.gmfdiag.css.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.diagram.css.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.emf.facet.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.infra.viewpoints.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.decoratormodel.feature" version="0.0.0"/>
-
-   <includes id="org.eclipse.papyrus.uml.assistants.feature" version="0.0.0"/>
-
-   <plugin download-size="0" id="com.google.guava" install-size="0" unpack="false" version="15.0.0.v201403281430"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sdk" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.eclipse.project.editors" install-size="0" unpack="false" version="0.0.0"/>
+   <includes
+         id="org.eclipse.papyrus.uml.tools.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.ui.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.views.modelexplorer.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.views.properties.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.views.references.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.diagram.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.infra.emf.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.textedit.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.alf.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.infra.discovery.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.views.validation.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.doc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.views.search.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.search.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.xtext.integration.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.infra.nattable.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.nattable.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.infra.gmfdiag.css.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.diagram.css.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.emf.facet.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.infra.viewpoints.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.decoratormodel.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.papyrus.uml.assistants.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="15.0.0.v201403281430"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sdk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.eclipse.project.editors"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.qualifier"
+         unpack="false"/>
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
index d08359eab6f..a768bd70b76 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
index 81532283a3e..4d42fe9a2e7 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.diagram.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.sysml.diagram.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,18 +18,52 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.blockdefinition" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.blockdefinition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.common" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.requirement" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.requirement"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.internalblock" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.internalblock"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.parametric" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.parametric"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.diagram.css" install-size="0" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.diagram.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
index 6d0371517c2..80cf106ebad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.diagram.feature/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.diagram.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.diagram.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
index f0246467dbf..3ec44ca9299 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.sysml.feature"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,10 +18,25 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.service.types" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.service.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.edit" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.sysml.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
index 846289afc2c..957aec37956 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
index 07e9c34f95d..a0717fac525 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.modelexplorer.feature/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.modelexplorer.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.modelexplorer.feature</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
index 94b809e1d38..ff5540ba139 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.nattable.feature" label="Papyrus SysML Table - New Version" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.sysml.nattable.feature"
+      label="Papyrus SysML Table - New Version"
+      version="2.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST
@@ -13,16 +18,46 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable.requirement" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable.requirement.config" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable.allocation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable.allocation.config" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.nattable.menu" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable.requirement"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable.requirement.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable.allocation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable.allocation.config"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.sysml.nattable.menu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
index ce087cbff4a..dfb99244c9e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.nattable.feature/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.nattable.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.nattable.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
index e5550807620..ff83119e86f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.properties.feature/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.sysml.properties.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.sysml.properties.feature</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
index cdbe47d36c2..7fed2e724d9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.alf.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.alf.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,14 +18,46 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf.common" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.alf.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf.common.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.alf.common.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.alf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf.libraries" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.alf.libraries"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf.to.fuml" install-size="0" unpack="false" version="0.0.0"/>
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.alf.ui" install-size="0" unpack="false" version="0.0.0"/>
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.uml.alf.to.fuml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.alf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
index a6f424391f4..42f3d7c51de 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.alf.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
index 475482fabbd..08437df8f8f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.uml.assistants.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.assistants.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
@@ -14,12 +18,29 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.assistants.generator" install-size="0" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.assistants.generator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.assistants.generator.ui" install-size="0" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.assistants.generator.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.types.generator" install-size="0" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.types.generator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.types.generator.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.types.generator.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml
index ddd4d42bcbc..3eb8b22fd5f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.assistants.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.assistants.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/feature.xml
index 2c03b5cd1ec..b76fefb3c23 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.decoratormodel.feature" label="Papyrus Decorator Models" provider-name="Eclipse Modeling Project" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.decoratormodel.feature"
+      label="Papyrus Decorator Models"
+      version="3.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2014 CEA LIST, Christian W. Damus, and others
@@ -12,12 +17,32 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.decoratormodel" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.decoratormodel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.decoratormodel.controlmode" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.decoratormodel.controlmode"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.decoratormodel.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.decoratormodel.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.decoratormodel.properties" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.decoratormodel.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/pom.xml
index c405dcb174f..73bc7397b37 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.decoratormodel.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.decoratormodel.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.decoratormodel.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
index 59ed3423c7b..b5a8befb871 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.diagram.css.feature" label="Papyrus CSS UML Feature" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.diagram.css.feature"
+      label="Papyrus CSS UML Feature"
+      version="2.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2013 CEA LIST
@@ -17,8 +22,18 @@ http://www.eclipse.org/legal/epl-v10.html
       <import feature="org.eclipse.papyrus.infra.gmfdiag.css.feature" version="0.10.1.qualifier"/>
    </requires>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.css" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.css.palette" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.diagram.css.palette"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
index f08de902a24..785afcc7e6e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.css.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.diagram.css.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
index 1914fbe80b5..b57ca0a6b72 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.uml.diagram.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
index 6ff713fae66..657d406f896 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.diagram.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
index cf3eddb343e..2c4663ce2be 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
@@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
@@ -14,48 +18,158 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.commands" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.controlmode.profile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.extensionpoints" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.icons" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.import" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.perspective" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.drafter" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.resourceloading.profile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.service.types" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.service.types.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.templaterepository" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.documentation.profile" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.appearance" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.oclconstraintevaluation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.navigation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.service.validation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.services.decoration" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.modelrepair" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.filters" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.filters.edit" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.types.core" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.uml.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.controlmode.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.extensionpoints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.icons"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.import"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.perspective"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.profile.drafter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.resourceloading.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.service.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.service.types.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.templaterepository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.documentation.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.appearance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.oclconstraintevaluation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.navigation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.service.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.services.decoration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.modelrepair"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.filters"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.filters.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.types.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
index 3c60b3f8f6e..308808d7e45 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
index f87148b8bf2..aeaff1914d6 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.modelexplorer.feature"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -10,11 +15,21 @@ http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
-		%license
-	</license>
+      %license
+   </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.modelexplorer.widgets" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.modelexplorer.widgets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
index 901cc671547..96260c9e4b3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.modelexplorer.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.modelexplorer.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.modelexplorer.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
index 7b0c906c534..51a2d34ff69 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.uml.nattable.feature"
       label="Papyrus UML Table - New Version"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
@@ -81,6 +81,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.extension.nebula" install-size="0" unpack="false" version="0.0.0"/> 
+   <plugin
+         id="org.eclipse.nebula.widgets.nattable.extension.nebula"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
index a7521cf013d..b454cc1d1e9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.nattable.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.nattable.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
index a652e3de6f4..9689541da54 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.properties.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.properties.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,8 +18,18 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.properties" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.properties.xtext" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.properties.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
index 2ff4b50aec0..08d57f66183 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.properties.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.properties.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.properties.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
index 2ea271fd598..34a37c1187a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.search.feature" label="Papyrus UML Search Feature" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.search.feature"
+      label="Papyrus UML Search Feature"
+      version="2.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2013 CEA LIST
@@ -13,6 +18,11 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.search.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.search.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
index 2fd1f1b4984..310bce6d15b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.search.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.search.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
index 5072c13ba94..9bbb084f299 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.textedit.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.textedit.feature"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,54 +18,179 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.common.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.common.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.message.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.message.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.parameter.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.parameter.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.property.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.property.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.state.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.state.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.transition.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.transition.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.javaconstraint" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.port.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.port.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.common.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.common.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.message.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.message.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.parameter.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.parameter.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.property.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.property.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.state.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.state.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.transition.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.transition.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.javaconstraint"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.port.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.port.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
index 6c2217f489f..4cfd8596468 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.textedit.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.textedit.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
index a77f6fe85b2..8d08f134634 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.tools.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.tools.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,8 +18,18 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.tools.utils" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.tools.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.tools" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
index ec6c51249e9..abc6ea5e402 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.tools.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.tools.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/pom.xml
index 3e9306a0b9f..6c57fef0607 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.ui.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.ui.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.ui.feature</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
index 46aac1a07a9..9d51b9d667a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.xtext.integration.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.xtext.integration.feature"
+      label="%featureName"
+      version="2.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2013 CEA LIST.
@@ -13,10 +18,25 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.xtext.integration.core" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.xtext.integration.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.xtext.integration.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.xtext.integration.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.xtext.integration.validation" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.uml.xtext.integration.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
index ab8f95d62de..c7284f8a8a9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.xtext.integration.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.xtext.integration.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.xtext.integration.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
index 367f77f1805..f85ee880f57 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.views.modelexplorer.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -13,12 +18,32 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.modelexplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer.resourceloading" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.modelexplorer.resourceloading"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer.widgets" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.modelexplorer.widgets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer.newchild" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.modelexplorer.newchild"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
index 132a2ff6be5..a90f056f933 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.views.modelexplorer.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.views.modelexplorer.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
index 46d00175b7b..62cfee6be7c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.properties.feature" label="%featureName" provider-name="%providerName" version="2.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.views.properties.feature"
+      label="%featureName"
+      version="3.0.0.qualifier"
+      provider-name="%providerName">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2012 CEA LIST.
@@ -10,9 +15,14 @@ http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
-		%license
-	</license>
+      %license
+   </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.properties" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.properties"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
index fb18f66d4b2..75d3c260329 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.views.properties.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.views.properties.feature</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.references.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.references.feature/pom.xml
index ab9c1062c16..c4371ca538c 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.references.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.references.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.views.references.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.views.references.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
index 41396834229..54928f658de 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.search.feature" label="Papyrus Search Feature" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.views.search.feature"
+      label="Papyrus Search Feature"
+      version="2.0.0.qualifier"
+      provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2013 CEA LIST
@@ -10,9 +15,14 @@ http://www.eclipse.org/legal/epl-v10.html
    </copyright>
 
    <license url="%licenseURL">
-		%license
-	</license>
+      %license
+   </license>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.views.search" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.views.search"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
index 0c2ef28191e..8af881bb894 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.views.search.feature</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.views.search.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
index 98287ecef38..22ba95174dc 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.validation.feature/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.features</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.views.validation.feature</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.features</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.views.validation.feature</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3