upgrade pom.xml, MANIFEST.MF feature.xml versions (3.0.0 for MANIFEST.MF

and pom.xml with API breakage, 2.1.0 for others and feature.xml).

41 files changed, 81 insertions, 81 deletions

diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 4a2c05eb0..43bdf5041 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -19,7 +19,7 @@
 

     <groupId>org.eclipse.emf.compare</groupId>

     <artifactId>emf.compare-parent</artifactId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

     <packaging>pom</packaging>

 

     <licenses>

@@ -345,7 +345,7 @@
                             <artifact>

                                 <groupId>org.eclipse.emf.compare</groupId>

                                 <artifactId>org.eclipse.emf.compare</artifactId>

-                                <version>2.0.1-SNAPSHOT</version>

+                                <version>2.1.0-SNAPSHOT</version>

                                 <classifier>target_platforms/helios-sdk</classifier>

                             </artifact>

                         </target>

@@ -388,7 +388,7 @@
                             <artifact>

                                 <groupId>org.eclipse.emf.compare</groupId>

                                 <artifactId>org.eclipse.emf.compare</artifactId>

-                                <version>2.0.1-SNAPSHOT</version>

+                                <version>2.1.0-SNAPSHOT</version>

                                 <classifier>target_platforms/galileo-sdk</classifier>

                             </artifact>

                         </target>

diff --git a/packaging/org.eclipse.emf.compare-feature/feature.xml b/packaging/org.eclipse.emf.compare-feature/feature.xml
index 3039640cc..977aae181 100644
--- a/packaging/org.eclipse.emf.compare-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

diff --git a/packaging/org.eclipse.emf.compare-feature/pom.xml b/packaging/org.eclipse.emf.compare-feature/pom.xml
index 25eb7bfca..14896dd36 100644
--- a/packaging/org.eclipse.emf.compare-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
index 62cf57109..1eb582b71 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.diagram.ecoretools"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,8 +19,8 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

+      <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.0.qualifier"/>

       <import feature="org.eclipse.emf.ecoretools" version="1.0.0"/>

    </requires>

 

diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
index 122974e17..509f6dc07 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.diagram.ecoretools</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
index bd871ffec..d7945d1d8 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.diagram.gmf"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,8 +19,8 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

+      <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.0.qualifier"/>

       <import feature="org.eclipse.gmf.runtime.notation" version="1.5.0"/>

    </requires>

 

diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
index f9239a6ef..641bc40b5 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.diagram.gmf</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
index 4ab8bd967..5f3a72651 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.diagram.papyrus"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,8 +19,8 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

+      <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.0.qualifier"/>

       <import feature="org.eclipse.papyrus.uml.diagram.feature" version="0.8.0"/>

    </requires>

 

diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
index 7c7fc16d3..f95db2079 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.diagram.papyrus</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
index 2524b900c..0335360c0 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.ide.ui"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,7 +19,7 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

    </requires>

 

    <plugin

diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
index ac49511d7..d46f745f5 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.ide.ui</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
index 22a41a187..538f37f33 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.rcp.ui"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,7 +19,7 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

    </requires>

 

    <plugin

diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
index a33413f84..cc655915a 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml b/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
index a00e630d6..b6d87f409 100644
--- a/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.sysml-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.sysml"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,8 +19,8 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

+      <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.0.qualifier"/>

       <import feature="org.eclipse.papyrus.sysml.feature" version="0.9.0"/>

    </requires>

 

diff --git a/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml b/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
index 902faae4a..5e8f8e343 100644
--- a/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.sysml-feature/pom.xml
@@ -5,11 +5,11 @@
    <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

     <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.sysml</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
index 9f4d01659..c8ad76514 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.compare.uml2"

       label="%featureName"

-      version="2.0.1.qualifier"

+      version="2.1.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.compare">

 

@@ -19,8 +19,8 @@
    </license>

 

    <requires>

-      <import feature="org.eclipse.emf.compare" version="2.0.1.qualifier"/>

-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.0.1.qualifier"/>

+      <import feature="org.eclipse.emf.compare" version="2.1.0.qualifier"/>

+      <import feature="org.eclipse.emf.compare.ide.ui" version="2.1.0.qualifier"/>

       <import plugin="org.eclipse.uml2.uml" version="3.2.0" match="greaterOrEqual"/>

    </requires>

 

diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
index 7ad96a64c..bac56fd03 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare.features</groupId>

   <artifactId>org.eclipse.emf.compare.uml2</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/packaging/org.eclipse.emf.compare.update/pom.xml b/packaging/org.eclipse.emf.compare.update/pom.xml
index 8f2d4c6a2..6969a918e 100644
--- a/packaging/org.eclipse.emf.compare.update/pom.xml
+++ b/packaging/org.eclipse.emf.compare.update/pom.xml
@@ -14,7 +14,7 @@
     <parent>

         <artifactId>emf.compare-parent</artifactId>

         <groupId>org.eclipse.emf.compare</groupId>

-        <version>2.0.1-SNAPSHOT</version>

+        <version>2.1.0-SNAPSHOT</version>

         <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

     </parent>

 

@@ -22,7 +22,7 @@
     <packaging>eclipse-repository</packaging>

 

     <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

 

     <build>

         <plugins>

@@ -73,10 +73,10 @@
                             <tasks>

                                 <mkdir dir="${project.build.directory}/promotion"/>

                                 <echo file="${project.build.directory}/promotion/promote.properties"

-                                    message="#Intent promotion process.${line.separator}

-                                    build.alias=${BUILD_ALIAS}${line.separator}

-                                    build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}

-                                    version=${unqualifiedVersion}"/>

+                                    message="#EMFCompare promotion process.${line.separator}

+build.alias=${BUILD_ALIAS}${line.separator}

+build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}

+version=${unqualifiedVersion}"/>

                                 <copy file="p2.xsl" todir="${project.build.directory}/promotion"/>

                                 <copy file="promoter.xml" todir="${project.build.directory}/promotion" />

                             </tasks>

diff --git a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
index 85078167e..96de78cdd 100644
--- a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.doc; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml
index c137eb999..9400e0881 100644
--- a/plugins/org.eclipse.emf.compare.doc/pom.xml
+++ b/plugins/org.eclipse.emf.compare.doc/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.doc</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   
diff --git a/plugins/org.eclipse.emf.compare.edit/pom.xml b/plugins/org.eclipse.emf.compare.edit/pom.xml
index 5d7df1fbd..1a2db9dc7 100644
--- a/plugins/org.eclipse.emf.compare.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.edit/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.edit</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF
index ca8c877f6..54f1e78f4 100644
--- a/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.ide.tests
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.emf.compare.ide.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
index efdb6bb3f..8f6c931ad 100644
--- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare</groupId>

   <artifactId>org.eclipse.emf.compare.ide.tests</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

   

   <build>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF
index 59239f486..16ca75ab2 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui.tests;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
index 9f277e302..a43948d49 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare</groupId>

   <artifactId>org.eclipse.emf.compare.ide.ui.tests</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

 

   <properties>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
index b866eda42..c561fd243 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui;singleton:=true

-Bundle-Version: 2.0.1.qualifier

+Bundle-Version: 2.1.0.qualifier

 Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin

 Bundle-Vendor: %providerName

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

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
index 69f530c88..c2b30b70c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.ide/pom.xml b/plugins/org.eclipse.emf.compare.ide/pom.xml
index 114c12624..78800bebb 100644
--- a/plugins/org.eclipse.emf.compare.ide/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.ide</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
index 198beeb70..0f4be9429 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.rcp.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.emf.compare.rcp.ui.Activator
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
index 6f0eebf71..c090d2591 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
index 860212767..c45abbf29 100644
--- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.tests;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.emf.compare.tests.EMFCompareTestsPlugin
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml
index ef820d219..b6655efb5 100644
--- a/plugins/org.eclipse.emf.compare.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare</groupId>

   <artifactId>org.eclipse.emf.compare.tests</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

   

   <build>

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF
index bb07134b1..d6357548e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.uml2.edit;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.compare.uml2.provider.UMLCompareEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
index d64ab2922..27c3fabf6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.uml2.edit</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF
index 06bcc1d5e..33a2e157d 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UML2 Compare IDE UI Plug-in
 Bundle-SymbolicName: org.eclipse.emf.compare.uml2.ide.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.compare.uml2.edit;bundle-version="2.0.1",
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.uml2.ide.ui/pom.xml
index 050b46481..fc4f6e18d 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.uml2.ide.ui</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
index 86d3c03ee..f48a293d7 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.uml2.tests;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
index 94b6b9c29..615c8beaf 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>

     <artifactId>emf.compare-parent</artifactId>

     <groupId>org.eclipse.emf.compare</groupId>

-    <version>2.0.1-SNAPSHOT</version>

+    <version>2.1.0-SNAPSHOT</version>

     <relativePath>../../org.eclipse.emf.compare-parent</relativePath>

   </parent>

   <groupId>org.eclipse.emf.compare</groupId>

   <artifactId>org.eclipse.emf.compare.uml2.tests</artifactId>

-  <version>2.0.1-SNAPSHOT</version>

+  <version>2.1.0-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

  

   <build>

diff --git a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
index cba6a61a4..862dcdd42 100644
--- a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.uml2;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml
index e48f28f0a..7e2e9b478 100644
--- a/plugins/org.eclipse.emf.compare.uml2/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
      <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare.uml2</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>
diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml
index a5bfb8d8b..715be3e86 100644
--- a/plugins/org.eclipse.emf.compare/pom.xml
+++ b/plugins/org.eclipse.emf.compare/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>org.eclipse.emf.compare</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>