Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2013-01-07 10:27:42 -0500
committerJohn Arthorne2013-01-07 10:27:42 -0500
commitc85a0f56959b0c5ec2c8cc6b0446cf3b542af387 (patch)
tree7209d3f8f154531dc189795df26bdded0c9586d8 /org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent
parent653220d15a926fdc19c646b4c6860de66d3c3c53 (diff)
downloadrt.equinox.p2-c85a0f56959b0c5ec2c8cc6b0446cf3b542af387.tar.gz
rt.equinox.p2-c85a0f56959b0c5ec2c8cc6b0446cf3b542af387.tar.xz
rt.equinox.p2-c85a0f56959b0c5ec2c8cc6b0446cf3b542af387.zip
Bug 396091 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for equinox.p2v20130107-152742
Diffstat (limited to 'org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent')
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml77
1 files changed, 30 insertions, 47 deletions
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>

Back to the top