Bug 485220: [Architecture] Provide a more modular architecture

https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220

Implement version management:  PDE API Tooling and Oomph
Version Management.

Introduce two new plug-in projects to manage versioning
using Oomph:

* org.eclipse.papyrus.releng.main.release for the Main
  bundles and features
* org.eclipse.papyrus.releng.dev.release for the Dev Tools

Add new menu actions to the Dev Tools:

* main menu bar:
    * synchronize POM and manifest versions
* "Configure" context menu on bundle projects and MANIFEST.MF
    * optimize bundle dependencies and re-exports
    * update dependency version ranges to match current workspace
      and PDE target
      
Remove obsolete menu actions from the Dev Tools:

* main menu bar:
    * Set all Papyrus feature versions
    * Set all Papyrus plug-in versions
    * Set versions of all Papyrus dependencies in Papyrus plug-ins

Fix versioning errors reported by PDE and Oomph.  Ensure proper
version ranges consistent with latest build target.

Optimize the dependencies of all Papyrus Main bundles and Dev Tools.

Remove version- and reexport-checking tests in the BundlesTests that
are now not needed because, on the one hand, we now implement discrete
bundle versioning (managed by PDE/Oomph) and on the other, we now use
re-exports properly to ensure classpath consistency in clients of a
bundle's API.

Thorough overhaul of the "project editors" API, including:

* rationalize the API interfaces
* refactor the all-in-one PluginEditor class from the customization
  bundle to the project-editors bundle
  * update clients in the Customization and DSML Validation components
* fix a bunch of operations that didn't work
* add missing operations required by the new Dev Tools actions
* complete some unimplemented APIs
* add a comprehensive JUnit test suite covering all of the
  project-editors API

Change-Id: I6a699d93909f61099226ceb994140f03ea99a70f

230 files changed, 6824 insertions, 6219 deletions

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project
index c748680444f..2948882beb8 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.alf.common.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.alf.common.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
index 5299804af5d..875f5172d0e 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF
@@ -1,19 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist

-Bundle-ActivationPolicy: lazy

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.antlr.runtime

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true

-Import-Package: org.apache.log4j

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.CommonActivator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common.ui;singleton:=true
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project
index 697d1ad948d..22e3dc641f6 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.alf.common</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.alf.common</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
index 6dfa4edb7d2..eb0e4c2e8b1 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF
@@ -1,25 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.alf,

- org.eclipse.papyrus.uml.alf.naming,

- org.eclipse.papyrus.uml.alf.serializer,

- org.eclipse.papyrus.uml.alf.services,

- org.eclipse.papyrus.uml.alf.validation

-Require-Bundle: org.eclipse.xtext;visibility:=reexport,

- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.xtext.util,

- org.antlr.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.alf,
+ org.eclipse.papyrus.uml.alf.naming,
+ org.eclipse.papyrus.uml.alf.serializer,
+ org.eclipse.papyrus.uml.alf.services,
+ org.eclipse.papyrus.uml.alf.validation
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.12.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project
index 52736e1e73e..dd033dde7e9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.alf.libraries</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.alf.libraries</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF
index 7eeb5ff6ad4..33d2a47a9a1 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF
@@ -1,18 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.emf.ecore;bundle-version="2.10.1",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.alf.libraries,

- org.eclipse.papyrus.uml.alf.libraries.helper

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: ALF Libraries

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.alf.libraries.AlfLibrariesActivator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.libraries;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.alf.libraries,
+ org.eclipse.papyrus.uml.alf.libraries.helper
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: ALF Libraries
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.alf.libraries.AlfLibrariesActivator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.libraries;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project
index be4e453d1bf..c660e607f52 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.alf.to.fuml</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.alf.to.fuml</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF
index cb8fda10986..3491d9bb044 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF
@@ -1,13 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.xtext;bundle-version="2.8.0",

- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Alf to fUML transformation

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.alf.to.fuml.AlfMappingActivator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.to.fuml;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Alf to fUML transformation
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.alf.to.fuml.AlfMappingActivator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.to.fuml;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project
index 96e2d25ba65..9d73c311992 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.project
@@ -25,10 +25,28 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
index 56b5d0ed7af..51aad214b3d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
@@ -1,47 +1,34 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext.ui,

- org.eclipse.xtext.ui.shared,

- org.eclipse.xtext.builder,

- org.eclipse.xtext.common.types.ui,

- org.eclipse.xtext.ui.codetemplates.ui,

- org.eclipse.compare,

- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",

- org.apache.log4j,

- org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gef,

- org.eclipse.gmf.runtime.notation.edit,

- org.eclipse.ui.editors,

- org.eclipse.ui,

- org.antlr.runtime,

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.common.ui;bundle-version="1.8.1",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.ocl.ecore;bundle-version="3.3.100",

- org.eclipse.xtext,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.libraries;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist,

- org.eclipse.papyrus.uml.alf.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.alf.ui.editor,

- org.eclipse.papyrus.uml.alf.ui.internal,

- org.eclipse.papyrus.uml.alf.ui.quickfix

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: ALF Language (UI)

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.ui;singleton:=true

-Import-Package: org.apache.log4j,

- org.eclipse.emf.common.util,

- org.eclipse.papyrus.uml.extensionpoints.profile,

- org.eclipse.xtext.xbase.lib

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.common.types.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.compare;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.libraries;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist,
+ org.eclipse.papyrus.uml.alf.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.alf.ui.editor,
+ org.eclipse.papyrus.uml.alf.ui.internal,
+ org.eclipse.papyrus.uml.alf.ui.quickfix
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: ALF Language (UI)
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.ui;singleton:=true
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project
index 908b342c5b5..b942294301f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.project
@@ -25,10 +25,28 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index a82e8aca229..2cbb855c044 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -1,59 +1,47 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.alf,

- org.eclipse.papyrus.uml.alf.formatting,

- org.eclipse.papyrus.uml.alf.generator,

- org.eclipse.papyrus.uml.alf.impl,

- org.eclipse.papyrus.uml.alf.parser.antlr,

- org.eclipse.papyrus.uml.alf.parser.antlr.internal,

- org.eclipse.papyrus.uml.alf.scoping,

- org.eclipse.papyrus.uml.alf.serializer,

- org.eclipse.papyrus.uml.alf.services,

- org.eclipse.papyrus.uml.alf.util,

- org.eclipse.papyrus.uml.alf.validation

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Require-Bundle: org.eclipse.xtext;visibility:=reexport,

- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.xtext.common.types,

- org.eclipse.emf.codegen.ecore.ui;bundle-version="2.9.0",

- org.eclipse.emf.codegen.ui;bundle-version="2.6.0",

- org.eclipse.ocl.common;bundle-version="1.1.0",

- org.eclipse.ocl.common.ui;bundle-version="1.1.0",

- org.eclipse.ocl.ecore;bundle-version="3.3.0",

- org.eclipse.uml2.uml.resources,

- org.objectweb.asm;bundle-version="[5.0.1,

- 6.0.0)";resolution:=optional,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.gmf.runtime.common.ui.services,

- org.eclipse.papyrus.uml.alf.libraries;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.uml.alf.AlfActivator

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.junit4,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.alf,
+ org.eclipse.papyrus.uml.alf.formatting,
+ org.eclipse.papyrus.uml.alf.generator,
+ org.eclipse.papyrus.uml.alf.impl,
+ org.eclipse.papyrus.uml.alf.parser.antlr,
+ org.eclipse.papyrus.uml.alf.parser.antlr.internal,
+ org.eclipse.papyrus.uml.alf.scoping,
+ org.eclipse.papyrus.uml.alf.serializer,
+ org.eclipse.papyrus.uml.alf.services,
+ org.eclipse.papyrus.uml.alf.util,
+ org.eclipse.papyrus.uml.alf.validation
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.xtext.common.types;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.emf.codegen.ui;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.ocl.common.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)",
+ org.objectweb.asm;bundle-version="[5.0.0,6.0.0)";resolution:=optional,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.libraries;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.alf.AlfActivator
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf;singleton:=true
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
index e2552a449d5..6827d32a0eb 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
@@ -20,10 +20,28 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
index dc0cb12bca6..3d4a1ae9b09 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
@@ -1,25 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.uml.profile.types.generator.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ com.google.inject;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
index 12b59618d12..5f0bb01b225 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
@@ -25,11 +25,29 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
index ef6af45fc25..bd864312bbc 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
@@ -1,18 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.uml.filters;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ com.google.inject;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator,
  org.eclipse.papyrus.uml.profile.assistants.generator.internal;x-internal:=true
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
index 4e3786687a1..40df7cdc1cc 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
@@ -20,10 +20,28 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
index cbb2d4def1b..f5e494e8142 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
@@ -1,35 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.11.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="5.1.0",

- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",

- org.eclipse.xtend.lib;bundle-version="2.8.0",

- org.eclipse.xtend.lib.macro;bundle-version="2.8.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- com.google.inject;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",

- org.eclipse.ui;bundle-version="3.107.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.ui.ide;bundle-version="3.10.100",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal,

- org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers,

- org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ com.google.inject;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal,
+ org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers,
+ org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
index 9890647cdf6..e037d9c53c6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
@@ -25,11 +25,29 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
index 3b18f830ec2..088efcf1700 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
@@ -1,24 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.11.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="5.1.0",

- org.eclipse.xtend.lib;bundle-version="2.8.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- com.google.inject;bundle-version="3.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.profile.types.generator,

- org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ com.google.inject;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.profile.types.generator,
+ org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project
index 3e210335afd..dfb7cb38d4e 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
index 719c12e4ab6..fc1f757a41e 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
@@ -1,35 +1,24 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.common;visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",

- org.eclipse.ui;bundle-version="3.107.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.commands;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.messages;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.updaters;x-internal:=true

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.commands;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.messages;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.updaters;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project
index ff3c7c0fd61..b1b4c908fc9 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
index 9d6e1e283ea..79dd160e3fc 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
@@ -1,27 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable;bundle-version="1.4.1",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.emf.edit;bundle-version="2.10.0",
- org.eclipse.emf.transaction;bundle-version="1.8.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.emf.databinding;bundle-version="1.3.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.decoratormodel.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.decoratormodel.ui;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.properties.constraints;x-internal:=true,
  org.eclipse.papyrus.uml.decoratormodel.properties,
  org.eclipse.papyrus.uml.decoratormodel.properties.elements,
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project
index 10b0b694c9b..befe24320cb 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
index ef8389443d5..4dfae902cc3 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
@@ -1,44 +1,27 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.decoratormodel;bundle-version="1.2.0",

- org.eclipse.emf.edit.ui;bundle-version="2.10.0",

- org.eclipse.core.expressions;bundle-version="3.4.600",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.editor;bundle-version="1.2.0",

- org.eclipse.ui.ide;bundle-version="3.10.100",

- org.eclipse.ui.navigator;bundle-version="3.5.500",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0";resolution:=optional,

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.ui,

- org.eclipse.papyrus.uml.decoratormodel.internal.ui.commands;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",

- org.eclipse.papyrus.uml.decoratormodel.internal.ui.expressions;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.ui.preferences;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.ui.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",

- org.eclipse.papyrus.uml.decoratormodel.internal.ui.wizards;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",

- org.eclipse.papyrus.uml.decoratormodel.ui.providers

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.decoratormodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.ui,
+ org.eclipse.papyrus.uml.decoratormodel.internal.ui.commands;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
+ org.eclipse.papyrus.uml.decoratormodel.internal.ui.expressions;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.ui.preferences;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.ui.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
+ org.eclipse.papyrus.uml.decoratormodel.internal.ui.wizards;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties",
+ org.eclipse.papyrus.uml.decoratormodel.ui.providers
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java
index 7877625fea4..e18ed782b6d 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/src/org/eclipse/papyrus/uml/decoratormodel/internal/ui/wizards/DuplicateDecoratorModelWizard.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.infra.ui.util.ICallableWithProgress;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
 import org.eclipse.papyrus.infra.ui.util.UIUtil;
 import org.eclipse.papyrus.uml.decoratormodel.helper.DecoratorModelUtils;
 import org.eclipse.papyrus.uml.decoratormodel.internal.resource.DecoratorModelCopier;
@@ -87,7 +87,7 @@ public class DuplicateDecoratorModelWizard extends Wizard {
 
 		if (!profileURIs.isEmpty() && (resourceURI != null)) {
 			try {
-				result = UIUtil.call(getContainer(), false, false, new ICallableWithProgress<Boolean>() {
+				result = UIUtil.call(getContainer(), false, false, new IProgressCallable<Boolean>() {
 
 					@Override
 					public Boolean call(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project
index cb1b41de6a3..b6836ffdd42 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
index e0f1b210c86..d44877b9cdb 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
@@ -1,43 +1,34 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,

- org.eclipse.uml2.common;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.core.expressions;bundle-version="3.4.600",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.decoratormodel,

- org.eclipse.papyrus.uml.decoratormodel.helper,

- org.eclipse.papyrus.uml.decoratormodel.internal.commands;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.expressions;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.messages;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.internal.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui",

- org.eclipse.papyrus.uml.decoratormodel.internal.resource;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui,

- org.eclipse.papyrus.uml.decoratormodel.properties,

- org.eclipse.papyrus.uml.decoratormodel.controlmode",

- org.eclipse.papyrus.uml.decoratormodel.internal.resource.index;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.model,

- org.eclipse.papyrus.uml.decoratormodel.profileExternalization,

- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.impl,

- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.internal.operations;x-internal:=true,

- org.eclipse.papyrus.uml.decoratormodel.profileExternalization.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.decoratormodel.internal.expressions

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.decoratormodel,
+ org.eclipse.papyrus.uml.decoratormodel.helper,
+ org.eclipse.papyrus.uml.decoratormodel.internal.commands;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.expressions;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.messages;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.internal.providers;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui",
+ org.eclipse.papyrus.uml.decoratormodel.internal.resource;x-friends:="org.eclipse.papyrus.uml.decoratormodel.ui,
+ org.eclipse.papyrus.uml.decoratormodel.properties,
+ org.eclipse.papyrus.uml.decoratormodel.controlmode",
+ org.eclipse.papyrus.uml.decoratormodel.internal.resource.index;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.model,
+ org.eclipse.papyrus.uml.decoratormodel.profileExternalization,
+ org.eclipse.papyrus.uml.decoratormodel.profileExternalization.impl,
+ org.eclipse.papyrus.uml.decoratormodel.profileExternalization.internal.operations;x-internal:=true,
+ org.eclipse.papyrus.uml.decoratormodel.profileExternalization.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.decoratormodel.internal.expressions
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project
index 2b3996b1ea0..01ca01b22c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.activity</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.activity</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 6f0f58b2e82..3e7c9822827 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -32,69 +32,27 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.ocl.ecore,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.emf.validation,
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation.ocl;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.e4.ui.css.core,
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- org.eclipse.core.databinding,
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project
index 2838f0c32a5..edbda77e46a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.clazz</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sourceforge.metrics.builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>net.sourceforge.metrics.nature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.clazz</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.metrics.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>net.sourceforge.metrics.nature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 4fdba116065..084bb754809 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -27,71 +27,27 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.ui,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.w3c.dom.svg,
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project
index 8dbce9f3765..4a6f8e0557b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.common.groups</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.common.groups</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index 8b0e0011220..12cd43346c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -1,27 +1,21 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

- org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

- org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

- org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

- org.eclipse.papyrus.uml.diagram.common.groups.preferences,

- org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

- org.eclipse.papyrus.uml.diagram.common.groups.utils

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.gmf.runtime.diagram.ui.properties,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,
+ org.eclipse.papyrus.uml.diagram.common.groups.core.utils,
+ org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,
+ org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,
+ org.eclipse.papyrus.uml.diagram.common.groups.preferences,
+ org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,
+ org.eclipse.papyrus.uml.diagram.common.groups.utils
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project
index 9cd85d73a58..4c65fe84f17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.common.palette.customaction</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.common.palette.customaction</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index 61b7943cf33..5d4524292e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -1,29 +1,15 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.ui.forms;bundle-version="3.5.100",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.gef;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

- org.eclipse.emf.edit.ui;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.customaction.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.customaction;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,
+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,
+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,
+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.customaction.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.customaction;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project
index 963f2cccf0a..0afd270191d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project
@@ -20,11 +20,29 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 3ecaf52fdd9..6b382e4a8cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -51,72 +51,37 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",
- org.eclipse.ui,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.printing,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.localizer;bundle-version="[1.2.0,2.0.0)",
  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
- org.w3c.dom.svg,
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="1.2.0",
- org.eclipse.e4.ui.css.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- org.eclipse.gef,
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.emf.common,
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
 Eclipse-BuddyPolicy: dependent
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project
index 4f1bf07ccf5..649c55f23e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.communication</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.communication</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index 2942ab1f6e8..e3d8bab813c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -24,59 +24,24 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.uml2.uml.resources;bundle-version="3.0.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project
index 524095e5ee8..1f7a0d7b52e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.component</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.component</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index ce803fec621..c747b6edf25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -9,65 +9,24 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.navigator.resources,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project
index b78e12315ee..c637e855469 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.composite</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.composite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 01c7d4c597b..c746dafc200 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -31,64 +31,19 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.ocl.ecore;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project
index ccba543b97a..c782a0aebea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
index 0ba913e9a45..0f4aa989ec2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
@@ -1,16 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gef;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project
index 19661f6acfa..3252b25c451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.css</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.css</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index 871ac4b0898..3ac4c9a653e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -1,17 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project
index fe1300c9f08..8f7441fcece 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.deployment</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.deployment</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index 4d5e651e793..ed89286d80c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -24,53 +24,14 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.draw2d,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit,
- org.eclipse.emf.validation,
- org.eclipse.gef,
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project
index b7ebdc8abe8..e972f4414e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.dnd</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.dnd</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index 02c51fd531b..a5b15691021 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -1,28 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.dnd,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

-Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: UML Drag and Drop

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.dnd,
+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,
+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,
+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: UML Drag and Drop
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project
index 1f18a36c179..c39ee498f0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.emftree</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.emftree</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index fc15b8dac81..6fdf057c8ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -1,20 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.emftree

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.uml2.uml.editor;bundle-version="4.1.0",

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.emftree
+Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project
index f9e1abb7867..bf0127fb9ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.icons</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.icons</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
index 1c1da81c922..64835c7df33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project
index f57e2d89482..4fef574785b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.interactionoverview</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.interactionoverview</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index 2368b688837..5f6f7e26cc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -13,53 +13,19 @@ Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,
  org.eclipse.papyrus.uml.diagram.interactionoverview.preferences,
  org.eclipse.papyrus.uml.diagram.interactionoverview.provider,
  org.eclipse.papyrus.uml.diagram.interactionoverview.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.emf.common.ui;bundle-version="2.7.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.2.0",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project
index b56ed6caf35..8026aaadbbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
index 6363520a3e7..e9d12326b08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
@@ -4,22 +4,15 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.uml.diagram.clazz,
- org.eclipse.papyrus.uml.diagram.activity,
- org.eclipse.papyrus.uml.diagram.communication,
- org.eclipse.papyrus.uml.diagram.component;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.papyrus.uml.diagram.composite,
- org.eclipse.papyrus.uml.diagram.deployment,
- org.eclipse.papyrus.uml.diagram.profile,
- org.eclipse.papyrus.infra.gmfdiag.commands
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project
index 93f9607b886..bbdf34cc357 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.menu</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.menu</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index 00273717956..d164ee3642c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -1,44 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.menu,

- org.eclipse.papyrus.uml.diagram.menu.actions,

- org.eclipse.papyrus.uml.diagram.menu.actions.handlers

-Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui.actions,

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

- org.eclipse.core.expressions,

- org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",

- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui.actions,

- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.menu,
+ org.eclipse.papyrus.uml.diagram.menu.actions,
+ org.eclipse.papyrus.uml.diagram.menu.actions.handlers
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project
index 6bd72793bdc..8888167d6df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.modelexplorer</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.modelexplorer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index 9ce93ecec5b..1c526657c7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -1,33 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.ui.navigator;bundle-version="3.4.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.uml2.uml.editor;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",

- org.eclipse.emf.ecore,

- org.eclipse.gmf.runtime.notation,

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project
index 3514764ee00..45dd87eb819 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.navigation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.navigation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index 86966af6828..aa220411c7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -1,14 +1,12 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.navigation

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.draw2d;bundle-version="3.7.1",

- org.eclipse.jface;bundle-version="3.8.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.navigation
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project
index 92110db9485..8f76c05a824 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index cf20e235d1d..be3a4187d2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -1,24 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",

- org.eclipse.emf.edit,

- org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.edit,

- org.eclipse.uml2.uml,

- org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project
index b5a8e22aa4d..d49cb5ad54d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.paletteconfiguration</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.paletteconfiguration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index 7094c183f1e..d33ea647142 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -1,29 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.uml2.uml,

- org.eclipse.ui,

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0",

- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.editor;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project
index caf470a3e08..57051138faa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.profile</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.profile</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index fa042aeafdd..00ea2d7c14e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -27,66 +27,20 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.draw2d,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit,
- org.eclipse.ocl.ecore,
- org.eclipse.emf.validation,
- org.eclipse.gef,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.databinding,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project
index d7d275116ac..a3b4ed3529a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.sequence</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.sequence</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 670fb010489..7971106be5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -12,51 +12,22 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.ui.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.uml2.uml.edit,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin
-Import-Package: org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.ui.emf.databinding,
- org.eclipse.papyrus.uml.tools.databinding,
- org.eclipse.papyrus.infra.properties.contexts,
- org.eclipse.papyrus.infra.properties.ui.modelelement
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project
index 5c5ab6228b0..0912c3632d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index ba378ad840f..30e0b2feb4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -24,64 +24,21 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.edit.ui,
- org.eclipse.emf.validation,
- org.eclipse.emf.validation.ocl;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jface,
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.ui.views,
- org.eclipse.uml2.uml,
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Ant-Version: Apache Ant 1.7.0
 Eclipse-LazyStart: true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project
index c089a144f4f..f58b4d06c9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.stereotype.edition</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.stereotype.edition</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index f1a00f50a3d..d909d8ea8e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -1,30 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.provider

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,

- 4.0.0)",

- org.eclipse.gmf.runtime.notation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition.provider
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project
index db6bdb3701e..86555b78036 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/.project
@@ -1,22 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.symbols.properties</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.symbols.properties</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
index 92ee89f6f28..2b0a089e60a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.symbols;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.symbols;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Version: 1.2.0.qualifier
 Bundle-Name: Symbols Properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project
index 4aed139c11b..e44b5a369c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.symbols</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.symbols</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 0e78e9aa9d5..ea4b9069273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -1,30 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.symbols,

- org.eclipse.papyrus.uml.diagram.symbols.provider

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.w3c.dom.svg;bundle-version="1.1.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
+ org.eclipse.papyrus.uml.diagram.symbols.provider
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project
index 4306e573035..d13bb2d8726 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.timing</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.timing</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 21b36511abf..435a818f603 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -24,54 +24,17 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.uml2.uml.edit,
- org.eclipse.emf.ecore.edit,
- org.eclipse.ocl.ecore,
- org.eclipse.emf.validation,
- org.eclipse.gef,
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.draw2d,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project
index a656d182354..3ec60897dd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.usecase</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.usecase</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 8ea0e30f2ed..76445dd7812 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -22,64 +22,24 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.emf.validation,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.ocl.ecore;bundle-version="3.2.0",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
- org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project
index 1cba13b6edb..26ff1c735ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.project
@@ -1,38 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.wizards</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>

-			<arguments>

-				<dictionary>

-					<key>src_container</key>

-					<value>transforms</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.diagram.wizards</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>src_container</key>
+					<value>transforms</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index ff7f5332b93..7ad553cd734 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -1,48 +1,30 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.wizards;uses:="org.eclipse.ui.plugin,

- org.osgi.framework,

- org.eclipse.papyrus.infra.core.log",

- org.eclipse.papyrus.uml.diagram.wizards.category,

- org.eclipse.papyrus.uml.diagram.wizards.command,

- org.eclipse.papyrus.uml.diagram.wizards.kind,

- org.eclipse.papyrus.uml.diagram.wizards.messages,

- org.eclipse.papyrus.uml.diagram.wizards.pages,

- org.eclipse.papyrus.uml.diagram.wizards.providers,

- org.eclipse.papyrus.uml.diagram.wizards.template,

- org.eclipse.papyrus.uml.diagram.wizards.transformation,

- org.eclipse.papyrus.uml.diagram.wizards.utils,

- org.eclipse.papyrus.uml.diagram.wizards.wizards

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",

- org.eclipse.m2m.qvt.oml;bundle-version="3.4.0",

- org.eclipse.emf.edit.ui;bundle-version="2.4.0",

- org.eclipse.emf.ecore.edit;bundle-version="2.4.0",

- org.eclipse.ui.intro;bundle-version="3.4.0",

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0";visibility:=reexport,

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",

- org.eclipse.core.expressions;bundle-version="3.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",

- org.eclipse.help;bundle-version="3.6.0",

- org.eclipse.papyrus.uml.extensionpoints,

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.wizards,
+ org.eclipse.papyrus.uml.diagram.wizards.category,
+ org.eclipse.papyrus.uml.diagram.wizards.command,
+ org.eclipse.papyrus.uml.diagram.wizards.kind,
+ org.eclipse.papyrus.uml.diagram.wizards.messages,
+ org.eclipse.papyrus.uml.diagram.wizards.pages,
+ org.eclipse.papyrus.uml.diagram.wizards.providers,
+ org.eclipse.papyrus.uml.diagram.wizards.template,
+ org.eclipse.papyrus.uml.diagram.wizards.transformation,
+ org.eclipse.papyrus.uml.diagram.wizards.utils,
+ org.eclipse.papyrus.uml.diagram.wizards.wizards
+Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project
index 15c8fb9cf9e..f13bdf452b4 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.modelexplorer.widgets</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.modelexplorer.widgets</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
index e27f3fa14a1..9297ac33329 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -1,20 +1,13 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets
+Require-Bundle: org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project
index 0505aedf2a3..e826b092baa 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.project
@@ -1,29 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.modelexplorer</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.modelexplorer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 5076ad882d5..116346da38e 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -4,41 +4,11 @@ Export-Package: org.eclipse.papyrus.uml.modelexplorer,
  org.eclipse.papyrus.uml.modelexplorer.handler,
  org.eclipse.papyrus.uml.modelexplorer.queries,
  org.eclipse.papyrus.uml.modelexplorer.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.ui.navigator;bundle-version="3.4.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project
index 6c0347ffde1..e9edf06b23a 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.clazz.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.clazz.config</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
index c3af8cac1bb..2c10e39ed10 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF
@@ -1,19 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,
- 2.0.0)",
- org.eclipse.emf.transaction;bundle-version="1.8.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,
- 2.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.0.1",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.nattable.clazz.config,
  org.eclipse.papyrus.uml.nattable.clazz.config.manager.axis
 Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project
index 923ca2e8835..5f716698217 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.generic.config</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.generic.config</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
index 493272067b0..1f6a8078b35 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF
@@ -1,14 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0"

-Export-Package: org.eclipse.papyrus.uml.nattable.generic.config

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: UML Generic Table Config

-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)"
+Export-Package: org.eclipse.papyrus.uml.nattable.generic.config
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: UML Generic Table Config
+Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project
index bff06e5cbd7..f418b7ea2f5 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.generic</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.generic</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
index c46c00a7dd8..89d7c9c09e0 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
@@ -1,19 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",

- org.eclipse.emf.common,

- org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="1.2.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project
index 72e7e1a0705..ee1b9ba7994 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.menu</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.menu</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index a3be8e06d6c..77d538288d6 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -3,25 +3,8 @@ Export-Package: org.eclipse.papyrus.uml.nattable.menu,
  org.eclipse.papyrus.uml.nattable.menu.handlers,
  org.eclipse.papyrus.uml.nattable.menu.messages,
  org.eclipse.papyrus.uml.nattable.menu.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project
index 87f78b5f830..8269dd927ee 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF
index fa3a9e161bb..726ab050fd7 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF
@@ -1,25 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="1.9.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.nattable.stereotype.display,
  org.eclipse.papyrus.uml.nattable.stereotype.display.configuration,
  org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider,
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project
index 77452aaf98e..9ca79ebe51b 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.xtext.integration</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.xtext.integration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
index c4c2ef9928b..f86fa86381f 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
@@ -2,19 +2,8 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.nattable.xtext.integration,
  org.eclipse.papyrus.uml.nattable.xtext.integration.celleditor,
  org.eclipse.papyrus.uml.nattable.xtext.integration.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.xtext;bundle-version="2.4.2",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,
- 2.0.0)",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.common.ui.services
+Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project
index 8f91204b6ab..83d95a8a247 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF
index fed79a90e67..d679c273371 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF
@@ -1,20 +1,9 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.ui,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="1.2.0",
- com.google.inject,
- org.eclipse.papyrus.uml.nattable.xtext.integration;bundle-version="1.2.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.xtext.integration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.uml.nattable.xtext.valuespecification,
  org.eclipse.papyrus.uml.nattable.xtext.valuespecification.celleditor,
  org.eclipse.papyrus.uml.nattable.xtext.valuespecification.manager.cell
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project
index 87987e77a69..05c72172cf3 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index c9ce2b53278..44a0bba9882 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -11,33 +11,10 @@ Export-Package: org.eclipse.papyrus.uml.nattable,
  org.eclipse.papyrus.uml.nattable.utils,
  org.eclipse.papyrus.uml.nattable.validator,
  org.eclipse.papyrus.uml.nattable.widget
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.core.expressions,
- org.eclipse.swt,
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.jface.text;bundle-version="3.10.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
index 6bd8c6d9025..5c2639507bb 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
index bf9e41f87bc..d748e85abe6 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
@@ -1,15 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.core.resources;bundle-version="3.9.100",

- org.eclipse.papyrus.uml.profile.newchildmenu.generator;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile.newchildmenu.generator;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
index 74a49b8fedd..50dc17fc6af 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.profile.newchildmenu.generator</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile.newchildmenu.generator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
index a1f6cece76e..ae6697f117f 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
@@ -1,20 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/.project b/plugins/uml/org.eclipse.papyrus.uml.appearance/.project
index a93dd622464..9b117e29ef5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.appearance/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.appearance</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.appearance</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
index eb5be03a814..911fae3260a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
@@ -1,20 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.appearance,

- org.eclipse.papyrus.uml.appearance.commands,

- org.eclipse.papyrus.uml.appearance.helper

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.appearance,
+ org.eclipse.papyrus.uml.appearance.commands,
+ org.eclipse.papyrus.uml.appearance.helper
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/.project b/plugins/uml/org.eclipse.papyrus.uml.commands/.project
index cd9248930f4..8e5f81162e0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.commands</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.commands</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
index b096c0428a4..c8928f44455 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF
@@ -1,31 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.common;bundle-version="2.7.0",

- org.eclipse.emf.ecore;bundle-version="2.7.0",

- org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",

- org.eclipse.core.expressions,

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.commands.command

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.commands;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.commands.command
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.commands;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project
index 3d0f26b8f04..16d96caab44 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.controlmode.profile</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.controlmode.profile</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index 34404d6b00f..de42a480c4d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -1,23 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.commands,
- org.eclipse.emf.ecore,
- org.eclipse.equinox.registry,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.emf.workspace,
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.emf.validation.ui;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"
+Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.validation.ui;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project
index 647c4a7d5a1..2e267c861cc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.documentation.profile</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.documentation.profile</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
index 162e16f1f0c..18af6498149 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml

-Export-Package: org.eclipse.papyrus.uml.documentation.Documentation,

- org.eclipse.papyrus.uml.documentation.Documentation.impl,

- org.eclipse.papyrus.uml.documentation.Documentation.util,

- org.eclipse.papyrus.uml.documentation.profile

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation.profile;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.documentation.Documentation,
+ org.eclipse.papyrus.uml.documentation.Documentation.impl,
+ org.eclipse.papyrus.uml.documentation.Documentation.util,
+ org.eclipse.papyrus.uml.documentation.profile
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation.profile;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project
index 75682541fd9..084d9b5077d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.project
@@ -1,33 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.extensionpoints</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.ibm.etools.common.migration.MigrationBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.extensionpoints</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.etools.common.migration.MigrationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
index 30851acb885..bd15718513b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF
@@ -1,21 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.uml2.uml,

- org.eclipse.ui.views.properties.tabbed,

- org.eclipse.emf.mapping.ecore2xml,

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.extensionpoints,

- org.eclipse.papyrus.uml.extensionpoints.library,

- org.eclipse.papyrus.uml.extensionpoints.metamodel,

- org.eclipse.papyrus.uml.extensionpoints.profile,

- org.eclipse.papyrus.uml.extensionpoints.standard,

- org.eclipse.papyrus.uml.extensionpoints.utils

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.extensionpoints.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.extensionpoints;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.extensionpoints,
+ org.eclipse.papyrus.uml.extensionpoints.library,
+ org.eclipse.papyrus.uml.extensionpoints.metamodel,
+ org.eclipse.papyrus.uml.extensionpoints.profile,
+ org.eclipse.papyrus.uml.extensionpoints.standard,
+ org.eclipse.papyrus.uml.extensionpoints.utils
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.extensionpoints.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.extensionpoints;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project
index f2e607fe426..3189281bb43 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF
index 6531167d364..f667db051b9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.filters;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,

- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,

- org.eclipse.emf.ecore.edit;bundle-version="2.9.0";visibility:=reexport,

- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.papyrus.infra.filters.edit;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,

- org.eclipse.uml2.uml.edit;bundle-version="5.0.0";visibility:=reexport,

- org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport

-Export-Package: org.eclipse.papyrus.uml.filters.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.filters.provider.UMLFiltersEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.uml.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.filters.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.filters.provider.UMLFiltersEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/.project b/plugins/uml/org.eclipse.papyrus.uml.filters/.project
index 3c6c6df4f39..3c1eefe8df6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/.project
@@ -20,10 +20,32 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
index 78ba264423e..5d21cea0493 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
@@ -1,26 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,

- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,

- org.eclipse.uml2.common;bundle-version="2.0.100";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"

-Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,

- org.eclipse.papyrus.uml.filters,

- org.eclipse.papyrus.uml.filters.impl,

- org.eclipse.papyrus.uml.filters.internal.operations,

- org.eclipse.papyrus.uml.filters.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
+ org.eclipse.papyrus.uml.filters,
+ org.eclipse.papyrus.uml.filters.impl,
+ org.eclipse.papyrus.uml.filters.internal.operations,
+ org.eclipse.papyrus.uml.filters.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/.project b/plugins/uml/org.eclipse.papyrus.uml.icons/.project
index 75b2e26e7e4..2af1c62ff3f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.icons/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.icons/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.icons</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.icons</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
index f71b6ccc45c..a340cf2e88d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime

-Export-Package: org.eclipse.papyrus.uml.icons

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.icons.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.icons;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.icons
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.icons.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.icons;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/.project b/plugins/uml/org.eclipse.papyrus.uml.import/.project
index 888ada1bb42..b4b372b52aa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.import</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.import</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
index e5267044220..a390b26919e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF
@@ -1,26 +1,14 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.uml2.common.edit,

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project
index e2dddd88c5d..ddb76c3a7f4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.modelrepair</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.modelrepair</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index d0a66692331..12c48ee2c33 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -1,43 +1,24 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.modelrepair,

- org.eclipse.papyrus.uml.modelrepair.handler,

- org.eclipse.papyrus.uml.modelrepair.internal.participants;x-internal:=true,

- org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-friends:="org.eclipse.papyrus.migration.rsa",

- org.eclipse.papyrus.uml.modelrepair.internal.validation;x-internal:=true,

- org.eclipse.papyrus.uml.modelrepair.service,

- org.eclipse.papyrus.uml.modelrepair.ui,

- org.eclipse.papyrus.uml.modelrepair.ui.providers,

- org.eclipse.papyrus.uml.modelrepair.validation

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.emf.edit;bundle-version="2.9.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.emf.edit.ui;bundle-version="2.10.0",

- org.eclipse.uml2.uml.edit;bundle-version="5.0.0",

- org.eclipse.ui.ide;bundle-version="3.10.100",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Model Repair

-Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.modelrepair,
+ org.eclipse.papyrus.uml.modelrepair.handler,
+ org.eclipse.papyrus.uml.modelrepair.internal.participants;x-internal:=true,
+ org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;x-friends:="org.eclipse.papyrus.migration.rsa",
+ org.eclipse.papyrus.uml.modelrepair.internal.validation;x-internal:=true,
+ org.eclipse.papyrus.uml.modelrepair.service,
+ org.eclipse.papyrus.uml.modelrepair.ui,
+ org.eclipse.papyrus.uml.modelrepair.ui.providers,
+ org.eclipse.papyrus.uml.modelrepair.validation
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Model Repair
+Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/.project b/plugins/uml/org.eclipse.papyrus.uml.navigation/.project
index aa78a240712..6f1f93d4699 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.navigation/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.navigation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.navigation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
index 79d67725a67..409932f93c3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF
@@ -1,15 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project
index e09a029b02f..1993ba6cfd8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.oclconstraintevaluation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.oclconstraintevaluation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
index 3ffe9f9e1b5..977d5caabcf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF
@@ -1,17 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.commands;bundle-version="1.2.0",

- org.eclipse.ui.console;bundle-version="3.5.100",

- org.eclipse.ocl.pivot.uml;bundle-version="[1.0.0,

- 2.0.0)",

- org.eclipse.uml2.uml;bundle-version="5.0.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.oclconstraintevaluation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.uml.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.oclconstraintevaluation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/.project b/plugins/uml/org.eclipse.papyrus.uml.perspective/.project
index 3d80b2de359..95f1f59d041 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.perspective</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.perspective</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
index e37ed380e4d..b63f49c37ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
@@ -1,17 +1,16 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.perspective

-Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",

- org.eclipse.ui;bundle-version="3.7.0",

- org.eclipse.ui.ide;bundle-version="3.6.100",

- org.eclipse.core.runtime;bundle-version="3.6.100",

- org.eclipse.papyrus.views.validation;bundle-version="1.2.0",

- org.eclipse.ui.navigator;bundle-version="3.5.500"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.perspective;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.perspective
+Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.views.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.perspective;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.profile/.project
index 25b75930090..b62b2179491 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/.project
@@ -1,33 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.profile</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.ibm.etools.common.migration.MigrationBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.etools.common.migration.MigrationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index b53fddad024..e5ad8322262 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -1,48 +1,32 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.profile,

- org.eclipse.papyrus.uml.profile.constraints,

- org.eclipse.papyrus.uml.profile.definition,

- org.eclipse.papyrus.uml.profile.preference,

- org.eclipse.papyrus.uml.profile.providers,

- org.eclipse.papyrus.uml.profile.service,

- org.eclipse.papyrus.uml.profile.structure,

- org.eclipse.papyrus.uml.profile.tree,

- org.eclipse.papyrus.uml.profile.tree.objects,

- org.eclipse.papyrus.uml.profile.ui.dialogs,

- org.eclipse.papyrus.uml.profile.ui.items,

- org.eclipse.papyrus.uml.profile.utils,

- org.eclipse.papyrus.uml.profile.validation,

- org.eclipse.papyrus.uml.profile.wizard

-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.ui,

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.uml2.uml.editor;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.profile,
+ org.eclipse.papyrus.uml.profile.constraints,
+ org.eclipse.papyrus.uml.profile.definition,
+ org.eclipse.papyrus.uml.profile.preference,
+ org.eclipse.papyrus.uml.profile.providers,
+ org.eclipse.papyrus.uml.profile.service,
+ org.eclipse.papyrus.uml.profile.structure,
+ org.eclipse.papyrus.uml.profile.tree,
+ org.eclipse.papyrus.uml.profile.tree.objects,
+ org.eclipse.papyrus.uml.profile.ui.dialogs,
+ org.eclipse.papyrus.uml.profile.ui.items,
+ org.eclipse.papyrus.uml.profile.utils,
+ org.eclipse.papyrus.uml.profile.validation,
+ org.eclipse.papyrus.uml.profile.wizard
+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project
index ea647c2c603..88883a5ae3d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.resourceloading.profile</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.resourceloading.profile</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
index 59452cb6fcd..448bf599dd3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF
@@ -1,12 +1,10 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.resourceloading.profile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.resourceloading.profile;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project
index ae9fd8fd6a5..3d916874105 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.search.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.search.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
index 565cf6ced20..211b56b216c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
@@ -4,34 +4,18 @@ Export-Package: org.eclipse.papyrus.uml.search.ui.actions,
  org.eclipse.papyrus.uml.search.ui.query,
  org.eclipse.papyrus.uml.search.ui.results,
  org.eclipse.papyrus.uml.search.ui.validator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.search;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.8.1",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.views.search;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.ui.ide;bundle-version="3.8.100",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.100",
- org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.jface,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.ocl.pivot.uml;bundle-version="1.0.0",
- org.eclipse.ocl.examples.xtext.console;bundle-version="4.0.0",
- org.eclipse.ltk.ui.refactoring;bundle-version="3.7.100",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.search;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.ocl.examples.xtext.console;bundle-version="[4.1.0,5.0.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)"
 Bundle-Vendor: %vendorName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project
index edb9fa8674d..ef42ad99ecd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
index 45a58498b8a..b2f2c9769fd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0",
- org.eclipse.ui.workbench,
- org.eclipse.core.expressions,
- org.eclipse.jface,
- org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.uml2.uml.profile.standard,
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.emf.edit.ui,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/.project b/plugins/uml/org.eclipse.papyrus.uml.service.types/.project
index 994e51097a8..a98142ff579 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.service.types</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.service.types</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index 2faf54879de..3d62042e9ba 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -6,29 +6,11 @@ Export-Package: org.eclipse.papyrus.uml.service.types,
  org.eclipse.papyrus.uml.service.types.helper,
  org.eclipse.papyrus.uml.service.types.helper.advice,
  org.eclipse.papyrus.uml.service.types.utils
-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0",
- org.eclipse.core.expressions,
- org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.uml2.uml.profile.standard,
- org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.types.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project
index 6ab636d770f..90d2f05bbcf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.service.validation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.service.validation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
index a7e2f7e9e3b..804905fe522 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF
@@ -1,23 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.service.validation,

- org.eclipse.papyrus.uml.service.validation.internal;x-internal:=true,

- org.eclipse.papyrus.uml.service.validation.oclpivot

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.ocl.pivot;bundle-version="1.0.0",

- org.eclipse.ocl.pivot.uml;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.service.validation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.service.validation,
+ org.eclipse.papyrus.uml.service.validation.internal;x-internal:=true,
+ org.eclipse.papyrus.uml.service.validation.oclpivot
+Require-Bundle: org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.service.validation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project
index da7a6039bb4..294a796ab75 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.services.decoration</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.services.decoration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
index 814567f1f10..8bd218753c7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF
@@ -1,21 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.apache.commons.lang;bundle-version="2.4.0",

- org.eclipse.emf.ecore;bundle-version="2.8.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.resources;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.services.decoration;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.services.decoration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project
index 13fae6badfe..4355b5a99c0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.templaterepository</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.templaterepository</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
index 2905f387580..b3b6b854afa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF
@@ -1,17 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.templaterepository

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.templaterepository;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.templaterepository
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.templaterepository;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/.project b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project
index 6656315c90a..7cb455601cf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.types.core</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.types.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
index c07477230e8..083941362e4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
@@ -1,55 +1,38 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.types;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.swt,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.types.rulebased;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.emf.types;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.types.core,

- org.eclipse.papyrus.uml.types.core.advices.applystereotype,

- org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl,

- org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider,

- org.eclipse.papyrus.uml.types.core.advices.applystereotype.util,

- org.eclipse.papyrus.uml.types.core.advices.settype,

- org.eclipse.papyrus.uml.types.core.advices.settype.impl,

- org.eclipse.papyrus.uml.types.core.advices.settype.provider,

- org.eclipse.papyrus.uml.types.core.advices.settype.util,

- org.eclipse.papyrus.uml.types.core.commands,

- org.eclipse.papyrus.uml.types.core.edithelper,

- org.eclipse.papyrus.uml.types.core.matchers.stereotype,

- org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl,

- org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider,

- org.eclipse.papyrus.uml.types.core.matchers.stereotype.util,

- org.eclipse.papyrus.uml.types.core.requests,

- org.eclipse.papyrus.uml.types.core.rules,

- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype,

- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl,

- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider,

- org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.papyrus.uml.types.core,
+ org.eclipse.papyrus.uml.types.core.advices.applystereotype,
+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl,
+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider,
+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.util,
+ org.eclipse.papyrus.uml.types.core.advices.settype,
+ org.eclipse.papyrus.uml.types.core.advices.settype.impl,
+ org.eclipse.papyrus.uml.types.core.advices.settype.provider,
+ org.eclipse.papyrus.uml.types.core.advices.settype.util,
+ org.eclipse.papyrus.uml.types.core.commands,
+ org.eclipse.papyrus.uml.types.core.edithelper,
+ org.eclipse.papyrus.uml.types.core.matchers.stereotype,
+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl,
+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider,
+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.util,
+ org.eclipse.papyrus.uml.types.core.requests,
+ org.eclipse.papyrus.uml.types.core.rules,
+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype,
+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl,
+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider,
+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project
index fbeba4f82ac..3b1cd629141 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.ui.perspectiveconfiguration</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.ui.perspectiveconfiguration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
index d7b797532c9..8ec584887b3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui.perspectiveconfiguration/META-INF/MANIFEST.MF
@@ -1,14 +1,12 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.ui.perspectiveconfiguration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.ui.perspectiveconfiguration;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.ui.perspectiveconfiguration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.ui.perspectiveconfiguration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/.project b/plugins/uml/org.eclipse.papyrus.uml.ui/.project
index 1d8aa5623a4..02eee166cf5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui/.project
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF
index a43dbbc63d6..ef8d6d7102e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF
@@ -1,36 +1,14 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.ui.internal.adapters;x-internal:=true
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.uml2.uml.validation;bundle-version="5.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.jface.text;bundle-version="3.10.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.validation;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project
index 3b08355ec69..764d7b16364 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.profile.drafter.documentation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile.drafter.documentation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project
index 1af56d1d554..b57cf827395 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.project
@@ -1,28 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.profile.drafter</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile.drafter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
index 859a9085f13..0799eab4c15 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
@@ -1,32 +1,12 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.emf.common,
- org.eclipse.emf.transaction,
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.core.databinding,
- org.eclipse.core.databinding.beans,
- org.eclipse.core.databinding.observable,
- org.eclipse.core.databinding.property,
- org.eclipse.jface.databinding,
- com.ibm.icu,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
+ com.ibm.icu
 Export-Package: org.eclipse.papyrus.uml.profile.drafter,
  org.eclipse.papyrus.uml.profile.drafter.exceptions,
  org.eclipse.papyrus.uml.profile.drafter.ui.handler,
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project
index 1d798513068..1d2751ac903 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.properties.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.properties.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
index 931b08284da..90ae9fed076 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF
@@ -1,25 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.ui.forms;bundle-version="3.6.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",
- org.eclipse.xtext;bundle-version="2.4.2",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.100",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
index b8670ab1c97..f25e6c48e8c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.project
@@ -1,29 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.properties</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.properties</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index fb233953585..80a5faa3fde 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -16,48 +16,16 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints,
  org.eclipse.papyrus.uml.properties.profile.ui.views,
  org.eclipse.papyrus.uml.properties.util,
  org.eclipse.papyrus.uml.properties.widgets
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.jface;bundle-version="3.6.1",
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.6.1",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.uml2.common.edit;bundle-version="1.6.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.gef;bundle-version="3.8.1",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.nattable.stereotype.display;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints"
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project
index 20c1bba8c2a..0d6cc9d3d88 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
index a73de87b2e1..10f52ec689b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF
@@ -1,36 +1,21 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="3.1.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.internal.UmlCollaborationUseActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.internal.UmlCollaborationUseActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project
index b9e7669247c..ff2f21be093 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
index cfc0f2abef7..f0be3ba429a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF
@@ -1,40 +1,33 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.generator,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.services,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.impl,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.util,

- org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.validation

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.services,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.impl,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.umlCollaborationUse.util,
+ org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.validation
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project
index 369d7dd0b4c..94ffbce0356 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.common.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.common.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
index 3a02a600672..ecb6fab4f64 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,27 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext.ui,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.common.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal.UmlCommonActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.common.xtext.ui.internal.UmlCommonActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project
index fd4f8c8830d..bc37b26f9dd 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.common.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.common.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
index f7932c07928..22b183c1757 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF
@@ -1,44 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.1",

- org.eclipse.jface,

- org.eclipse.ui.ide,

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.runtime;bundle-version="3.8.0",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext,

- org.eclipse.papyrus.uml.textedit.common.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.common.xtext.generator,

- org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.common.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.common.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.common.xtext.services,

- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon,

- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.impl,

- org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.util,

- org.eclipse.papyrus.uml.textedit.common.xtext.validation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext,
+ org.eclipse.papyrus.uml.textedit.common.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.common.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.common.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.common.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.common.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.common.xtext.services,
+ org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon,
+ org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.impl,
+ org.eclipse.papyrus.uml.textedit.common.xtext.umlCommon.util,
+ org.eclipse.papyrus.uml.textedit.common.xtext.validation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project
index 9ca32572cc7..9c3d38f3b35 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
index 91eea70e609..69eef4db640 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="1.2.0",

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project
index f6ad632b1c0..3579c81e3c4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
index 6110ca34347..a783b7d7f1c 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
@@ -1,38 +1,32 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.services,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.impl,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.util,

- org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.services,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.impl,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.uMLConnectionPointReference.util,
+ org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project
index cbecfdae5a5..c8fdad0d014 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
index d0e53d70d53..6d6cb28993f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
@@ -1,25 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="3.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",

- org.eclipse.ocl.pivot.ui;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.pivot.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project
index ff2e77035dd..c7b4247304f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.javaconstraint</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.javaconstraint</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
index 4bbc85fa4db..ad4abe66c1b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF
@@ -1,21 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.javaconstraint

-Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.jface.text,

- org.eclipse.emf.transaction,

- org.eclipse.uml2.uml,

- org.eclipse.emf.transaction,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.javaconstraint;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.javaconstraint
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.javaconstraint;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project
index bb144941801..85cd03aa5fa 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.message.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.message.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
index 4157f2829c2..7e06d2d8376 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF
@@ -1,36 +1,24 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.internal.UmlMessageActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.message.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.message.xtext.ui.internal.UmlMessageActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project
index 7ce9e977006..bf96e8b62b4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.message.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.message.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
index 5ab167af1ce..1b940abe7a8 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF
@@ -1,40 +1,34 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext,

- org.eclipse.papyrus.uml.textedit.message.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.message.xtext.generator,

- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.message.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.message.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.message.xtext.services,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl,

- org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util,

- org.eclipse.papyrus.uml.textedit.message.xtext.validation

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext,
+ org.eclipse.papyrus.uml.textedit.message.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.message.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.message.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.message.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.message.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.message.xtext.services,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.impl,
+ org.eclipse.papyrus.uml.textedit.message.xtext.umlMessage.util,
+ org.eclipse.papyrus.uml.textedit.message.xtext.validation
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project
index 5cf40888788..a5704185cce 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.parameter.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
index 65f212a6ce6..b17ce01c284 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF
@@ -1,35 +1,24 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.uml2.uml,

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.parameter.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.internal.UmlParameterActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project
index 732d86ba1ba..b649372f572 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.parameter.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.parameter.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
index 3f068158587..4c42bbe911f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF
@@ -1,40 +1,33 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.generator,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.services,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.impl,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.util,

- org.eclipse.papyrus.uml.textedit.parameter.xtext.validation

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.services,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.impl,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.umlParameter.util,
+ org.eclipse.papyrus.uml.textedit.parameter.xtext.validation
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project
index 32c3f268785..24d06d585fc 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.port.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.port.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
index 351d6b6f686..aab7279e816 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF
@@ -1,39 +1,29 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext.ui,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.contribution,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.port.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.xtext.ui,

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui.editors,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="1.2.0",

- org.eclipse.emf.transaction,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal.UmlPortActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.contribution,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.port.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.textedit.port.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.xtext.ui.internal.UmlPortActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project
index 4f933ab959f..400e14bab04 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.port.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.port.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
index b640a58d088..e7faccd1850 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF
@@ -1,40 +1,34 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext,

- org.eclipse.papyrus.uml.textedit.port.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.port.xtext.generator,

- org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.port.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.port.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.port.xtext.services,

- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort,

- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.impl,

- org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.util,

- org.eclipse.papyrus.uml.textedit.port.xtext.validation

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.xbase;resolution:=optional,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext,
+ org.eclipse.papyrus.uml.textedit.port.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.port.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.port.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.port.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.port.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.port.xtext.services,
+ org.eclipse.papyrus.uml.textedit.port.xtext.umlPort,
+ org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.impl,
+ org.eclipse.papyrus.uml.textedit.port.xtext.umlPort.util,
+ org.eclipse.papyrus.uml.textedit.port.xtext.validation
+Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project
index 3e661517be2..7ed4f1e1574 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.property.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.property.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
index 66c88f05641..7bc449d30a4 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF
@@ -1,39 +1,29 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.property.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.antlr.runtime,

- org.eclipse.xtext.builder,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal.UmlPropertyActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.property.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.xtext.ui.internal.UmlPropertyActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project
index b3763c47d78..02b1ecc9eef 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.property.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.property.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
index 65862bb9139..3fbcf84b7c1 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF
@@ -1,41 +1,34 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.uml;bundle-version="5.0.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib

-Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext,

- org.eclipse.papyrus.uml.textedit.property.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.property.xtext.generator,

- org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.property.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.property.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.property.xtext.services,

- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty,

- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.impl,

- org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.util,

- org.eclipse.papyrus.uml.textedit.property.xtext.validation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext,
+ org.eclipse.papyrus.uml.textedit.property.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.property.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.property.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.property.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.property.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.property.xtext.services,
+ org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty,
+ org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.impl,
+ org.eclipse.papyrus.uml.textedit.property.xtext.umlProperty.util,
+ org.eclipse.papyrus.uml.textedit.property.xtext.validation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project
index 58ef9d920c1..fc9be8c7d15 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.state.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.state.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
index 9e6d12bb9cf..a1877fee927 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.state.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="1.2.0",

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.antlr.runtime,

- org.eclipse.xtext.builder,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.state.xtext.ui.internal.UmlStateActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.state.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.uml.textedit.state.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.state.xtext.ui.internal.UmlStateActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project
index 98ae44994fa..c381cfda046 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.state.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.state.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
index 50513fa4e96..25f4cc6dd5a 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF
@@ -1,39 +1,33 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext,

- org.eclipse.papyrus.uml.textedit.state.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.state.xtext.generator,

- org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.state.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.state.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.state.xtext.services,

- org.eclipse.papyrus.uml.textedit.state.xtext.umlState,

- org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl,

- org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util,

- org.eclipse.papyrus.uml.textedit.state.xtext.validation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext,
+ org.eclipse.papyrus.uml.textedit.state.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.state.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.state.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.state.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.state.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.state.xtext.services,
+ org.eclipse.papyrus.uml.textedit.state.xtext.umlState,
+ org.eclipse.papyrus.uml.textedit.state.xtext.umlState.impl,
+ org.eclipse.papyrus.uml.textedit.state.xtext.umlState.util,
+ org.eclipse.papyrus.uml.textedit.state.xtext.validation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project
index 95b0ea4721b..d26cd74a058 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
index c149c6d8aac..3b56cc53739 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
@@ -1,41 +1,28 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contributions,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.quickfix

-Bundle-ActivationPolicy: lazy

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="1.2.0",

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.papyrus.uml.alf.ui;bundle-version="1.2.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.commands;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal.AppliedStereotypePropertyActivator

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contributions,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.quickfix
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.uml.alf.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal.AppliedStereotypePropertyActivator
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui;singleton:=true
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project
index 3fd898362de..998c7456045 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.project
@@ -1,34 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
index b3f36bb8408..b53346eb1e3 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
@@ -1,49 +1,37 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.impl,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.util,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.formatting;uses:="org.eclipse.xtext.formatting.impl",

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.generator;uses:="org.eclipse.emf.ecore.resource,

- org.eclipse.xtext.generator",

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.scoping;uses:="org.eclipse.papyrus.alf.scoping",

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.services,

- org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.validation

-Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,

- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,

- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,

- org.eclipse.xtext.generator;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.1",

- org.eclipse.jface,

- org.eclipse.ui.ide,

- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.impl,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.appliedStereotypeProperty.util,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.services,
+ org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.validation
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional;visibility:=reexport,
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project
index 69ec1ec4c3e..aae59623684 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.transition.xtext.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
index 41a2a7ecfc9..619fbdbe4e7 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF
@@ -1,38 +1,28 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

- org.eclipse.ui.ide;bundle-version="3.5.0",

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.200",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.editor,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.transition.xtext.ui.quickfix

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal.UmlTransitionActivator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.uml.textedit.transition.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.editor,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.ui.quickfix
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal.UmlTransitionActivator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project
index c16ff2df3af..bd5afd5b7ba 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.project
@@ -1,34 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.textedit.transition.xtext</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.textedit.transition.xtext</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.missing.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
index 27cf25bf31e..3f4ee14bf65 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
@@ -1,37 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- com.ibm.icu;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

- org.apache.log4j;bundle-version="1.2.15",

- org.eclipse.papyrus.uml.alf.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,

- org.eclipse.papyrus.uml.textedit.transition.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.transition.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.transition.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.transition.xtext.services,

- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition,

- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.impl,

- org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.util,

- org.eclipse.papyrus.uml.textedit.transition.xtext.validation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ com.ibm.icu;resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.alf.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.services,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.impl,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.umlTransition.util,
+ org.eclipse.papyrus.uml.textedit.transition.xtext.validation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project
index b8b4db247c1..6d2761dd268 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF
index cdd426d33a3..366fec99989 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF
@@ -1,37 +1,26 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr.internal,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contribution,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.labeling,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.outline,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.quickfix

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.xtext.ui,

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui.editors,

- org.eclipse.xtext.builder,

- org.antlr.runtime,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.gmf.runtime.diagram.ui,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.uml2.uml,

- org.apache.log4j,

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contentassist.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.contribution,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.labeling,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.outline,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.quickfix
+Require-Bundle: org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project
index 8399f261ed4..5b4e535961f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.project
@@ -20,9 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
index e7058601403..7f412a36145 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
@@ -1,28 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore,

- org.eclipse.uml2.uml,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- com.google.inject,

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.xtext,

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",

- org.eclipse.ui.workbench,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;uses:="org.osgi.framework",

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.commands

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.services.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.commands
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project
index 8227d335487..1ebdd4c9560 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.project
@@ -25,10 +25,28 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
index 82c5e7541c7..b0e3fa9805f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
@@ -1,41 +1,35 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.xtext,

- org.eclipse.xtext.xbase;resolution:=optional,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.apache.log4j,

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0",

- org.eclipse.xtext.xbase.lib,

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.formatting,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.generator,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr.internal,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.scoping,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.serializer,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.services,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.validation,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl,

- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext;singleton:=true

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.codegen.ecore;bundle-version="[2.1.0,3.0.0)",
+ org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.formatting,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.generator,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.parser.antlr.internal,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.scoping,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.serializer,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.services,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.validation,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.impl,
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext;singleton:=true
+Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)",
+ org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project
index e34239b9d48..bdcd46debbd 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.extendedtypes</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.tools.extendedtypes</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
index 0c67abcd433..3c031558f2b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
@@ -1,18 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.swt,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.tools.extendedtypes,
  org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration,
  org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl,
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project
index 41cb67dc32e..7b23e278812 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.project
@@ -1,33 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.utils</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.ibm.etools.common.migration.MigrationBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.tools.utils</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.etools.common.migration.MigrationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
index 68a9cba3545..186c44bc435 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
@@ -1,25 +1,15 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.tools.utils

-Require-Bundle: org.eclipse.uml2.uml,

- org.eclipse.jface;bundle-version="3.4.1",

- org.eclipse.emf.transaction;bundle-version="1.2.1",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.ui.workbench;bundle-version="3.105.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.tools.utils
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project
index 8d8af580825..38a643d7683 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.tools</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 459f2aa312d..d67d9c4edfc 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -1,54 +1,34 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.tools,

- org.eclipse.papyrus.uml.tools.adapters,

- org.eclipse.papyrus.uml.tools.commands,

- org.eclipse.papyrus.uml.tools.databinding,

- org.eclipse.papyrus.uml.tools.helper,

- org.eclipse.papyrus.uml.tools.importsources,

- org.eclipse.papyrus.uml.tools.listeners,

- org.eclipse.papyrus.uml.tools.model,

- org.eclipse.papyrus.uml.tools.namereferences,

- org.eclipse.papyrus.uml.tools.profile.definition,

- org.eclipse.papyrus.uml.tools.profile.index,

- org.eclipse.papyrus.uml.tools.providers,

- org.eclipse.papyrus.uml.tools.service,

- org.eclipse.papyrus.uml.tools.util

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.uml2.uml;bundle-version="4.1.0";visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.uml2.common.edit;bundle-version="1.6.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.0",

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.uml2.uml.validation;bundle-version="5.0.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.jface.text;bundle-version="3.10.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: UML Tools

-Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.tools,
+ org.eclipse.papyrus.uml.tools.adapters,
+ org.eclipse.papyrus.uml.tools.commands,
+ org.eclipse.papyrus.uml.tools.databinding,
+ org.eclipse.papyrus.uml.tools.helper,
+ org.eclipse.papyrus.uml.tools.importsources,
+ org.eclipse.papyrus.uml.tools.listeners,
+ org.eclipse.papyrus.uml.tools.model,
+ org.eclipse.papyrus.uml.tools.namereferences,
+ org.eclipse.papyrus.uml.tools.profile.definition,
+ org.eclipse.papyrus.uml.tools.profile.index,
+ org.eclipse.papyrus.uml.tools.providers,
+ org.eclipse.papyrus.uml.tools.service,
+ org.eclipse.papyrus.uml.tools.util
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml.validation;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: UML Tools
+Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project
index 9560df3c7f9..d384e3209c9 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.xtext.integration.core</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.xtext.integration.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
index 66fe8440641..d5f1712e0b9 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.xtext.integration.core

-Require-Bundle: org.eclipse.xtext;bundle-version="2.4.2"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: XText integration Core

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.xtext.integration.core
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: XText integration Core
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project
index 49c19d81dda..f10ccb864e8 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.xtext.integration.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.xtext.integration.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
index f413836bd16..d1102c0f444 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,18 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.xtext.integration,

- org.eclipse.papyrus.uml.xtext.integration.job

-Require-Bundle: org.eclipse.gef;bundle-version="3.9.0",

- org.eclipse.core.runtime;bundle-version="3.9.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

- org.eclipse.xtext;bundle-version="2.4.2",

- org.eclipse.xtext.ui;bundle-version="2.4.2",

- org.eclipse.ui.ide;bundle-version="3.9.0",

- org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: GMF Xtext Integration

-Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activator

-Bundle-ManifestVersion: 2

-Import-Package: org.eclipse.papyrus.infra.services.validation,

- org.eclipse.papyrus.infra.services.validation.commands,

- org.eclipse.papyrus.uml.extensionpoints.profile,

- org.eclipse.papyrus.uml.extensionpoints.standard

-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.xtext.integration,
+ org.eclipse.papyrus.uml.xtext.integration.job
+Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: GMF Xtext Integration
+Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project
index 1b1ff726f88..7582fbe11ce 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.xtext.integration.validation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.xtext.integration.validation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
index f644ecbf98f..ce8f8b71346 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
@@ -1,17 +1,11 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.xtext.integration.validation

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",

- org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.emf.validation;bundle-version="1.7.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.2.0",

- org.eclipse.xtext;bundle-version="2.5.1",

- org.eclipse.jface;bundle-version="3.10.0",

- org.eclipse.ui;bundle-version="3.106.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: GMF Xtext Integration Validation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.xtext.integration.validation
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: GMF Xtext Integration Validation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5