From c85a0f56959b0c5ec2c8cc6b0446cf3b542af387 Mon Sep 17 00:00:00 2001
From: John Arthorne
Date: Mon, 7 Jan 2013 10:27:42 -0500
Subject: Bug 396091 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes)
 for equinox.p2

---
 .../org.eclipse.equinox.p2-parent/pom.xml          | 77 +++++++++-------------
 1 file changed, 30 insertions(+), 47 deletions(-)

(limited to 'org.eclipse.equinox.p2.releng')

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 2027baf2b..e801823ee 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
@@ -25,54 +25,37 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<configuration>
-					<resolver>p2</resolver>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
+  <properties>
+    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.p2.git</tycho.scmUrl>
+  </properties>
 
-			<!-- 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>
-				<configuration>
-					<source>1.5</source>
-					<target>jsr14</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!--
+             require at least J2SE-1.4 due to org.eclipse.equinox.security dependency
+             many bundles require J2SE-1.5 now.
+          -->
+          <executionEnvironment>J2SE-1.5</executionEnvironment>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <configuration>
+          <!--
+          Many (all?) bundles use java 5 generics, do not compile against libraries
+          of their respective execution environments and we force compilation against
+          SYSTEM JRE libraries that are guaranteed to be java5+
+          -->
+          <useJDK>SYSTEM</useJDK>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 	<profiles>
 		<profile>
-- 
cgit v1.2.3