Bump EMF Compare to 3.3.10 and add 2019-12 target platform

Change-Id: Ib199af36e174aad2b8593bf6702334eab28d4c22

8 files changed, 164 insertions, 6 deletions

diff --git a/org.eclipse.emf.compare-parent/bundle-parent/pom.xml b/org.eclipse.emf.compare-parent/bundle-parent/pom.xml
index f5aab05a0..eed6f954e 100644
--- a/org.eclipse.emf.compare-parent/bundle-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/bundle-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>3.3.9-SNAPSHOT</version>
+    <version>3.3.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>
diff --git a/org.eclipse.emf.compare-parent/feature-parent/pom.xml b/org.eclipse.emf.compare-parent/feature-parent/pom.xml
index c30114212..2cb34b3f6 100644
--- a/org.eclipse.emf.compare-parent/feature-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/feature-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>3.3.9-SNAPSHOT</version>
+    <version>3.3.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 0b2fe136c..62d805f9e 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -14,7 +14,7 @@
   </prerequisites>
   <groupId>org.eclipse.emf.compare</groupId>
   <artifactId>emf.compare-parent</artifactId>
-  <version>3.3.9-SNAPSHOT</version>
+  <version>3.3.10-SNAPSHOT</version>
   <packaging>pom</packaging>
   <licenses>
     <license>
@@ -31,7 +31,7 @@
   </licenses>
   <properties>
     <!-- Properties -->
-    <parent-version>3.3.9-SNAPSHOT</parent-version>
+    <parent-version>3.3.10-SNAPSHOT</parent-version>
     <source-java-version>1.7</source-java-version>
     <target-java-version>${source-java-version}</target-java-version>
     <java-source-encoding>UTF-8</java-source-encoding>
@@ -365,7 +365,7 @@
   <profiles>
     <!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
     <profile>
-      <id>2019-06</id>
+      <id>2019-12</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -380,6 +380,27 @@
                   <groupId>org.eclipse.emf.compare</groupId>
                   <artifactId>emf.compare-parent</artifactId>
                   <version>${parent-version}</version>
+                  <classifier>targetPlatforms/2019-12-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>2019-06</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>${parent-version}</version>
                   <classifier>targetPlatforms/2019-06-sdk</classifier>
                 </artifact>
               </target>
@@ -496,6 +517,27 @@
       </modules>
     </profile>
     <profile>
+      <id>2019-12-extras</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.eclipse.emf.compare</groupId>
+                  <artifactId>emf.compare-parent</artifactId>
+                  <version>${parent-version}</version>
+                  <classifier>targetPlatforms/extras/2019-12-extras-sdk</classifier>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>2019-06-extras</id>
       <build>
         <plugins>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.target
new file mode 100644
index 000000000..4321da4be
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.target
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?pde?>

+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->

+<target name="EMF Compare based on 2019-12 SDK" sequenceNumber="1578992510">

+  <locations>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>

+      <repository location="http://download.eclipse.org/cbi/updates/license"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>

+      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>

+      <unit id="org.junit" version="4.12.0.v201504281640"/>

+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>

+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>

+      <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>

+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>

+      <unit id="org.mockito" version="1.9.5.v201605172210"/>

+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>

+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/egit/updates"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>

+      <repository location="http://obeo.github.io/fr.obeo.performance/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>

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

+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/releases/2019-12"/>

+    </location>

+  </locations>

+</target>

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.tpd
new file mode 100644
index 000000000..5abcaef8c
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2019-12-sdk.tpd
@@ -0,0 +1,17 @@
+target "EMF Compare based on 2019-12 SDK"
+
+include "fragments/licence.tpd"
+include "fragments/orbit.tpd"
+include "fragments/egit.tpd"
+include "fragments/perf.tpd"
+
+with source, requirements
+
+location "http://download.eclipse.org/releases/2019-12" {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.emf.transaction.sdk.feature.group lazy
+	org.eclipse.uml2.feature.group lazy
+	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+	org.eclipse.gmf.runtime.diagram.ui lazy
+}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.target
new file mode 100644
index 000000000..68a307d42
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.target
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?pde?>

+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->

+<target name="EMF Compare with extras based on 2019-06" sequenceNumber="1578992719">

+  <locations>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>

+      <repository location="http://download.eclipse.org/cbi/updates/license"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>

+      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>

+      <unit id="org.junit" version="4.12.0.v201504281640"/>

+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>

+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>

+      <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>

+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>

+      <unit id="org.mockito" version="1.9.5.v201605172210"/>

+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>

+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/egit/updates"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>

+      <repository location="http://obeo.github.io/fr.obeo.performance/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>

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

+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/releases/2019-12"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.sirius" version="0.0.0"/>

+      <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>

+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>

+      <repository location="https://download.eclipse.org/sirius/updates/releases/6.3.0/2019-06/"/>

+    </location>

+  </locations>

+</target>

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.tpd
new file mode 100644
index 000000000..dd307375a
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-12-extras-sdk.tpd
@@ -0,0 +1,13 @@
+target "EMF Compare with extras based on 2019-06"
+
+include "../2019-12-sdk.tpd"
+
+with source, requirements
+
+// Sirius
+
+location "https://download.eclipse.org/sirius/updates/releases/6.3.0/2019-06/" {
+	org.eclipse.sirius lazy
+	org.eclipse.sirius.diagram lazy
+	org.eclipse.sirius.runtime.feature.group lazy
+}
diff --git a/org.eclipse.emf.compare-parent/test-parent/pom.xml b/org.eclipse.emf.compare-parent/test-parent/pom.xml
index d00fce76d..01f06bf72 100644
--- a/org.eclipse.emf.compare-parent/test-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/test-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>emf.compare-parent</artifactId>
     <groupId>org.eclipse.emf.compare</groupId>
-    <version>3.3.9-SNAPSHOT</version>
+    <version>3.3.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.eclipse.emf.compare</groupId>