modularize build

Sets of modules can now be manually enabled using specific profiles.
This allows us to disable UML when building against Indigo or earlier.

Change-Id: I8557bf7ead30498db8f83c8279e0a534bd9192ba

11 files changed, 348 insertions, 290 deletions

diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index cdc52da0e..8e4a886f8 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -42,66 +42,15 @@
   </properties>
 
   <modules>
-    <!-- Releng bits -->
+    <!-- This one must remain the first module in the list -->
     <module>../packaging/org.eclipse.emf.compare.gendoc</module>
-  
-    <!-- Update Site -->
-    <module>../packaging/org.eclipse.emf.compare.update</module>
 
-    <!-- Core -->
     <module>../packaging/org.eclipse.emf.compare-feature</module>
     <module>../plugins/org.eclipse.emf.compare</module>
     <module>../plugins/org.eclipse.emf.compare.tests</module>
-
-    <!-- IDE UI -->
-    <module>../packaging/org.eclipse.emf.compare.ide.ui-feature</module>
+    
     <module>../plugins/org.eclipse.emf.compare.edit</module>
-    <module>../plugins/org.eclipse.emf.compare.ide</module>
-    <module>../plugins/org.eclipse.emf.compare.ide.ui</module>
     <module>../plugins/org.eclipse.emf.compare.doc</module>
-    <module>../plugins/org.eclipse.emf.compare.ide.ui.tests</module>
-    <!-- There are no longer any "ide" tests
-    <module>../plugins/org.eclipse.emf.compare.ide.tests</module>
-    -->
-
-    <!-- RCP -->
-    <module>../packaging/org.eclipse.emf.compare.rcp.ui-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.rcp</module>
-    <module>../plugins/org.eclipse.emf.compare.rcp.ui</module>
-    <module>../plugins/org.eclipse.emf.compare.rcp.ui.tests</module>
-
-    <!-- UML -->
-    <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.uml2</module>
-    <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
-    <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
-    <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
-    <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
-
-    <!-- SYSML -->
-    <!-- Not compiling yet
-    <module>../packaging/org.eclipse.emf.compare.sysml-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.sysml</module>
-    <module>../plugins/org.eclipse.emf.compare.sysml.edit</module>
-    <module>../plugins/org.eclipse.emf.compare.sysml.tests</module>
-    -->
-
-    <!-- GMF -->
-    <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
-
-    <!-- Ecore Tools -->
-    <module>../packaging/org.eclipse.emf.compare.diagram.ecoretools-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.ecoretools.tests</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests</module>
-
-    <!-- Papyrus -->
-    <module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
-    <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
   </modules>
 
   <build>
@@ -282,172 +231,280 @@
               </plugin>
           </plugins>
     </pluginManagement>
-</build>
+  </build>
 
-<profiles>
-  <profile>
-    <id>luna</id>
-    <activation>
-      <activeByDefault>true</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <target>
-              <artifact>
-                <groupId>org.eclipse.emf.compare</groupId>
-                <artifactId>emf.compare-parent</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <classifier>targetPlatforms/luna-sdk</classifier>
-              </artifact>
-            </target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
+  <profiles>
+    <!--
+      EMF Compare can be built against Luna, Kepler, Juno, Indigo, Helios and Galileo.
+      However, some parts of EMF Compare are dependent on recent platforms.
+      Namely, the UML and diagram comparison supports are only available for platforms Juno and higher.
+      Please set the "platform" variable to either one of the supported platform to activate the proper set of profiles.
+    -->
+    
+    <!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
+    <profile>
+      <id>luna</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/luna-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
-  <profile>
-    <id>kepler</id>
-    <activation>
-      <activeByDefault>false</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <target>
-              <artifact>
-                <groupId>org.eclipse.emf.compare</groupId>
-                <artifactId>emf.compare-parent</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <classifier>targetPlatforms/kepler-sdk</classifier>
-              </artifact>
-            </target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
+    <profile>
+      <id>kepler</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/kepler-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
-  <profile>
-    <id>juno</id>
-    <activation>
-      <activeByDefault>false</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <target>
-              <artifact>
-                <groupId>org.eclipse.emf.compare</groupId>
-                <artifactId>emf.compare-parent</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <classifier>targetPlatforms/juno-4.2-sdk</classifier>
-              </artifact>
-            </target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
+    <profile>
+      <id>juno</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/juno-4.2-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
-  <profile>
+    <profile>
       <id>indigo</id>
       <activation>
-          <activeByDefault>false</activeByDefault>
+        <activeByDefault>false</activeByDefault>
       </activation>
       <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <target>
-              <artifact>
-                <groupId>org.eclipse.emf.compare</groupId>
-                <artifactId>emf.compare-parent</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <classifier>targetPlatforms/indigo-sdk</classifier>
-              </artifact>
-            </target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/indigo-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>helios</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/helios-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>galileo</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build> 
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <version>${tycho-version}</version>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>3.0.0-SNAPSHOT</version>
+                  <classifier>targetPlatforms/galileo-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!--
+      These define coherent sets of modules (core, uml comparison support, diagram comparison support, ...
+      By default, all sets are active. When building against older platforms, make sure to disable the profiles that won't build.
+      
+      luna => core, ui, uml, diagram, ecoretools, papyrus, update
+      kepler => core, ui, uml, diagram, ecoretools, papyrus, update
+      juno => core, ui, uml, diagram, ecoretools, papyrus, update
+      indigo => core, ui, diagram
+      helios => core, ui, diagram
+      galileo => core, ui, diagram
+    -->
 
+    <profile>
+      <id>update</id>
+      <activation>
+        <!--
+          The update site requires that all other sets of modules are built
+        -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.update</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>ui</id>
+      <activation>
+        <!-- The UI should always be built... -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.ide.ui-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.ide</module>
+        <module>../plugins/org.eclipse.emf.compare.ide.ui</module>
+        <module>../plugins/org.eclipse.emf.compare.ide.ui.tests</module>
+        <!-- There are no longer any "ide" tests
+        <module>../plugins/org.eclipse.emf.compare.ide.tests</module>
+        -->
+        
+        <module>../packaging/org.eclipse.emf.compare.rcp.ui-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.rcp</module>
+        <module>../plugins/org.eclipse.emf.compare.rcp.ui</module>
+        <module>../plugins/org.eclipse.emf.compare.rcp.ui.tests</module>
+      </modules>
+    </profile>
+    
+    <profile>
+      <id>uml</id>
+      <activation>
+        <!-- This requires UML 4 and can only be built with juno or higher -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.uml2</module>
+        <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
+        <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
+        <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
+        <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>diagram</id>
+      <activation>
+        <!-- This should compile on all platforms. -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
+      </modules>
+    </profile>
 
     <profile>
-        <id>helios</id>
-        <activation>
-            <activeByDefault>false</activeByDefault>
-        </activation>
-        <build> <plugins>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>target-platform-configuration</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <resolver>p2</resolver>
-                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
-                        <target>
-                            <artifact>
-                                <groupId>org.eclipse.emf.compare</groupId>
-                                <artifactId>org.eclipse.emf.compare</artifactId>
-                                <version>3.0.0-SNAPSHOT</version>
-                                <classifier>target_platforms/helios-sdk</classifier>
-                            </artifact>
-                        </target>
-                    </configuration>
-        </plugin></plugins></build>
+      <id>ecoretools</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.diagram.ecoretools-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.ecoretools.tests</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests</module>
+      </modules>
     </profile>
 
     <profile>
-        <id>galileo</id>
-        <activation>
-            <activeByDefault>false</activeByDefault>
-        </activation>
-        <build> 
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>target-platform-configuration</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <resolver>p2</resolver>
-                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
-                        <target>
-                            <artifact>
-                                <groupId>org.eclipse.emf.compare</groupId>
-                                <artifactId>org.eclipse.emf.compare</artifactId>
-                                <version>3.0.0-SNAPSHOT</version>
-                                <classifier>target_platforms/galileo-sdk</classifier>
-                            </artifact>
-                        </target>
-                    </configuration>
-        </plugin></plugins></build>
+      <id>papyrus</id>
+      <activation>
+        <!-- This only builds against juno or higher -->
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
+        <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
+      </modules>
     </profile>
 
     <profile>
       <id>sign</id>
       <activation>
-        <property>
-          <name>SIGN_BUILD</name>
-          <value>true</value>
-        </property>
+        <activeByDefault>false</activeByDefault>
       </activation>
       <build>
         <plugins>
@@ -486,7 +543,7 @@
             <executions>
               <execution>
                 <id>pack200-pack</id>
-                <goals>
+                  <goals>
                   <goal>pack</goal>
                 </goals>
                 <phase>verify</phase>
@@ -509,67 +566,68 @@
       </pluginRepositories>
     </profile>
 
+    <!-- use this profile if you need to launch sonar or other quality-related plugins on the built artifacts. -->
     <profile>
-        <id>quality</id>
-        <activation>
-            <activeByDefault>false</activeByDefault>
-        </activation>
-        <properties>
-            <!-- Sonar properties -->
-            <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-            <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-            <!-- Points to the target folder of the global parent project -->
-            <sonar.jacoco.reportPath>../../org.eclipse.emf.compare-parent/target/jacoco.exec</sonar.jacoco.reportPath>
-        </properties>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.6.4.201312101107</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                            <configuration>
-                                <append>true</append>
-                                <destFile>${sonar.jacoco.reportPath}</destFile>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.11</version>
-                    <executions>
-                        <execution>
-                            <id>check my sources</id>
-                            <goals>
-                                <goal>checkstyle</goal>
-                            </goals>
-                            <phase>verify</phase>
-                            <configuration>
-                                <failOnErrors>false</failOnErrors>
-                                <consoleOutput>true</consoleOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>2.5.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.0.1</version>
-                </plugin>
-            </plugins>
-        </build>
+      <id>quality</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <!-- Sonar properties -->
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <!-- Points to the target folder of the global parent project -->
+        <sonar.jacoco.reportPath>../../org.eclipse.emf.compare-parent/target/jacoco.exec</sonar.jacoco.reportPath>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.6.4.201312101107</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+                <configuration>
+                  <append>true</append>
+                  <destFile>${sonar.jacoco.reportPath}</destFile>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.11</version>
+            <executions>
+              <execution>
+                <id>check my sources</id>
+                <goals>
+                  <goal>checkstyle</goal>
+                </goals>
+                <phase>verify</phase>
+                <configuration>
+                  <failOnErrors>false</failOnErrors>
+                  <consoleOutput>true</consoleOutput>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <version>2.5.3</version>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <version>3.0.1</version>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
-</profiles>
+  </profiles>
 
 </project>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
index 6821c1ce1..fb64aa2eb 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="EMF Compare based on Indigo SDK" sequenceNumber="28">
+<?pde version="3.8"?><target name="EMF Compare based on Indigo SDK" sequenceNumber="29">
 <locations>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="org.eclipse.platform.sdk" version="3.7.0.I20110613-1736"/>
 <repository location="http://download.eclipse.org/eclipse/updates/3.7"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="org.eclipse.emf.emfstore.fuzzy.feature.feature.group" version="0.9.3.M5"/>
 <unit id="org.eclipse.emf.emfstore.modelmutator.feature.feature.group" version="0.9.3.M5"/>
 <repository location="http://download.eclipse.org/emf-store/milestones/archive/0.9.3.M5"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="com.google.guava" version="11.0.2.v201303041551"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<unit id="org.junit" version="4.8.1.v4_8_1_v20100427-1100"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20130308121626/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20131024145017/repository/"/>
 </location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.1.v20110913-1526"/>
-<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20110602-1700"/>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+<unit id="org.junit4" version="4.8.1.v20100525"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="1.0.0.v20110608-1633"/>
-<unit id="org.eclipse.ocl.all.sdk.feature.group" version="3.1.0.v20110606-1427"/>
-<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.5.0.v20110502-1600-67O-95GFz03DQEiNLXRMK_NPj507"/>
 <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.5.0.v20110607-1200-67N09E9QnChoWswz-3wf_rz0kQ8Y"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.5.0.v20110502-1600-67O-95GFz03DQEiNLXRMK_NPj507"/>
 <repository location="http://download.eclipse.org/releases/indigo"/>
 </location>
 </locations>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
index 9674f82da..6d68f425c 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
@@ -4,7 +4,7 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

 <unit id="org.eclipse.sdk.ide" version="4.4.0.I20140123-1600"/>

 <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.0.v20140127-0448"/>

-<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="2.0.0.201401281049"/>

+<unit id="org.eclipse.emf.ecoretools.feature.group" version="2.0.0.201401281049"/>

 <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.8.0.201401272007"/>

 <unit id="org.eclipse.uml2.sdk.feature.group" version="5.0.0.v20140127-0906"/>

 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="1.0.0.v201401290914"/>

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 31a32d93e..d47ff78ec 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
@@ -19,10 +19,10 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.emf.compare" version="2.2.0.qualifier"/>
-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.2.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare" version="3.0.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.ide.ui" version="3.0.0.qualifier"/>
       <import feature="org.eclipse.emf.ecoretools" version="1.0.0"/>
-      <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.2.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.diagram.gmf" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
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 f7da3d5bd..34c0e11a6 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
@@ -19,8 +19,8 @@
    </license>

 

    <requires>

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

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

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

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

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

    </requires>

 

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 017242c30..dbfafe1fa 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
@@ -19,10 +19,10 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.emf.compare" version="2.2.0.qualifier"/>
-      <import feature="org.eclipse.emf.compare.diagram.gmf" version="2.2.0.qualifier"/>
-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.2.0.qualifier"/>
-      <import feature="org.eclipse.emf.compare.uml2" version="2.2.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare" version="3.0.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.diagram.gmf" version="3.0.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.ide.ui" version="3.0.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.uml2" version="3.0.0.qualifier"/>
       <import feature="org.eclipse.papyrus.infra.core.feature" version="0.9.1.v201209190809"/>
       <import feature="org.eclipse.papyrus.infra.emf.feature" version="0.9.1.v201209190809"/>
       <import feature="org.eclipse.papyrus.infra.gmfdiag.feature" version="0.9.1.v201209190809"/>
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 ca822c4ea..fd5e8a419 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
@@ -19,7 +19,7 @@
    </license>

 

    <requires>

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

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

    </requires>

 

    <plugin

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 160fa616e..b98f65274 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
@@ -19,7 +19,7 @@
    </license>

 

    <requires>

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

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

    </requires>

 

    <plugin

diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
index a08f01f3c..1ae82b2e8 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
@@ -19,8 +19,8 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.emf.compare" version="2.2.0.qualifier"/>
-      <import feature="org.eclipse.emf.compare.ide.ui" version="2.2.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare" version="3.0.0.qualifier"/>
+      <import feature="org.eclipse.emf.compare.ide.ui" version="3.0.0.qualifier"/>
       <import plugin="org.eclipse.uml2.uml" version="3.2.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF
index 6decb189e..4a48763d4 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ide.ecoretools.tests
 Bundle-Version: 2.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.8.0",
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.6.0",
  org.junit,
  org.eclipse.emf.compare.tests;bundle-version="2.0.0",
  org.eclipse.emf.compare,
  org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
  org.eclipse.emf.compare.diagram.ecoretools.tests;bundle-version="1.0.0",
- org.eclipse.ui;bundle-version="3.103.0",
+ org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.emf.compare.diagram;bundle-version="2.0.0",
  org.eclipse.emf.compare.ide;bundle-version="3.0.0",
  org.eclipse.emf.compare.diagram.ide.ui;bundle-version="3.0.0",
diff --git a/plugins/org.eclipse.emf.compare.doc/.gitignore b/plugins/org.eclipse.emf.compare.doc/.gitignore
new file mode 100644
index 000000000..f0d32f189
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.doc/.gitignore
@@ -0,0 +1,2 @@
+help/
+plugin.xml