summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-13 09:24:01 (EDT)
committerIan Bull2012-09-13 11:56:35 (EDT)
commit71d3bfbcb321d01ae60539e04188054af2af0b74 (patch)
treeb04225fa2594026db3d31dd6e8eeaffdbf85c074
parent006386b85281cc826886a368cbdf61d4c9cb7823 (diff)
downloadrt.equinox.p2-71d3bfbcb321d01ae60539e04188054af2af0b74.zip
rt.equinox.p2-71d3bfbcb321d01ae60539e04188054af2af0b74.tar.gz
rt.equinox.p2-71d3bfbcb321d01ae60539e04188054af2af0b74.tar.bz2
Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120913-155635
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml18
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery/pom.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml13
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/pom.xml7
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml21
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml18
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml75
11 files changed, 158 insertions, 49 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
index 1a61df7..5c98156 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
@@ -12,4 +12,22 @@
<artifactId>org.eclipse.equinox.frameworkadmin.equinox</artifactId>
<version>1.0.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>CDC-1.1/Foundation-1.1</executionEnvironment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <useJDK>BREE</useJDK>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
index 6e82420..781cbc1 100644
--- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
@@ -23,4 +23,15 @@
<artifactId>org.eclipse.equinox.p2.discovery.compatibility</artifactId>
<version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
index be68851..9f6096a 100644
--- a/bundles/org.eclipse.equinox.p2.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
@@ -12,4 +12,15 @@
<artifactId>org.eclipse.equinox.p2.discovery</artifactId>
<version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
index b7a95a0..3e68c40 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
@@ -13,4 +13,17 @@
<artifactId>org.eclipse.equinox.p2.publisher.eclipse</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
index 91b7edf..ba3c838 100644
--- a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
@@ -12,4 +12,15 @@
<artifactId>org.eclipse.equinox.p2.tests.discovery</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
index 435d5f1..d6ad203 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
@@ -29,6 +29,13 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
index bcafe57..c43be88 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
@@ -12,4 +12,15 @@
<artifactId>org.eclipse.equinox.p2.tests.verifier</artifactId>
<version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
index 64d4bab..4d48019 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project 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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
@@ -12,4 +12,23 @@
<artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
<version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ matching apparently invalid Juno bundle
+ Minimal BREE according to META-INF/MENIFEST.MF should be J2SE-1.4,
+ yet Juno was compiled with class version 49.0, i.e. Java 5+
+ Reported as https://bugs.eclipse.org/bugs/show_bug.cgi?id=386186
+ -->
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
index 8f2c8b7..4a47b82 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
@@ -12,4 +12,15 @@
<artifactId>org.eclipse.equinox.p2.ui.discovery</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>J2SE-1.5</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
index cd738cb..483f1ab 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
@@ -12,4 +12,22 @@
<artifactId>org.eclipse.equinox.p2.ui.importexport</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <!--
+ Minimal BREE according to META-INF/MENIFEST.MF should be CDC-1.1/Foundation-1.1,
+ which implies source=1.3 and target=1.2 and most likely is invalid.
+
+ Project sources use generics, which requires source=1.5 to compile
+ -->
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
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 2027baf..630f5fd 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,33 @@
<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>
-
- <!-- 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
+ ``?'' syntax means individual project can override with build.properties config
+ -->
+ <executionEnvironment>?J2SE-1.4</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>