From 9782432f3b45d6452b44356e7c5368895588c133 Mon Sep 17 00:00:00 2001
From: Igor Fedorenko
Date: Mon, 13 Aug 2012 09:23:41 -0400
Subject: Bug 386646 - build against declared and/or observed bundle runtime
 execution environment

---
 bundles/org.eclipse.equinox.bidi/pom.xml             |  2 +-
 bundles/org.eclipse.equinox.cm.test/pom.xml          | 20 ++++++++++++++++++++
 bundles/org.eclipse.equinox.concurrent/pom.xml       | 12 ------------
 bundles/org.eclipse.equinox.device/pom.xml           | 12 ------------
 bundles/org.eclipse.equinox.http.jetty5/pom.xml      |  2 ++
 bundles/org.eclipse.equinox.http.registry/pom.xml    |  2 --
 bundles/org.eclipse.equinox.http.servlet/pom.xml     | 12 ------------
 .../org.eclipse.equinox.http.servletbridge/pom.xml   |  1 -
 bundles/org.eclipse.equinox.http/pom.xml             |  2 ++
 bundles/org.eclipse.equinox.ip/pom.xml               | 12 ------------
 .../org.eclipse.equinox.jsp.jasper.registry/pom.xml  | 12 ------------
 bundles/org.eclipse.equinox.jsp.jasper/pom.xml       | 12 ------------
 bundles/org.eclipse.equinox.log/pom.xml              | 17 +++++++++++++++++
 bundles/org.eclipse.equinox.servletbridge/pom.xml    | 12 ------------
 bundles/org.eclipse.equinox.wireadmin/pom.xml        | 12 ------------
 15 files changed, 42 insertions(+), 100 deletions(-)

(limited to 'bundles')

diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index f49fe790f..440502dc3 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -36,7 +36,7 @@
              this to the equinox team to reconsile the two, but for now just
              override build profile in pom.xml.
            -->
-          <executionEnvironment>J2SE-1.4</executionEnvironment>
+          <executionEnvironment>OSGi/Minimum-1.2</executionEnvironment>
         </configuration>
       </plugin>
     </plugins>
diff --git a/bundles/org.eclipse.equinox.cm.test/pom.xml b/bundles/org.eclipse.equinox.cm.test/pom.xml
index abfa46c92..7f2e580e5 100644
--- a/bundles/org.eclipse.equinox.cm.test/pom.xml
+++ b/bundles/org.eclipse.equinox.cm.test/pom.xml
@@ -23,4 +23,24 @@
   <artifactId>org.eclipse.equinox.cm.test</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!--
+          Default BREE J2SE-1.5+ results in compile errors similar to
+          
+          1. ERROR in /private/var/tmp/lts/R4_platform-aggregator/rt.equinox.bundles/bundles/org.eclipse.equinox.cm.test/src/org/eclipse/equinox/cm/test/ConfigurationPluginTest.java (at line 47)
+        config.update(props);
+               ^^^^^^
+The method update(Dictionary<String,?>) in the type Configuration is not applicable for the arguments (Properties)
+           -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.concurrent/pom.xml b/bundles/org.eclipse.equinox.concurrent/pom.xml
index afc8d6d7b..652fc217f 100644
--- a/bundles/org.eclipse.equinox.concurrent/pom.xml
+++ b/bundles/org.eclipse.equinox.concurrent/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.concurrent</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.device/pom.xml b/bundles/org.eclipse.equinox.device/pom.xml
index fe0201ebd..9598722cc 100644
--- a/bundles/org.eclipse.equinox.device/pom.xml
+++ b/bundles/org.eclipse.equinox.device/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.device</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.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.http.jetty5/pom.xml b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
index 58728b9ee..63a5b7217 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
@@ -31,6 +31,8 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
+          <!-- J2SE-1.4 to satisfy Import-Package javax.net.* -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
           <filters>
             <!--
               Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045
diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml
index 858d2a34f..cf4b2c080 100644
--- a/bundles/org.eclipse.equinox.http.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.http.registry/pom.xml
@@ -40,8 +40,6 @@
               <removeAll/>
             </filter>
           </filters>
-
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
         </configuration>
       </plugin>
     </plugins>
diff --git a/bundles/org.eclipse.equinox.http.servlet/pom.xml b/bundles/org.eclipse.equinox.http.servlet/pom.xml
index 73391469e..423f4b3c5 100644
--- a/bundles/org.eclipse.equinox.http.servlet/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servlet/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.http.servlet</artifactId>
   <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
index b67736c11..08a550152 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
@@ -31,7 +31,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
           <filters>
             <!--
               Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045
diff --git a/bundles/org.eclipse.equinox.http/pom.xml b/bundles/org.eclipse.equinox.http/pom.xml
index 01184fb1b..e80632daa 100644
--- a/bundles/org.eclipse.equinox.http/pom.xml
+++ b/bundles/org.eclipse.equinox.http/pom.xml
@@ -31,6 +31,8 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
+          <!-- J2SE-1.4 to satisfy Import-Package javax.net -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
           <filters>
             <!--
               Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045
diff --git a/bundles/org.eclipse.equinox.ip/pom.xml b/bundles/org.eclipse.equinox.ip/pom.xml
index 6887c090b..c25b9c2fc 100644
--- a/bundles/org.eclipse.equinox.ip/pom.xml
+++ b/bundles/org.eclipse.equinox.ip/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.ip</artifactId>
   <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
index e9681b1bc..d4aa908f6 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.jsp.jasper.registry</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
index eb4fbc598..7c5e60888 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.jsp.jasper</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.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.log/pom.xml b/bundles/org.eclipse.equinox.log/pom.xml
index f4b108556..1127deeae 100644
--- a/bundles/org.eclipse.equinox.log/pom.xml
+++ b/bundles/org.eclipse.equinox.log/pom.xml
@@ -23,4 +23,21 @@
   <artifactId>org.eclipse.equinox.log</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!--
+              src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java
+              calls Thread.getId, which was introduced in JDK 1.5
+          -->
+          <executionEnvironment>J2SE-1.5</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/bundles/org.eclipse.equinox.servletbridge/pom.xml b/bundles/org.eclipse.equinox.servletbridge/pom.xml
index 8b3b3c387..377b5ff7f 100644
--- a/bundles/org.eclipse.equinox.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.servletbridge</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <executionEnvironment>CDC-1.0/Foundation-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/bundles/org.eclipse.equinox.wireadmin/pom.xml b/bundles/org.eclipse.equinox.wireadmin/pom.xml
index 0e3da4be5..acf21f257 100644
--- a/bundles/org.eclipse.equinox.wireadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.wireadmin/pom.xml
@@ -23,16 +23,4 @@
   <artifactId>org.eclipse.equinox.wireadmin</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>OSGi/Minimum-1.0</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
-- 
cgit v1.2.3