aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-13 09:23:41 (EDT)
committerThomas Watson2012-09-12 08:58:10 (EDT)
commit9782432f3b45d6452b44356e7c5368895588c133 (patch)
tree1c10abbf93045f1695b810e24a61ed083f99cdc5
parente8d6abbfe9ea245e29fc11acbb2e69ceafd6ad1c (diff)
downloadrt.equinox.bundles-9782432f3b45d6452b44356e7c5368895588c133.zip
rt.equinox.bundles-9782432f3b45d6452b44356e7c5368895588c133.tar.gz
rt.equinox.bundles-9782432f3b45d6452b44356e7c5368895588c133.tar.bz2
Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120912-125810
-rw-r--r--bundles/org.eclipse.equinox.bidi/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.cm.test/pom.xml20
-rw-r--r--bundles/org.eclipse.equinox.concurrent/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.device/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.http.jetty5/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.http.registry/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.http.servletbridge/pom.xml1
-rw-r--r--bundles/org.eclipse.equinox.http/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.ip/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.jsp.jasper/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.log/pom.xml17
-rw-r--r--bundles/org.eclipse.equinox.servletbridge/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.wireadmin/pom.xml12
-rw-r--r--features/org.eclipse.equinox.sdk/pom.xml13
16 files changed, 42 insertions, 113 deletions
diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index f49fe79..440502d 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 abfa46c..7f2e580 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 afc8d6d..652fc21 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 fe0201e..9598722 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 58728b9..63a5b72 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 858d2a3..cf4b2c0 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 7339146..423f4b3 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 b67736c..08a5501 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 01184fb..e80632d 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 6887c09..c25b9c2 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 e9681b1..d4aa908 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 eb4fbc5..7c5e608 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 f4b1085..1127dee 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 8b3b3c3..377b5ff 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 0e3da4b..acf21f2 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>
diff --git a/features/org.eclipse.equinox.sdk/pom.xml b/features/org.eclipse.equinox.sdk/pom.xml
index 2977f91..4bfef17 100644
--- a/features/org.eclipse.equinox.sdk/pom.xml
+++ b/features/org.eclipse.equinox.sdk/pom.xml
@@ -23,17 +23,4 @@
<artifactId>org.eclipse.equinox.sdk</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <!-- J2SE-1.5 is the minimum version required for javax.security.sasl required by this bundle. -->
- <executionEnvironment>J2SE-1.5</executionEnvironment>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>