From f06751bf27f59d67e7c29357162b64e3065077a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20No=C3=ABl?= <victor.noel@linagora.com>
Date: Tue, 13 Sep 2016 15:19:42 +0200
Subject: [PATCH] PETALSSTUD-323: Upgrade to Indigo 3.7.2

- Let's actually use the target definition with mvn
  This improves reliability of the build process and also speed
- Also fixes PETALSSTUD-243
---
 pom.xml                                       | 14 +-----
 target-definition/indigo.target               | 48 -------------------
 target-definition/pom.xml                     | 35 +-------------
 target-definition/target-definition.target    | 47 ++++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  2 +-
 5 files changed, 51 insertions(+), 95 deletions(-)
 delete mode 100644 target-definition/indigo.target
 create mode 100644 target-definition/target-definition.target

diff --git a/pom.xml b/pom.xml
index 96f42b07..c94961e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,19 +63,15 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<resolver>p2</resolver>
 					<target>
 						<artifact>
 							<groupId>com.ebmwebsourcing.petals</groupId>
 							<artifactId>target-definition</artifactId>
 							<version>1.0.0-SNAPSHOT</version>
-							<classifier>indigo</classifier>
 						</artifact>
 					</target>
 
-					<ignoreTychoRepositories>true</ignoreTychoRepositories>
 					<environments>
-
 						<!-- Win 32 -->
 						<environment>
 							<os>win32</os>
@@ -148,14 +144,6 @@
 		</pluginManagement>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>indigo</id>
-			<url>http://download.eclipse.org/releases/indigo/</url>
-			<layout>p2</layout>
-		</repository>
-	</repositories>
-
 	<issueManagement>
 		<system>JIRA</system>
 		<url>http://jira.petalslink.com</url>
@@ -174,4 +162,4 @@
 			</comments>
 		</license>
 	</licenses>
-</project>
\ No newline at end of file
+</project>
diff --git a/target-definition/indigo.target b/target-definition/indigo.target
deleted file mode 100644
index 6d5a9a74..00000000
--- a/target-definition/indigo.target
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="Eclipse 3.7 - Indigo" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.bpel.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/bpel/site/1.0.5"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.wst.sse.sieditor.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/webtools/incubator/repository/sieditor/snapshot"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
-<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.1.v20110526-6-Bg9JXOePwKUTU7X0teV1RtDu-e"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.0.v20110606-0949"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.7.0.v20110425-2050-7G7W-A5WNg9RDcRXDHeSRSTUiNLI"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.5.0.v20110426-2159-47D08xGD6ExNBM7CIJa3CIKK9t84"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.5.0.v20110607-1200-67N09E9QnChoWswz-3wf_rz0kQ8Y"/>
-<unit id="org.eclipse.jet.sdk.feature.group" version="1.1.1.v201101271243-42186A5NsKEQPHRQeFaJS4A35"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuLqBLqRja9B15B"/>
-<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201103310011-7H7EFZ-DxumTla66ahfUnHfpsz0u5Z92pU4TxSL"/>
-<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7T7YFRSFIqUoIrvYEvBiPGJXGZNg"/>
-<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/>
-<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
-<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
-<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FBb8s73553C5K"/>
-<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B77FGMAtJcexENNgECGJAP775"/>
-<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.3.0.v201102200555-7L7RFi7FGtGd-thnz0ysWug2766"/>
-<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201102200555-7I7AFeREtEoVEjj76K0kpf98puxOLDNv169v6_A3"/>
-<repository location="http://download.eclipse.org/releases/indigo/"/>
-</location>
-</locations>
-</target>
diff --git a/target-definition/pom.xml b/target-definition/pom.xml
index f7899299..9170b667 100644
--- a/target-definition/pom.xml
+++ b/target-definition/pom.xml
@@ -13,37 +13,6 @@
 	
 	<groupId>com.ebmwebsourcing.petals</groupId>
 	<artifactId>target-definition</artifactId>
-	<packaging>pom</packaging>
+	<packaging>eclipse-target-definition</packaging>
 
-	<build>
-		<plugins>
-		<plugin>
-			<groupId>org.codehaus.mojo</groupId>
-			<artifactId>build-helper-maven-plugin</artifactId>
-			<version>1.7</version>
-			
-			<executions>
-				<execution>
-					<id>attach-artifacts</id>
-					<phase>package</phase>
-					<goals>
-						<goal>attach-artifact</goal>
-					</goals>
-            
-					<configuration>
-						<artifacts>
-							<artifact>
-								<file>indigo.target</file>
-								<type>target</type>
-								<classifier>indigo</classifier>
-							</artifact>
-						</artifacts>
-					</configuration>
-					
-				</execution>
-			</executions>
-		</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/target-definition/target-definition.target b/target-definition/target-definition.target
new file mode 100644
index 00000000..945d8338
--- /dev/null
+++ b/target-definition/target-definition.target
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Eclipse 3.7 - Indigo" sequenceNumber="24">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.bpel.feature.feature.group" version="1.0.5.Final"/>
+<repository location="http://download.eclipse.org/bpel/site/1.0.5"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.sse.sieditor.feature.feature.group" version="1.0.0.201503251100"/>
+<repository location="http://download.eclipse.org/webtools/incubator/repository/sieditor/snapshot"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rcp.feature.group" version="3.7.2.v20120120-1424-9DB5FmnFq5JCf1UA38R-kz0S0272"/>
+<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0qUTX5I15GZWwbXkrl"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.v20111216-1653-7P7NFUIFIbaUcU77s0KQWHw5HZTZ"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.2.v20120130-0943"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.7.2.v20110927-2020-7G7W77A5WNgIRPdWXDIbNTSQPdQL"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.5.0.v20110426-2159-47D08xGD6ExNBM7CIJa3CIKK9t84"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.5.0.v20110607-1200-67N09E9QnChoWswz-3wf_rz0kQ8Y"/>
+<unit id="org.eclipse.jet.sdk.feature.group" version="1.1.1.v201101271243-42186A5NsKEQPHRQeFaJS4A35"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.2.v201112072049-7H7EFZ7DxumTmce4khcSkIiqoD8eDMKlT8Oz011P"/>
+<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.1.v201109012200-7T7YFRTFIqUoIrvbEtBlSIJXGZNg"/>
+<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.2.v20111026_1748-30FBd8s7356394Ka2531"/>
+<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.2.v20111026_1748-7B79FBdAtJcez0EONePJUSNPjBC42"/>
+<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.3.1.v201108230355-7L7RFi8FGtGd-thsz0z0rQwh2766"/>
+<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.2.v201112142348-7I7AFg1EtEoVFjz-98J1iuhhBz-uuWclgZtNHnEN"/>
+<repository location="http://download.eclipse.org/releases/indigo/"/>
+</location>
+</locations>
+</target>
diff --git a/tests/com.ebmwebsourcing.petals.tests.common/META-INF/MANIFEST.MF b/tests/com.ebmwebsourcing.petals.tests.common/META-INF/MANIFEST.MF
index 88c50f90..fee35c72 100644
--- a/tests/com.ebmwebsourcing.petals.tests.common/META-INF/MANIFEST.MF
+++ b/tests/com.ebmwebsourcing.petals.tests.common/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
  org.apache.log4j;bundle-version="1.2.15",
  org.junit;bundle-version="4.8.2",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest.library;bundle-version="1.1.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
  com.ebmwebsourcing.petals.services;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6