aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-08-13 09:23:21 (EDT)
committerPaul Webster2012-09-12 09:50:20 (EDT)
commit86dac214a186e2a7a43b008947edabceb5a908e6 (patch)
tree91e1ae22735c4659dae23a100a82dfa8046e53e6
parent1339208c0e2e02a216b01dd3faed095028e629e0 (diff)
downloadeclipse.platform.ui-86dac214a186e2a7a43b008947edabceb5a908e6.zip
eclipse.platform.ui-86dac214a186e2a7a43b008947edabceb5a908e6.tar.gz
eclipse.platform.ui-86dac214a186e2a7a43b008947edabceb5a908e6.tar.bz2
Bug 386646 - build against declared and/or observed bundle runtime execution environmentv20120912-135020
-rw-r--r--bundles/org.eclipse.core.commands/pom.xml12
-rw-r--r--bundles/org.eclipse.core.databinding/pom.xml2
-rw-r--r--bundles/org.eclipse.jface.databinding/pom.xml12
-rw-r--r--bundles/org.eclipse.jface/pom.xml12
-rw-r--r--bundles/org.eclipse.ui.views.properties.tabbed/pom.xml12
-rw-r--r--bundles/org.eclipse.ui/pom.xml12
-rw-r--r--examples/org.eclipse.ui.examples.fieldassist/pom.xml12
-rw-r--r--examples/org.eclipse.ui.examples.multipageeditor/pom.xml12
-rw-r--r--examples/org.eclipse.ui.examples.readmetool/pom.xml12
-rw-r--r--examples/org.eclipse.ui.examples.undo/pom.xml12
-rw-r--r--examples/org.eclipse.ui.examples.views.properties.tabbed.article/pom.xml12
-rw-r--r--tests/org.eclipse.ui.tests.harness/pom.xml12
-rw-r--r--tests/org.eclipse.ui.tests.views.properties.tabbed/pom.xml28
13 files changed, 111 insertions, 51 deletions
diff --git a/bundles/org.eclipse.core.commands/pom.xml b/bundles/org.eclipse.core.commands/pom.xml
index b2ca007..25c0cdc 100644
--- a/bundles/org.eclipse.core.commands/pom.xml
+++ b/bundles/org.eclipse.core.commands/pom.xml
@@ -23,16 +23,4 @@
<artifactId>org.eclipse.core.commands</artifactId>
<version>3.6.1-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.core.databinding/pom.xml b/bundles/org.eclipse.core.databinding/pom.xml
index b184fdc..f6e4d74 100644
--- a/bundles/org.eclipse.core.databinding/pom.xml
+++ b/bundles/org.eclipse.core.databinding/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.ui</artifactId>
diff --git a/bundles/org.eclipse.jface.databinding/pom.xml b/bundles/org.eclipse.jface.databinding/pom.xml
index 590e05e..0042880 100644
--- a/bundles/org.eclipse.jface.databinding/pom.xml
+++ b/bundles/org.eclipse.jface.databinding/pom.xml
@@ -23,16 +23,4 @@
<artifactId>org.eclipse.jface.databinding</artifactId>
<version>1.6.0-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.jface/pom.xml b/bundles/org.eclipse.jface/pom.xml
index 8cb39a1..f452c1a 100644
--- a/bundles/org.eclipse.jface/pom.xml
+++ b/bundles/org.eclipse.jface/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.jface</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!-- juno version of this bundle was aparently compiled against jdk 1.4 librariesF-->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/pom.xml b/bundles/org.eclipse.ui.views.properties.tabbed/pom.xml
index 2476dc4..f05c90b 100644
--- a/bundles/org.eclipse.ui.views.properties.tabbed/pom.xml
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/pom.xml
@@ -23,16 +23,4 @@
<artifactId>org.eclipse.ui.views.properties.tabbed</artifactId>
<version>3.5.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.ui/pom.xml b/bundles/org.eclipse.ui/pom.xml
index 19f8db0..d6ca1ec 100644
--- a/bundles/org.eclipse.ui/pom.xml
+++ b/bundles/org.eclipse.ui/pom.xml
@@ -23,16 +23,4 @@
<artifactId>org.eclipse.ui</artifactId>
<version>3.8.0-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/examples/org.eclipse.ui.examples.fieldassist/pom.xml b/examples/org.eclipse.ui.examples.fieldassist/pom.xml
index 69449e1..133c976 100644
--- a/examples/org.eclipse.ui.examples.fieldassist/pom.xml
+++ b/examples/org.eclipse.ui.examples.fieldassist/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.examples.fieldassist</artifactId>
<version>1.1.2-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/examples/org.eclipse.ui.examples.multipageeditor/pom.xml b/examples/org.eclipse.ui.examples.multipageeditor/pom.xml
index 37b409b..e36f867 100644
--- a/examples/org.eclipse.ui.examples.multipageeditor/pom.xml
+++ b/examples/org.eclipse.ui.examples.multipageeditor/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.examples.multipageeditor</artifactId>
<version>3.2.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!-- observed Juno compile target -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/examples/org.eclipse.ui.examples.readmetool/pom.xml b/examples/org.eclipse.ui.examples.readmetool/pom.xml
index 05a9354..2a3459f 100644
--- a/examples/org.eclipse.ui.examples.readmetool/pom.xml
+++ b/examples/org.eclipse.ui.examples.readmetool/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.examples.readmetool</artifactId>
<version>3.3.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <!-- observed Juno compile target -->
+ <executionEnvironment>J2SE-1.4</executionEnvironment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/examples/org.eclipse.ui.examples.undo/pom.xml b/examples/org.eclipse.ui.examples.undo/pom.xml
index e316b2c..2aec49c 100644
--- a/examples/org.eclipse.ui.examples.undo/pom.xml
+++ b/examples/org.eclipse.ui.examples.undo/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.examples.undo</artifactId>
<version>3.2.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/examples/org.eclipse.ui.examples.views.properties.tabbed.article/pom.xml b/examples/org.eclipse.ui.examples.views.properties.tabbed.article/pom.xml
index 6637923..b54f3c6 100644
--- a/examples/org.eclipse.ui.examples.views.properties.tabbed.article/pom.xml
+++ b/examples/org.eclipse.ui.examples.views.properties.tabbed.article/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.examples.views.properties.tabbed.article</artifactId>
<version>3.2.1-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/tests/org.eclipse.ui.tests.harness/pom.xml b/tests/org.eclipse.ui.tests.harness/pom.xml
index 83fadcb..6b0adac 100644
--- a/tests/org.eclipse.ui.tests.harness/pom.xml
+++ b/tests/org.eclipse.ui.tests.harness/pom.xml
@@ -23,4 +23,16 @@
<artifactId>org.eclipse.ui.tests.harness</artifactId>
<version>1.2.0-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/tests/org.eclipse.ui.tests.views.properties.tabbed/pom.xml b/tests/org.eclipse.ui.tests.views.properties.tabbed/pom.xml
index d63cb51..43fdaaa 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/pom.xml
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/pom.xml
@@ -10,8 +10,9 @@
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.ui</artifactId>
@@ -23,4 +24,27 @@
<artifactId>org.eclipse.ui.tests.views.properties.tabbed</artifactId>
<version>3.5.100-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>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <!-- source/target match bundle minimal BREE CDC-1.0/Foundation-1.0 -->
+ <source>1.3</source>
+ <target>1.1</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>