From a43bcda283dc231e7ff05d57e531b7f7f41403ad Mon Sep 17 00:00:00 2001
From: Tobias Oberlies
Date: Mon, 1 Aug 2011 13:36:09 +0200
Subject: 304594 Make publisher bundles buildable with Tycho

- Migrate to the current Tycho release 0.12.0.
- Configure compiler source/target levels in parent POM to work
  around Tycho bug 353505. This should be okay as first approximation
  to the PDE build, which currently configures the source/target
  levels per project through the build.properties. In case a project
  doesn't build with this default, the setting could be overridden in
  the project's POM.
- Prevent that Maven/Tycho build results are committed to the
  repository.
---
 .gitignore                                              |  1 +
 .../org.eclipse.equinox.p2.metadata.repository/pom.xml  |  4 ++--
 bundles/org.eclipse.equinox.p2.tests.ui/pom.xml         |  6 ++++--
 bundles/org.eclipse.equinox.p2.tests/pom.xml            |  8 +++++---
 .../org.eclipse.equinox.p2-parent/pom.xml               | 17 ++++++++++++++---
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
index 4f918fcef..5e0d165ed 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
@@ -16,8 +16,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
 					<extraClasspathElements>
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
index ea922a7ee..1f683d9e7 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
@@ -3,12 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<artifactId>org.eclipse.equinox.p2-parent</artifactId>
 		<groupId>org.eclipse</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
 	</parent>
+
 	<groupId>org.eclipse</groupId>
 	<artifactId>org.eclipse.equinox.p2.tests.ui</artifactId>
 	<version>1.0.100-SNAPSHOT</version>
@@ -17,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
 					<testSuite>org.eclipse.equinox.p2.tests.ui</testSuite>
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index e08ab16bf..bf3f6d3c2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -3,12 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
-		<artifactId>org.eclipse.equinox.p2-parent</artifactId>
 		<groupId>org.eclipse</groupId>
+		<artifactId>org.eclipse.equinox.p2-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
 	</parent>
+
 	<groupId>org.eclipse</groupId>
 	<artifactId>org.eclipse.equinox.p2.tests</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
@@ -17,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<testSuite>org.eclipse.equinox.p2.tests</testSuite>
 					<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 663aaf856..481853d91 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>0.8.0</tycho-version>
+		<tycho-version>0.12.0</tycho-version>
 	</properties>
 	<repositories>
 		<repository>
@@ -25,14 +25,14 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
 
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
@@ -66,6 +66,17 @@
 					</environments>
 				</configuration>
 			</plugin>
+
+			<!-- workaround for bug 353505 - need to repeat compiler source and target levels in POM -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<source>1.5</source>
+					<target>jsr14</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
-- 
cgit v1.2.3