Merge "Add compare-oxygen target and update root pom.xml"

5 files changed, 170 insertions, 87 deletions

diff --git a/plugins/compare/pom.xml b/plugins/compare/pom.xml
index ce2481af..a15777e9 100755
--- a/plugins/compare/pom.xml
+++ b/plugins/compare/pom.xml
@@ -4,18 +4,14 @@
 	terms of the Eclipse Public License v1.0 which accompanies this distribution, 
 	and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: 
 	Philip Langer - Initial API and implementation -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<!-- Project POM (aggregator) -->
 	<groupId>org.eclipse.papyrus.compare</groupId>
 	<artifactId>org.eclipse.papyrus.compare.releng</artifactId>
 	<version>0.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>Papyrus Compare allows to diff/merge Papyrus models with EGit.</description>
-
 	<properties>
 		<!-- plugins versions -->
 		<!-- use 'mvn versions:display-plugin-updates' to check for the latest -->
@@ -26,24 +22,20 @@
 		<maven-pmd-version>3.1</maven-pmd-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jarSignerVersion>1.1.2</jarSignerVersion>
-
 		<!-- Eclipse properties -->
-
 		<!-- default environment overridden by profile, tycho preempts profile -->
 		<java.source>1.8</java.source>
 		<java.target>1.8</java.target>
 		<target.folder>targetplatforms</target.folder>
-		<target.stream>release</target.stream> <!-- release | nightly -->
+	
+		<!-- release | nightly -->
 		<target.file>${target.folder}/compare-${target.stream}</target.file>
-
 		<!-- Platform properties -->
 		<env.ui.test>-Xms256m -Xmx1024m</env.ui.test>
-
 		<!-- P2 Repo References -->
 		<egit.p2.repo>http://download.eclipse.org/egit/updates</egit.p2.repo>
 		<emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/</emf-compare.p2.repo>
 	</properties>
-
 	<pluginRepositories>
 		<pluginRepository>
 			<id>eclipse-maven-releases</id>
@@ -83,7 +75,8 @@
 					<artifactId>tycho-p2-repository-plugin</artifactId>
 					<version>${tycho-version}</version>
 				</plugin>
-				<plugin><!-- enable source bundle generation -->
+				<plugin>
+					<!-- enable source bundle generation -->
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-source-plugin</artifactId>
 					<version>${tycho-version}</version>
@@ -163,7 +156,8 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
 			</plugin>
-			<plugin><!-- enable source bundle generation -->
+			<plugin>
+				<!-- enable source bundle generation -->
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<executions>
@@ -244,10 +238,10 @@
 			</plugin>
 		</plugins>
 	</build>
-
 	<profiles>
 		<profile>
-			<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
+			<id>packAndSign</id>
+			<!-- Stable release profile. Takes +30min. Eclipse servers only -->
 			<!-- Pack200 -->
 			<build>
 				<plugins>
@@ -316,10 +310,9 @@
 				</property>
 			</activation>
 		</profile>
-
-
 		<profile>
-			<id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
+			<id>pack</id>
+			<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
 			<build>
 				<plugins>
 					<!-- Pack200 -->
@@ -363,24 +356,41 @@
 			</activation>
 		</profile>
 		<profile>
+			<id>release</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<target.stream>release</target.stream>
+			</properties>
+		</profile>
+		
+		<profile>
 			<id>nightly</id>
 			<activation>
 				<property>
 					<name>target.stream</name>
-					<value>nightly</value>
-				</property>
+					<value>nightly</value></property>
 			</activation>
 			<properties>
+				<target.stream>nightly</target.stream>
 				<egit.p2.repo>http://download.eclipse.org/egit/updates</egit.p2.repo>
 				<emf-compare.p2.repo>http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/</emf-compare.p2.repo>
 			</properties>
 		</profile>
+		<profile>
+			<id>oxygen</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<target.stream>oxygen</target.stream>
+			</properties>
+		</profile>
 	</profiles>
-
 	<modules>
 		<module>bundles</module>
 		<module>tests</module>
 		<module>org.eclipse.papyrus.compare.p2</module>
 	</modules>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/plugins/compare/targetplatforms/compare-oxygen.target b/plugins/compare/targetplatforms/compare-oxygen.target
new file mode 100644
index 00000000..23a965ee
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-oxygen.target
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Compare Target Platform - Oxygen" sequenceNumber="1538035456">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.13.4.v20180330-0919"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
+      <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+      <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170604-1316"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.11.0.201706061352"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.11.0.201706061339"/>
+      <unit id="org.eclipse.emf.workspace.feature.group" version="1.11.0.201706061339"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
+      <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="5.0.3.201809091024-r"/>
+      <unit id="org.eclipse.jgit.feature.group" version="5.0.3.201809091024-r"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.0.3"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="1.2.3.201805161152"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.4.201806221350"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.4.201806221350"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+      <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
+      <unit id="com.google.inject" version="3.0.0.v201605172100"/>
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+      <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+      <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+      <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"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+      <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.4.0.201805210649"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201805210649"/>
+      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201805210649"/>
+      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201805210649"/>
+      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/>
+    </location>
+  </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare-oxygen.tpd b/plugins/compare/targetplatforms/compare-oxygen.tpd
new file mode 100755
index 00000000..7ae11404
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-oxygen.tpd
@@ -0,0 +1,62 @@
+target "Compare Target Platform - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+	org.eclipse.platform.feature.group
+	org.eclipse.sdk.feature.group
+	org.eclipse.rcp.feature.group
+	org.eclipse.jdt.feature.group
+	org.eclipse.equinox.p2.discovery.feature.feature.group
+	org.eclipse.equinox.executable.feature.group
+	org.eclipse.draw2d
+	org.eclipse.gef
+	org.eclipse.m2m.qvt.oml.sdk.feature.group
+	org.eclipse.emf.sdk.feature.group
+	org.eclipse.xsd.sdk.feature.group
+	org.eclipse.emf.validation.sdk.feature.group
+	org.eclipse.emf.transaction.sdk.feature.group
+	org.eclipse.emf.workspace.feature.group
+	org.eclipse.gmf.runtime.notation.sdk.feature.group
+	org.eclipse.gmf.runtime.sdk.feature.group
+	org.eclipse.uml2.sdk.feature.group
+}
+
+location "http://download.eclipse.org/egit/updates-5.0.3" egit {
+	org.eclipse.egit.feature.group
+	org.eclipse.jgit.feature.group
+}
+
+location "http://download.eclipse.org/modeling/emf/compare/updates/releases/" emfCompare {
+	org.eclipse.emf.compare.source.feature.group [3.3.3,4.0.0)
+	org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.3,4.0.0)
+	org.eclipse.emf.compare.uml2.source.feature.group [3.3.3,4.0.0)
+	org.eclipse.emf.compare.egit.source.feature.group [1.2.3,2.0.0)
+	org.eclipse.emf.compare.ide.ui.source.feature.group [3.3.3,4.0.0)
+	org.eclipse.emf.compare.rcp.ui.source.feature.group [3.3.3,4.0.0)
+}
+
+//manualUpdate
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
+	org.apache.commons.io
+	org.apache.commons.io.source
+	com.google.inject
+	com.google.guava [21.0.0,22.0.0)
+	com.google.guava.source [21.0.0,22.0.0)
+	/* Egit/Jgit */
+	javaewah
+	org.apache.commons.compress
+	org.apache.commons.lang
+	org.kohsuke.args4j
+	org.mockito [1.9.0,2.0.0)
+	org.hamcrest
+	org.hamcrest.library
+	org.hamcrest.integration
+	org.hamcrest.text
+	org.objenesis [1.0.0,2.0.0)
+}
+
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen" {
+	org.eclipse.papyrus.sdk.feature.feature.group
+	org.eclipse.papyrus.infra.gmfdiag.feature.feature.group
+	org.eclipse.papyrus.infra.services.feature.feature.group
+	org.eclipse.papyrus.views.properties.toolsmiths
+}
diff --git a/plugins/compare/targetplatforms/compare.tests-oxygen.target b/plugins/compare/targetplatforms/compare.tests-oxygen.target
index 60993cf7..5d0b5dba 100644
--- a/plugins/compare/targetplatforms/compare.tests-oxygen.target
+++ b/plugins/compare/targetplatforms/compare.tests-oxygen.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Oxygen, Tests" sequenceNumber="1537534353">
+<target name="Compare Target Platform - Oxygen, Tests" sequenceNumber="1538034300">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
@@ -24,9 +24,9 @@
       <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-      <repository id="egit" location="http://download.eclipse.org/egit/updates"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.0.3.201809091024-r"/>
+      <unit id="org.eclipse.jgit.feature.group" version="5.0.3.201809091024-r"/>
+      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.0.3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
@@ -61,8 +61,8 @@
       <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
-      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastStableBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="1.2.0"/>
+      <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.2.201806221350"/>
diff --git a/plugins/compare/targetplatforms/compare.tests-oxygen.tpd b/plugins/compare/targetplatforms/compare.tests-oxygen.tpd
index 931b8803..9c35634c 100755
--- a/plugins/compare/targetplatforms/compare.tests-oxygen.tpd
+++ b/plugins/compare/targetplatforms/compare.tests-oxygen.tpd
@@ -1,58 +1,6 @@
 target "Compare Target Platform - Oxygen, Tests" with source requirements
 
-location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
-	org.eclipse.platform.feature.group
-	org.eclipse.sdk.feature.group
-	org.eclipse.rcp.feature.group
-	org.eclipse.jdt.feature.group
-	org.eclipse.equinox.p2.discovery.feature.feature.group
-	org.eclipse.equinox.executable.feature.group
-	org.eclipse.draw2d
-	org.eclipse.gef
-	org.eclipse.m2m.qvt.oml.sdk.feature.group
-	org.eclipse.emf.sdk.feature.group
-	org.eclipse.xsd.sdk.feature.group
-	org.eclipse.emf.validation.sdk.feature.group
-	org.eclipse.emf.transaction.sdk.feature.group
-	org.eclipse.emf.workspace.feature.group
-	org.eclipse.gmf.runtime.notation.sdk.feature.group
-	org.eclipse.gmf.runtime.sdk.feature.group
-	org.eclipse.uml2.sdk.feature.group
-}
-
-location "http://download.eclipse.org/egit/updates" egit {
-	org.eclipse.egit.feature.group
-	org.eclipse.jgit.feature.group
-}
-
-location "http://download.eclipse.org/modeling/emf/compare/updates/releases/" emfCompare {
-	org.eclipse.emf.compare.source.feature.group [3.3.3,4.0.0)
-	org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.3,4.0.0)
-	org.eclipse.emf.compare.uml2.source.feature.group [3.3.3,4.0.0)
-	org.eclipse.emf.compare.egit.source.feature.group [1.2.3,2.0.0)
-	org.eclipse.emf.compare.ide.ui.source.feature.group [3.3.3,4.0.0)
-	org.eclipse.emf.compare.rcp.ui.source.feature.group [3.3.3,4.0.0)
-}
-
-//manualUpdate
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
-	org.apache.commons.io
-	org.apache.commons.io.source
-	com.google.inject
-	com.google.guava [21.0.0,22.0.0)
-	com.google.guava.source [21.0.0,22.0.0)
-	/* Egit/Jgit */
-	javaewah
-	org.apache.commons.compress
-	org.apache.commons.lang
-	org.kohsuke.args4j
-	org.mockito [1.9.0,2.0.0)
-	org.hamcrest
-	org.hamcrest.library
-	org.hamcrest.integration
-	org.hamcrest.text
-	org.objenesis [1.0.0,2.0.0)
-}
+include "compare-oxygen.tpd"
 
 location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" {
 	org.eclipse.papyrus.junit.utils lazy
@@ -76,11 +24,8 @@ location xwt "http://download.eclipse.org/xwt/updates" {
 }
 
 
-// Required for Compare test ProfileMigrationTest and Architecture Framework support tests
-// NOTE that this is a volatile Hudson build archive. It should be replaced by a release
-// build ASAP!  This is only even remote feasible because it is a tests-only dependency.
-location sysml "https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastStableBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/" {
-	org.eclipse.papyrus.sysml14.feature.feature.group lazy
+location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" {
+	org.eclipse.papyrus.sysml14.feature.feature.group [1.2.0,1.3.0)
 }
 
 location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/releases/" {