prep version 0.9.0
diff --git a/org.eclipse.emf.refactor.basic.feature/feature.xml b/org.eclipse.emf.refactor.basic.feature/feature.xml
index a3dde7f..580f496 100644
--- a/org.eclipse.emf.refactor.basic.feature/feature.xml
+++ b/org.eclipse.emf.refactor.basic.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.basic.feature"

       label="EMF Refactor - Basic (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -142,9 +142,6 @@
       <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.codegen" version="2.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.compare" version="1.1.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.diff" version="1.1.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.match" version="1.1.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.ui" version="1.1.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.change" version="2.5.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.edit" version="2.6.0" match="greaterOrEqual"/>

@@ -159,7 +156,9 @@
       <import plugin="org.eclipse.emf.refactor.smells.runtime" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.jdt.core" version="3.8.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.runtime" version="0.7.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.ui" version="1.3.2" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.emf.compare.edit"/>

+      <import plugin="org.eclipse.compare"/>

+      <import plugin="org.eclipse.emf.compare.ide.ui" version="3.0.1" match="greaterOrEqual"/>

    </requires>

 

    <plugin

diff --git a/org.eclipse.emf.refactor.comrel.feature/feature.xml b/org.eclipse.emf.refactor.comrel.feature/feature.xml
index 0290e09..bd4dcec 100644
--- a/org.eclipse.emf.refactor.comrel.feature/feature.xml
+++ b/org.eclipse.emf.refactor.comrel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.comrel.feature"

       label="EMF Refactor - CoMReL (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -159,52 +159,46 @@
       <import plugin="org.eclipse.emf.ecore" version="2.6.1" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.codegen" version="2.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.jdt.core" version="3.6.1" match="greaterOrEqual"/>

-      <import plugin="comrel" version="0.8.0" match="greaterOrEqual"/>

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

       <import plugin="org.eclipse.emf.refactor.refactoring.runtime" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.change"/>

+      <import plugin="org.eclipse.emf.refactor.comrel" version="0.8.0" match="greaterOrEqual"/>

    </requires>

 

    <plugin

-         id="comrel"

+         id="org.eclipse.emf.refactor.comrel"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

    <plugin

-         id="comrel.diagram"

+         id="org.eclipse.emf.refactor.comrel.diagram"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

    <plugin

-         id="comrel.edit"

+         id="org.eclipse.emf.refactor.comrel.edit"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

    <plugin

-         id="comrel.editor"

+         id="org.eclipse.emf.refactor.comrel.editor"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

    <plugin

-         id="comrel.generator"

+         id="org.eclipse.emf.refactor.comrel.generator"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

    <plugin

-         id="comrel.interpreter"

+         id="org.eclipse.emf.refactor.comrel.interpreter"

          download-size="0"

          install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+         version="0.0.0"/>

 

 </feature>

diff --git a/org.eclipse.emf.refactor.examples.compositional.feature/feature.xml b/org.eclipse.emf.refactor.examples.compositional.feature/feature.xml
index e7d71d8..4bd174c 100644
--- a/org.eclipse.emf.refactor.examples.compositional.feature/feature.xml
+++ b/org.eclipse.emf.refactor.examples.compositional.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.examples.compositional.feature"

       label="EMF Refactor - Compositional Examples (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -126,17 +126,17 @@
       <import plugin="org.eclipse.core.runtime"/>

       <import plugin="org.eclipse.emf.ecore" version="2.8.1" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.metrics" version="0.7.0" match="greaterOrEqual"/>

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

-      <import plugin="org.eclipse.emf.refactor.metrics.uml24" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.smells" version="0.7.0" match="greaterOrEqual"/>

-      <import plugin="comrel" version="0.8.0" match="greaterOrEqual"/>

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

       <import plugin="org.eclipse.emf.refactor.refactoring" version="0.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.runtime" version="0.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.ltk.ui.refactoring" version="3.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.ltk.core.refactoring" version="3.6.0" match="greaterOrEqual"/>

-      <import plugin="comrel.interpreter" version="0.8.0" match="greaterOrEqual"/>

       <import plugin="org.junit" version="4.10.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.emf.refactor.comrel" version="0.8.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.emf.refactor.comrel.interpreter" version="0.8.0" match="greaterOrEqual"/>

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

+      <import plugin="org.eclipse.emf.refactor.metrics.uml24" version="0.7.0" match="greaterOrEqual"/>

    </requires>

 

    <plugin

@@ -147,13 +147,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.metrics.uml24.compositional"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.refactor.smells.ecore.metricbased"

          download-size="0"

          install-size="0"

@@ -161,14 +154,21 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.smells.uml24.metricbased"

+         id="org.eclipse.emf.refactor.refactorings.uml24.compositional"

          download-size="0"

          install-size="0"

          version="0.0.0"

          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.refactorings.uml24.compositional"

+         id="org.eclipse.emf.refactor.metrics.uml24.compositional"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.emf.refactor.smells.uml24.metricbased"

          download-size="0"

          install-size="0"

          version="0.0.0"

diff --git a/org.eclipse.emf.refactor.examples.feature/feature.xml b/org.eclipse.emf.refactor.examples.feature/feature.xml
index 32435ed..579e6a9 100644
--- a/org.eclipse.emf.refactor.examples.feature/feature.xml
+++ b/org.eclipse.emf.refactor.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.examples.feature"

       label="EMF Refactor - Examples (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -134,19 +134,15 @@
       <import plugin="org.eclipse.emf.edit" version="2.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.xmi" version="2.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.transaction" version="1.4.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.ui" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.expressions" version="3.4.401" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.match" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>

       <import plugin="com.google.guava" version="10.0.1" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.diff" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.compare"/>

       <import plugin="org.eclipse.emf.refactor.metrics"/>

-      <import plugin="org.eclipse.uml2.uml"/>

       <import plugin="org.eclipse.emf.ecore" version="2.8.1" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.smells" version="0.7.0" match="greaterOrEqual"/>

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

       <import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.uml2.uml"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.runtime" version="0.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.papyrus" version="0.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.ltk.core.refactoring" version="3.6.0" match="greaterOrEqual"/>

@@ -155,6 +151,8 @@
       <import plugin="org.eclipse.emf.ecore" version="2.8.3" match="greaterOrEqual"/>

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

       <import plugin="org.eclipse.emf.refactor.refactorings.uml24" version="0.7.0" match="greaterOrEqual"/>

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

+      <import plugin="org.eclipse.emf.refactor.smells.eraser"/>

    </requires>

 

    <plugin

@@ -172,13 +170,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.metrics.uml24"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.refactor.smells.ecore"

          download-size="0"

          install-size="0"

@@ -186,13 +177,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.smells.uml24"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.refactor.refactorings.uml24"

          download-size="0"

          install-size="0"

@@ -206,4 +190,25 @@
          version="0.0.0"

          unpack="false"/>

 

+   <plugin

+         id="org.eclipse.emf.refactor.metrics.uml24"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.emf.refactor.smells.uml24"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.emf.refactor.relations.uml24"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

 </feature>

diff --git a/org.eclipse.emf.refactor.examples.henshin.feature/feature.xml b/org.eclipse.emf.refactor.examples.henshin.feature/feature.xml
index 85aee70..57f4084 100644
--- a/org.eclipse.emf.refactor.examples.henshin.feature/feature.xml
+++ b/org.eclipse.emf.refactor.examples.henshin.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.examples.henshin.feature"

       label="EMF Refactor - Examples Henshin (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -125,12 +125,12 @@
       <import plugin="org.eclipse.ui"/>

       <import plugin="org.eclipse.core.runtime"/>

       <import plugin="org.eclipse.emf.ecore"/>

-      <import plugin="org.eclipse.emf.ecore.change"/>

-      <import plugin="org.eclipse.ltk.core.refactoring"/>

-      <import plugin="org.eclipse.ltk.ui.refactoring"/>

       <import plugin="org.eclipse.emf.refactor.metrics"/>

       <import plugin="org.eclipse.emf.refactor.metrics.henshin"/>

       <import plugin="org.eclipse.uml2.uml"/>

+      <import plugin="org.eclipse.emf.ecore.change"/>

+      <import plugin="org.eclipse.ltk.core.refactoring"/>

+      <import plugin="org.eclipse.ltk.ui.refactoring"/>

       <import plugin="org.eclipse.emf.refactor.refactoring" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.runtime" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.refactoring.henshin" version="0.7.0" match="greaterOrEqual"/>

@@ -138,12 +138,9 @@
       <import plugin="org.eclipse.emf.henshin.interpreter" version="0.9.4" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.xmi" version="2.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.transaction" version="1.4.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.ui" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.expressions" version="3.4.401" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.match" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.compare" version="3.5.300" match="greaterOrEqual"/>

       <import plugin="com.google.guava" version="10.0.1" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.emf.compare.diff" version="1.3.2" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.compare"/>

       <import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.henshin.model" version="0.9.4" match="greaterOrEqual"/>

@@ -160,13 +157,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.metrics.uml24.henshin"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.refactor.refactorings.ecore.henshin"

          download-size="0"

          install-size="0"

@@ -188,6 +178,13 @@
          unpack="false"/>

 

    <plugin

+         id="org.eclipse.emf.refactor.metrics.uml24.henshin"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

          id="org.eclipse.emf.refactor.smells.uml24.henshin"

          download-size="0"

          install-size="0"

diff --git a/org.eclipse.emf.refactor.examples.ocl.feature/feature.xml b/org.eclipse.emf.refactor.examples.ocl.feature/feature.xml
index 49bd546..86959b8 100644
--- a/org.eclipse.emf.refactor.examples.ocl.feature/feature.xml
+++ b/org.eclipse.emf.refactor.examples.ocl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.examples.ocl.feature"

       label="EMF Refactor - Examples OCL (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -138,13 +138,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.emf.refactor.metrics.uml24.ocl"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.emf.refactor.refactorings.ecore.ocl"

          download-size="0"

          install-size="0"

@@ -166,6 +159,13 @@
          unpack="false"/>

 

    <plugin

+         id="org.eclipse.emf.refactor.metrics.uml24.ocl"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

          id="org.eclipse.emf.refactor.smells.uml24.ocl"

          download-size="0"

          install-size="0"

diff --git a/org.eclipse.emf.refactor.henshin.feature/feature.xml b/org.eclipse.emf.refactor.henshin.feature/feature.xml
index 6ae12f1..7f1344d 100644
--- a/org.eclipse.emf.refactor.henshin.feature/feature.xml
+++ b/org.eclipse.emf.refactor.henshin.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.henshin.feature"

       label="EMF Refactor - Henshin Adapter (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

diff --git a/org.eclipse.emf.refactor.ocl.feature/feature.xml b/org.eclipse.emf.refactor.ocl.feature/feature.xml
index 3b77c77..6e44006 100644
--- a/org.eclipse.emf.refactor.ocl.feature/feature.xml
+++ b/org.eclipse.emf.refactor.ocl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.ocl.feature"

       label="EMF Refactor - OCL Adapter (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

diff --git a/org.eclipse.emf.refactor.papyrus.feature/feature.xml b/org.eclipse.emf.refactor.papyrus.feature/feature.xml
index b489022..4705ba8 100644
--- a/org.eclipse.emf.refactor.papyrus.feature/feature.xml
+++ b/org.eclipse.emf.refactor.papyrus.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.papyrus.feature"

       label="EMF Refactor - Papyrus (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

@@ -137,6 +137,10 @@
       <import plugin="org.eclipse.emf.refactor.refactoring.generator" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.smells" version="0.7.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.refactor.smells.runtime" version="0.7.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.emf.refactor.refactoring.configuration" version="0.7.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.ltk.core.refactoring" version="3.6.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.7.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.emf.refactor.refactoring.papyrus" version="0.8.0" match="greaterOrEqual"/>

    </requires>

 

    <plugin

diff --git a/org.eclipse.emf.refactor.reporter.feature/feature.xml b/org.eclipse.emf.refactor.reporter.feature/feature.xml
index b4167a4..30af8d2 100644
--- a/org.eclipse.emf.refactor.reporter.feature/feature.xml
+++ b/org.eclipse.emf.refactor.reporter.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.reporter.feature"

       label="EMF Refactor - Reporter (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>

diff --git a/org.eclipse.emf.refactor.xtext.feature/feature.xml b/org.eclipse.emf.refactor.xtext.feature/feature.xml
index 5c05491..a0b0646 100644
--- a/org.eclipse.emf.refactor.xtext.feature/feature.xml
+++ b/org.eclipse.emf.refactor.xtext.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.refactor.xtext.feature"

       label="EMF Refactor - Xtext (Incubation)"

-      version="0.8.0.qualifier"

+      version="0.9.0.qualifier"

       provider-name="Eclipse Modeling Project">

 

    <description>