summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-13 09:20:28 (EDT)
committer Paul Webster2012-09-12 10:40:26 (EDT)
commitd9b1ffcc6b78ae7e6252b0dd98ecbce5bf3b7edb (patch)
treeb79d1d7d9fa89c068175504a6b743345694f83b1
parent240057be1c7211e37246398107ef1f641d7e949a (diff)
downloadeclipse.platform-d9b1ffcc6b78ae7e6252b0dd98ecbce5bf3b7edb.zip
eclipse.platform-d9b1ffcc6b78ae7e6252b0dd98ecbce5bf3b7edb.tar.gz
eclipse.platform-d9b1ffcc6b78ae7e6252b0dd98ecbce5bf3b7edb.tar.bz2
Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120912-144026
-rw-r--r--pom.xml6
-rw-r--r--update/org.eclipse.update.configurator/pom.xml12
-rw-r--r--update/org.eclipse.update.core/pom.xml20
3 files changed, 29 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index 317bf4e..e4cd72d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,12 +30,6 @@
<modules>
<module>update/org.eclipse.update.configurator</module>
<module>update/org.eclipse.update.core</module>
- <module>update/org.eclipse.update.core.linux</module>
- <module>update/org.eclipse.update.core.win32</module>
- <module>update/org.eclipse.update.examples</module>
- <module>update/org.eclipse.update.tests.core</module>
- <module>update/org.eclipse.update.scheduler</module>
- <module>update/org.eclipse.update.ui</module>
<module>ant/org.eclipse.ant.core</module>
<module>ant/org.eclipse.ant.launching</module>
<module>ant/org.eclipse.ant.ui</module>
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>