summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-13 09:20:28 (EDT)
committer Paul Webster2012-09-12 10:25:56 (EDT)
commitf2c6f73af24a4c6a0d8be28435bbf3b54ad2e37c (patch)
tree74d1ac6e5149c8adaeff2aec3c5a132990c0520e
parentfd1071024bca78b66c6b4fec24e58c2854a19620 (diff)
downloadeclipse.platform-f2c6f73af24a4c6a0d8be28435bbf3b54ad2e37c.zip
eclipse.platform-f2c6f73af24a4c6a0d8be28435bbf3b54ad2e37c.tar.gz
eclipse.platform-f2c6f73af24a4c6a0d8be28435bbf3b54ad2e37c.tar.bz2
Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120912-142556
-rw-r--r--update/org.eclipse.update.configurator/pom.xml12
-rw-r--r--update/org.eclipse.update.core/pom.xml20
-rw-r--r--update/org.eclipse.update.scheduler/pom.xml6
-rw-r--r--update/org.eclipse.update.tests.core/pom.xml2
-rw-r--r--update/org.eclipse.update.ui/pom.xml6
5 files changed, 38 insertions, 8 deletions
diff --git a/update/org.eclipse.update.configurator/pom.xml b/update/org.eclipse.update.configurator/pom.xml
index 4892edc..ac656f9 100644
--- a/update/org.eclipse.update.configurator/pom.xml
+++ b/update/org.eclipse.update.configurator/pom.xml
@@ -24,4 +24,16 @@
<artifactId>org.eclipse.update.configurator</artifactId>
<version>3.3.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!-- observed BREE as of Juno -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/update/org.eclipse.update.core/pom.xml b/update/org.eclipse.update.core/pom.xml
index dd8679e..203107b 100644
--- a/update/org.eclipse.update.core/pom.xml
+++ b/update/org.eclipse.update.core/pom.xml
@@ -10,9 +10,8 @@
Igor Fedorenko - initial implementation
-->
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform</artifactId>
@@ -24,4 +23,19 @@
<artifactId>org.eclipse.update.core</artifactId>
<version>3.2.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!--
+ dependency on org.eclipse.equinox.security requires at least J2SE-1.4
+ -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/update/org.eclipse.update.scheduler/pom.xml b/update/org.eclipse.update.scheduler/pom.xml
index c482a6c..3616ebc 100644
--- a/update/org.eclipse.update.scheduler/pom.xml
+++ b/update/org.eclipse.update.scheduler/pom.xml
@@ -23,14 +23,16 @@
<artifactId>org.eclipse.update.scheduler</artifactId>
<version>3.2.400-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>
+ <!--
+ dependency on org.eclipse.equinox.security requires at least J2SE-1.4
+ -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
</configuration>
</plugin>
</plugins>
diff --git a/update/org.eclipse.update.tests.core/pom.xml b/update/org.eclipse.update.tests.core/pom.xml
index e62545e..e20e9f4 100644
--- a/update/org.eclipse.update.tests.core/pom.xml
+++ b/update/org.eclipse.update.tests.core/pom.xml
@@ -11,7 +11,7 @@
-->
<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>eclipse.platform</artifactId>
diff --git a/update/org.eclipse.update.ui/pom.xml b/update/org.eclipse.update.ui/pom.xml
index d2d7396..b5fa194 100644
--- a/update/org.eclipse.update.ui/pom.xml
+++ b/update/org.eclipse.update.ui/pom.xml
@@ -23,14 +23,16 @@
<artifactId>org.eclipse.update.ui</artifactId>
<version>3.3.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>
+ <!--
+ dependency on org.eclipse.equinox.security requires at least J2SE-1.4
+ -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
</configuration>
</plugin>
</plugins>