Target platform based on 2019-06
We need to switch to tycho 1.4.0 to build against such a
platform
Change-Id: I8adc6e212801a736c6d293a6b5269b03edc00377
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index d8866b9..d17c0ce 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -40,8 +40,8 @@
<!-- plugins versions -->
<!-- use 'mvn versions:display-plugin-updates' to check for the latest -->
- <tycho-version>1.0.0</tycho-version>
- <tycho-extras-version>1.0.0</tycho-extras-version>
+ <tycho-version>1.4.0</tycho-version>
+ <tycho-extras-version>1.4.0</tycho-extras-version>
<maven-resources-version>2.6</maven-resources-version>
<maven-antrun-version>1.7</maven-antrun-version>
<findbugs-maven-version>3.0.0</findbugs-maven-version>
@@ -364,7 +364,7 @@
<profiles>
<!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
<profile>
- <id>oxygen</id>
+ <id>2019-06</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -379,6 +379,27 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
+ <classifier>targetPlatforms/2019-06-sdk</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>oxygen</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/oxygen-sdk</classifier>
</artifact>
</target>
@@ -474,6 +495,27 @@
</modules>
</profile>
<profile>
+ <id>2019-06-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-06-extras-sdk</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>oxygen-extras</id>
<build>
<plugins>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.target
new file mode 100644
index 0000000..ed12ad0
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.target
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="EMF Compare based on 2019-06 SDK" sequenceNumber="1568023224">
+ <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="21.0.0.v20170206-1425"/>
+ <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/R20190602212107/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-06"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.tpd
new file mode 100644
index 0000000..550a144
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2019-06-sdk.tpd
@@ -0,0 +1,17 @@
+target "EMF Compare based on 2019-06 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-06" {
+ 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-06-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-06-extras-sdk.target
new file mode 100644
index 0000000..d127a45
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-06-extras-sdk.target
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="EMF Compare with extras based on 2019-06" sequenceNumber="1568030866">
+ <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="21.0.0.v20170206-1425"/>
+ <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/R20190602212107/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-06"/>
+ </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.2.3/2019-06/"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-06-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-06-extras-sdk.tpd
new file mode 100644
index 0000000..1133a62
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2019-06-extras-sdk.tpd
@@ -0,0 +1,13 @@
+target "EMF Compare with extras based on 2019-06"
+
+include "../2019-06-sdk.tpd"
+
+with source, requirements
+
+// Sirius
+
+location "https://download.eclipse.org/sirius/updates/releases/6.2.3/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/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
index a023ca8..62b53b7 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
@@ -2,7 +2,7 @@
with source, requirements
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/" {
com.google.guava [15.0.0,22.0.0)
com.google.gson [2.2.4,3.0.0)
org.junit [4,5)
@@ -11,7 +11,6 @@
javaewah
org.apache.commons.compress
org.kohsuke.args4j
- /* Egit/Jgit */
org.mockito [1.9.0,2.0.0)
org.hamcrest [1.1.0,2.0.0)
}
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
index 45c98ce..0971e31 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
@@ -24,8 +24,8 @@
</includes>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
