Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120912-142556

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 4892edc4d..ac656f9db 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 dd8679e0e..203107bfc 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 c482a6c99..3616ebc0b 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 e62545ed3..e20e9f491 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 d2d7396d8..b5fa194a4 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>