[eclipse-dltk] Update to 4.0.0 and build with tycho.
swagiaal
swagiaal at fedoraproject.org
Wed Apr 25 15:52:53 UTC 2012
commit e4899a1345d307fae95774b2822526240a91843b
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Tue Apr 24 19:01:20 2012 -0400
Update to 4.0.0 and build with tycho.
- Checkout entire org.eclipse.dltk module.
- Patch dltk to build with tycho 0.14.0
- Use tycho to build dltk
- Add tycho and maven requirements.
add-local-fedora-repo.patch | 27 +
correct-mismatched-feature-and-artifactIds.patch | 315 +++++++
...d-version-of-org.eclipse.rse.services.ssh.patch | 19 +
disable-javascript-and-python.patch | 46 +
disable-specific-environment-settings.patch | 53 ++
eclipse-dltk.spec | 133 ++--
get-dltk.sh | 42 +-
remove-dependencies-on-empty-source-bundles.patch | 119 +++
...missing-files-from-build.properties-files.patch | 67 ++
rename-tycho-plugins-to-0.14.0-names.patch | 39 +
sources | 2 +-
use-JavaSE-1.6-instead-of-J2SE-1.4.patch | 319 +++++++
use-JavaSE-1.6-instead-of-J2SE-1.5.patch | 978 ++++++++++++++++++++
13 files changed, 2065 insertions(+), 94 deletions(-)
---
diff --git a/add-local-fedora-repo.patch b/add-local-fedora-repo.patch
new file mode 100644
index 0000000..369ef00
--- /dev/null
+++ b/add-local-fedora-repo.patch
@@ -0,0 +1,27 @@
+commit 72829b0bd0ec3b23e4f4c489bf8171b05c9c804e
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 16:34:58 2012 -0400
+
+ Fedora: use local repo
+
+diff --git a/build/pom.xml b/build/pom.xml
+index 034ea3d..653ae58 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -17,11 +17,11 @@
+ </properties>
+
+ <repositories>
+- <repository>
+- <id>indigo</id>
+- <layout>p2</layout>
+- <url>${eclipse-repository-url}</url>
+- </repository>
++ <repository>
++ <id>fedora-rpmbuild</id>
++ <url>file:../myrepo</url>
++ <layout>p2</layout>
++ </repository>
+ </repositories>
+
+ <modules>
diff --git a/correct-mismatched-feature-and-artifactIds.patch b/correct-mismatched-feature-and-artifactIds.patch
new file mode 100644
index 0000000..1ec0a56
--- /dev/null
+++ b/correct-mismatched-feature-and-artifactIds.patch
@@ -0,0 +1,315 @@
+commit 4a73e1171d6374aacff006d4431b62c20c0117ac
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 15:51:04 2012 -0400
+
+ Make sure groupId matches bundle id
+
+ Add -feature to the group id of all features for
+ consistency
+
+diff --git a/core/features/org.eclipse.dltk.core-feature/pom.xml b/core/features/org.eclipse.dltk.core-feature/pom.xml
+index c2d4ae8..7e34e06 100644
+--- a/core/features/org.eclipse.dltk.core-feature/pom.xml
++++ b/core/features/org.eclipse.dltk.core-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.core</groupId>
+- <artifactId>org.eclipse.dltk.core-feature</artifactId>
++ <groupId>org.eclipse.dltk.core-feature</groupId>
++ <artifactId>org.eclipse.dltk.core</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ <build>
+diff --git a/core/features/org.eclipse.dltk.core.index-feature/pom.xml b/core/features/org.eclipse.dltk.core.index-feature/pom.xml
+index 4b1b543..c209d4d 100644
+--- a/core/features/org.eclipse.dltk.core.index-feature/pom.xml
++++ b/core/features/org.eclipse.dltk.core.index-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.core</groupId>
+- <artifactId>org.eclipse.dltk.core.index-feature</artifactId>
++ <groupId>org.eclipse.dltk.core-feature</groupId>
++ <artifactId>org.eclipse.dltk.core.index</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/core/features/org.eclipse.dltk.core.index.sdk/pom.xml b/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
+index 3837ebd..289f564 100644
+--- a/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
++++ b/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.core</groupId>
++ <groupId>org.eclipse.dltk.core-feature</groupId>
+ <artifactId>org.eclipse.dltk.core.index.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/core/features/org.eclipse.dltk.core.sdk/pom.xml b/core/features/org.eclipse.dltk.core.sdk/pom.xml
+index d573624..d1447cc 100644
+--- a/core/features/org.eclipse.dltk.core.sdk/pom.xml
++++ b/core/features/org.eclipse.dltk.core.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.core</groupId>
++ <groupId>org.eclipse.dltk.core-feature</groupId>
+ <artifactId>org.eclipse.dltk.core.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/core/features/org.eclipse.dltk.core.tests/pom.xml b/core/features/org.eclipse.dltk.core.tests/pom.xml
+index c61fdf5..b46c475 100644
+--- a/core/features/org.eclipse.dltk.core.tests/pom.xml
++++ b/core/features/org.eclipse.dltk.core.tests/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.core</groupId>
+- <artifactId>org.eclipse.dltk.core.tests-feature</artifactId>
++ <groupId>org.eclipse.dltk.core-feature</groupId>
++ <artifactId>org.eclipse.dltk.core.tests</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml b/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
+index e72a700..fb754d8 100644
+--- a/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
++++ b/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.tcl</groupId>
+- <artifactId>org.eclipse.dltk.itcl-feature</artifactId>
++ <groupId>org.eclipse.dltk.tcl-feature</groupId>
++ <artifactId>org.eclipse.dltk.itcl</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml b/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
+index 65bb15c..f621a0e 100644
+--- a/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
++++ b/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.itcl</groupId>
++ <groupId>org.eclipse.dltk.itcl-feature</groupId>
+ <artifactId>org.eclipse.dltk.itcl.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml b/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
+index d8e2114..79de964 100644
+--- a/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
++++ b/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.javascript</groupId>
++ <groupId>org.eclipse.dltk.javascript-feature</groupId>
+ <artifactId>org.eclipse.dltk.javascript</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml b/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
+index e0a67e2..9205888 100644
+--- a/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
++++ b/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.javascript</groupId>
++ <groupId>org.eclipse.dltk.javascript-feature</groupId>
+ <artifactId>org.eclipse.dltk.javascript.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml b/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
+index c2078cd..e2d689e 100644
+--- a/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
++++ b/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
+@@ -7,7 +7,7 @@
+ <groupId>org.eclipse.dltk</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+- <groupId>org.eclipse.dltk</groupId>
++ <groupId>org.eclipse.dltk-feature</groupId>
+ <artifactId>org.eclipse.dltk.javascript.tests</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
+index 8bc4289..addb9fd 100644
+--- a/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
++++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.mylyn</groupId>
+- <artifactId>org.eclipse.dltk.mylyn-feature</artifactId>
++ <groupId>org.eclipse.dltk.mylyn-feature</groupId>
++ <artifactId>org.eclipse.dltk.mylyn</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
+index 55e9539..db3a684 100644
+--- a/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
++++ b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.mylyn</groupId>
++ <groupId>org.eclipse.dltk.mylyn-feature</groupId>
+ <artifactId>org.eclipse.dltk.mylyn.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/python/features/org.eclipse.dltk.python-feature/pom.xml b/python/features/org.eclipse.dltk.python-feature/pom.xml
+index e15fd0b..5d28d5d 100644
+--- a/python/features/org.eclipse.dltk.python-feature/pom.xml
++++ b/python/features/org.eclipse.dltk.python-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.python</groupId>
+- <artifactId>org.eclipse.dltk.python-feature</artifactId>
++ <groupId>org.eclipse.dltk.python-feature</groupId>
++ <artifactId>org.eclipse.dltk.python</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/python/features/org.eclipse.dltk.python.sdk/pom.xml b/python/features/org.eclipse.dltk.python.sdk/pom.xml
+index d9c28bd..89dda56 100644
+--- a/python/features/org.eclipse.dltk.python.sdk/pom.xml
++++ b/python/features/org.eclipse.dltk.python.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.python</groupId>
++ <groupId>org.eclipse.dltk.python-feature</groupId>
+ <artifactId>org.eclipse.dltk.python.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/rse/features/org.eclipse.dltk.rse-feature/pom.xml b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
+index 477724e..49747dc 100644
+--- a/rse/features/org.eclipse.dltk.rse-feature/pom.xml
++++ b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.rse</groupId>
+- <artifactId>org.eclipse.dltk.rse-feature</artifactId>
++ <groupId>org.eclipse.dltk.rse-feature</groupId>
++ <artifactId>org.eclipse.dltk.rse</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/rse/features/org.eclipse.dltk.rse.sdk/pom.xml b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
+index c137f53..79ad1ff 100644
+--- a/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
++++ b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.rse</groupId>
++ <groupId>org.eclipse.dltk.rse-feature</groupId>
+ <artifactId>org.eclipse.dltk.rse.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml b/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
+index 63a5021..03daefc 100644
+--- a/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
++++ b/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.ruby</groupId>
+- <artifactId>org.eclipse.dltk.ruby-feature</artifactId>
++ <groupId>org.eclipse.dltk.ruby-feature</groupId>
++ <artifactId>org.eclipse.dltk.ruby</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml b/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
+index 9dc9475..9c95820 100644
+--- a/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
++++ b/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.ruby</groupId>
++ <groupId>org.eclipse.dltk.ruby-feature</groupId>
+ <artifactId>org.eclipse.dltk.ruby.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml b/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
+index 8dc2f89..d477045 100644
+--- a/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
++++ b/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.tcl</groupId>
+- <artifactId>org.eclipse.dltk.tcl-feature</artifactId>
++ <groupId>org.eclipse.dltk.tcl-feature</groupId>
++ <artifactId>org.eclipse.dltk.tcl</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml b/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
+index 2a2a51f..012e0b9 100644
+--- a/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
++++ b/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.tcl</groupId>
++ <groupId>org.eclipse.dltk.tcl-feature</groupId>
+ <artifactId>org.eclipse.dltk.tcl.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml b/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
+index ce1b282..def17df 100644
+--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
++++ b/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
+@@ -8,8 +8,8 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.tcl</groupId>
+- <artifactId>org.eclipse.dltk.xotcl-feature</artifactId>
++ <groupId>org.eclipse.dltk.tcl-feature</groupId>
++ <artifactId>org.eclipse.dltk.xotcl</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ </project>
+diff --git a/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml b/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
+index 7f141e9..aa730aa 100644
+--- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
++++ b/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+- <groupId>org.eclipse.dltk.xotcl</groupId>
++ <groupId>org.eclipse.dltk.xotcl-feature</groupId>
+ <artifactId>org.eclipse.dltk.xotcl.sdk</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
diff --git a/correct-required-version-of-org.eclipse.rse.services.ssh.patch b/correct-required-version-of-org.eclipse.rse.services.ssh.patch
new file mode 100644
index 0000000..c70cc32
--- /dev/null
+++ b/correct-required-version-of-org.eclipse.rse.services.ssh.patch
@@ -0,0 +1,19 @@
+commit cbb2c7fa2ce65ce457817202a2f0ea6215e75375
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu Apr 19 10:55:26 2012 -0400
+
+ Fix org.eclipse.rse.services.ssh required version
+
+diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+index 2d9c981..09739c5 100644
+--- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
++++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.rse.efs,
+ org.eclipse.rse.services,
+ org.eclipse.rse.connectorservice.ssh;resolution:=optional,
+- org.eclipse.rse.services.ssh;bundle-version="4.0.0";resolution:=optional
++ org.eclipse.rse.services.ssh;bundle-version="3.0.0";resolution:=optional
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.core.internal.rse;x-friends:=org.eclipse.dltk.rse.ui,
+ org.eclipse.dltk.core.internal.rse.perfomance;x-internal:=true
diff --git a/disable-javascript-and-python.patch b/disable-javascript-and-python.patch
new file mode 100644
index 0000000..1622c07
--- /dev/null
+++ b/disable-javascript-and-python.patch
@@ -0,0 +1,46 @@
+commit bed0a5f9c3c89a9f89c0d5ac487a40df4efd80a7
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Tue Apr 24 16:21:49 2012 -0400
+
+ Fedora: Disable javascript and python packages
+
+diff --git a/build/pom.xml b/build/pom.xml
+index 6d680dd..77df341 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -30,11 +30,13 @@
+ <module>../xotcl</module>
+ <module>../itcl</module>
+ <module>../ruby</module>
+- <module>../javascript</module>
+ <module>../rse</module>
+- <module>../python</module>
+ <module>../mylyn</module>
+ <module>update.site</module>
++ <!--
++ <module>../javascript</module>
++ <module>../python</module>
++ -->
+ <!-- <module>site</module> -->
+ </modules>
+
+diff --git a/build/update.site/site.xml b/build/update.site/site.xml
+index 61ecc3b..8bcb33c 100644
+--- a/build/update.site/site.xml
++++ b/build/update.site/site.xml
+@@ -44,6 +44,7 @@
+ <feature url="features/org.eclipse.dltk.tcl.sdk_4.0.0.qualifier.jar" id="org.eclipse.dltk.tcl.sdk" version="4.0.0.qualifier">
+ <category name="Dynamic Languages Toolkit (DLTK)"/>
+ </feature>
++<!--
+ <feature url="features/org.eclipse.dltk.python_4.0.0.qualifier.jar" id="org.eclipse.dltk.python" version="4.0.0.qualifier">
+ <category name="Dynamic Languages Toolkit (DLTK)"/>
+ </feature>
+@@ -56,6 +57,7 @@
+ <feature url="features/org.eclipse.dltk.javascript.sdk_4.0.0.qualifier.jar" id="org.eclipse.dltk.javascript.sdk" version="4.0.0.qualifier">
+ <category name="Dynamic Languages Toolkit (DLTK)"/>
+ </feature>
++-->
+ <feature url="features/org.eclipse.dltk.xotcl_4.0.0.qualifier.jar" id="org.eclipse.dltk.xotcl" version="4.0.0.qualifier">
+ <category name="Dynamic Languages Toolkit (DLTK)"/>
+ </feature>
diff --git a/disable-specific-environment-settings.patch b/disable-specific-environment-settings.patch
new file mode 100644
index 0000000..1b11254
--- /dev/null
+++ b/disable-specific-environment-settings.patch
@@ -0,0 +1,53 @@
+commit e3d2326c040fc07681998ba31de63df83b90c0e5
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 16:35:47 2012 -0400
+
+ Fedora: disable specific environment settings
+
+diff --git a/build/pom.xml b/build/pom.xml
+index 653ae58..0ef0f4a 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -76,42 +76,6 @@
+ </execution>
+ </executions>
+ </plugin>
+-
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho-version}</version>
+- <configuration>
+- <resolver>p2</resolver>
+- <environments>
+- <environment>
+- <os>linux</os>
+- <ws>gtk</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>linux</os>
+- <ws>gtk</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+- </environments>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index 6b193f2..cb9ffa6 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -2,7 +2,7 @@
Name: eclipse-dltk
Version: 4.0.0
-Release: 0.1.201201070225cvs%{?dist}
+Release: 0.2.201201070225cvs%{?dist}
Summary: Dynamic Languages Toolkit (DLTK) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -14,6 +14,16 @@ URL: http://www.eclipse.org/dltk/
Source0: dltk-%{version}.tar.xz
Source1: get-dltk.sh
+Patch1: add-local-fedora-repo.patch
+Patch2: remove-dependencies-on-empty-source-bundles.patch
+Patch3: use-JavaSE-1.6-instead-of-J2SE-1.4.patch
+Patch4: correct-mismatched-feature-and-artifactIds.patch
+Patch5: remove-missing-files-from-build.properties-files.patch
+Patch6: use-JavaSE-1.6-instead-of-J2SE-1.5.patch
+Patch7: correct-required-version-of-org.eclipse.rse.services.ssh.patch
+Patch8: disable-specific-environment-settings.patch
+Patch9: disable-javascript-and-python.patch
+Patch10: rename-tycho-plugins-to-0.14.0-names.patch
BuildArch: noarch
@@ -26,6 +36,8 @@ BuildRequires: eclipse-mylyn-ide
BuildRequires: eclipse-mylyn-context
BuildRequires: eclipse-rse
BuildRequires: h2
+BuildRequires: maven
+BuildRequires: tycho
Requires: java
Requires: jpackage-utils
Requires: eclipse-platform >= 1:3.5.0
@@ -125,6 +137,16 @@ Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
%prep
%setup -q -n dltk-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
@@ -145,83 +167,78 @@ popd
%build
# Note: Use date from the cvs tag as the context qualifier.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v201201070225"
+OPTIONS="-DforceContextQualifier=v201201070225 -Dmaven.test.skip=true clean install"
+
+#export JAVA_HOME=%{java_home}
+#export PATH=%{java_bin}:/usr/bin:$PATH
+
+# Ensure that all required dependencies are available in a local p2 repo
+/bin/sh -x %{_eclipse_base}/buildscripts/copy-platform SDK \
+ %{_eclipse_base} emf rse mylyn mylyn-commons mylyn-ide mylyn-context
+
+ln -s %{_javadir}/h2.jar SDK/plugins/h2.jar
+
+pushd SDK
+ln -s %{_javadir} javadir
+popd
+
+eclipse -debug -consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -me\
+tadataRepository file:$PWD/myrepo -artifactRepository file:$PWD/myrepo -source $PWD/SDK -compress -append -publishArtifacts
# build all features
-eclipse-pdebuild -f org.eclipse.dltk.core \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.core.index \
- -a "$OPTIONS" -d "emf" -o `pwd`/orbitDeps
-eclipse-pdebuild -f org.eclipse.dltk.ruby \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.tcl \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.itcl \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.xotcl \
- -a "$OPTIONS" -d "emf"
-#eclipse-pdebuild -f org.eclipse.dltk.javascript \
-# -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.mylyn \
- -a "$OPTIONS" -d "mylyn mylyn-ide mylyn-commons mylyn-context"
-eclipse-pdebuild -f org.eclipse.dltk.rse \
- -a "$OPTIONS" -d "rse"
-
-# build all sdk features
-eclipse-pdebuild -f org.eclipse.dltk.core.sdk \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.core.index.sdk \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.ruby.sdk \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.tcl.sdk \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.itcl.sdk \
- -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.xotcl.sdk \
- -a "$OPTIONS" -d "emf"
-#eclipse-pdebuild -f org.eclipse.dltk.javascript.sdk \
-# -a "$OPTIONS" -d "emf"
-eclipse-pdebuild -f org.eclipse.dltk.mylyn.sdk \
- -a "$OPTIONS" -d "mylyn mylyn-ide mylyn-commons mylyn-context"
-eclipse-pdebuild -f org.eclipse.dltk.rse.sdk \
- -a "$OPTIONS" -d "rse"
+pushd build
+mvn-rpmbuild $OPTIONS
+popd
%install
install -d -m 755 %{buildroot}%{eclipse_dropin}
-SUBPACKAGES="core core.index ruby tcl itcl xotcl mylyn rse"
+SUBPACKAGES="core.index core ruby tcl itcl xotcl mylyn rse"
+
+mkdir -p %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins
+mkdir -p %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features
+
+pushd build/update.site/target/site
+mv plugins/org.eclipse.dltk.*.source* %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins
+mv features/org.eclipse.dltk.*.sdk* %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features
+
for s in $SUBPACKAGES ; do
- unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-$s build/rpmBuild/org.eclipse.dltk.$s.zip
- unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-sdk build/rpmBuild/org.eclipse.dltk.$s.sdk.zip
- # the non-sdk builds are a subset of the sdk builds, so delete duplicate features & plugins from the sdks
- (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/features | xargs rm -rf)
- (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/plugins | xargs rm -rf)
+ mkdir -p %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/plugins
+ mkdir -p %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/features
+
+ mv plugins/org.eclipse.dltk.$s* %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/plugins
+ mv features/org.eclipse.dltk.$s* %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/features
done
-ln -s %{_javadir}/h2.jar %{buildroot}/%{eclipse_dropin}/dltk-core.index/eclipse/plugins/org.h2.jar
+#Install .launching, .debug*, .ui, .console bundles into core
+mv plugins/org.eclipse.dltk.launching* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
+mv plugins/org.eclipse.dltk.debug* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
+mv plugins/org.eclipse.dltk.ui* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
+mv plugins/org.eclipse.dltk.console* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
+
+popd
%files
%{eclipse_dropin}/dltk-core
%{eclipse_dropin}/dltk-core.index
-%doc org.eclipse.dltk.core-feature/rootfiles/*
+%doc core/features/org.eclipse.dltk.core-feature/rootfiles/*
%files ruby
%{eclipse_dropin}/dltk-ruby
-%doc org.eclipse.dltk.ruby-feature/rootfiles/*
+%doc ruby/features/org.eclipse.dltk.ruby-feature/rootfiles/*
%files tcl
%{eclipse_dropin}/dltk-tcl
-%doc org.eclipse.dltk.tcl-feature/rootfiles/*
+%doc tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/*
%files itcl
%{eclipse_dropin}/dltk-itcl
-%doc org.eclipse.dltk.itcl-feature/rootfiles/*
+%doc itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/*
%files xotcl
%{eclipse_dropin}/dltk-xotcl
-%doc org.eclipse.dltk.xotcl-feature/rootfiles/*
+%doc xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/*
#%files javascript
#%defattr(-,root,root,-)
@@ -230,17 +247,23 @@ ln -s %{_javadir}/h2.jar %{buildroot}/%{eclipse_dropin}/dltk-core.index/eclipse/
%files mylyn
%{eclipse_dropin}/dltk-mylyn
-%doc org.eclipse.dltk.mylyn-feature/rootfiles/*
+%doc mylyn/features/org.eclipse.dltk.mylyn-feature/rootfiles/*
%files rse
%{eclipse_dropin}/dltk-rse
-%doc org.eclipse.dltk.rse-feature/rootfiles/*
+%doc rse/features/org.eclipse.dltk.rse-feature/rootfiles/*
%files sdk
%{eclipse_dropin}/dltk-sdk
-%doc org.eclipse.dltk.core.sdk/rootfiles/*
+%doc core/features/org.eclipse.dltk.core.sdk/rootfiles/*
%changelog
+* Thu Apr 24 2012 Sami Wagiaalla <swagiaal at redhat.com> - 4.0.0-0.2.201201070225cvs
+- Checkout entire org.eclipse.dltk module.
+- Patch dltk to build with tycho 0.14.0
+- Use tycho to build dltk
+- Add tycho and maven requirements.
+
* Thu Apr 12 2012 Sami Wagiaalla <swagiaal at redhat.com> - 4.0.0-0.1.201201070225cvs
- Update to upstream 4.0.0 snapshot.
diff --git a/get-dltk.sh b/get-dltk.sh
index 0ef2183..2e7882f 100644
--- a/get-dltk.sh
+++ b/get-dltk.sh
@@ -3,7 +3,6 @@ NAME="dltk"
VERSION=4.0.0
TAG=""
DATE="2012-01-07 02:25"
-SUBPACKAGES="core core-index ruby tcl itcl xotcl mylyn rse javascript"
if [ -n "$DATE" ]
then
@@ -12,44 +11,11 @@ else
CHECKOUT="-r $TAG"
fi
-echo "Exporting from CVS..."
-mkdir $NAME-$VERSION
-pushd $NAME-$VERSION >/dev/null
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export "$CHECKOUT" org.eclipse.dltk
+mv org.eclipse.dltk $NAME-$VERSION
-for SUB in $SUBPACKAGES; do
-
-MAPFILE=org.eclipse.dltk/releng.maps/maps/$SUB.map
-TEMPMAPFILE=temp.map
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export "$CHECKOUT" $MAPFILE
-dos2unix $MAPFILE
-grep ^[a-z] $MAPFILE > $TEMPMAPFILE
-
-gawk 'BEGIN {
- FS=","
-}
-{
-if (NF < 4) {
-
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
-}
-else {
-
- split($1, version, "=");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
-}
-
-}' $TEMPMAPFILE
-
-rm $TEMPMAPFILE $MAPFILE
-
-done
-
-popd >/dev/null
+#Remove any commited jars
+find $NAME-$VERSION -name *.jar -delete
echo "Creating tarball '$NAME-$VERSION.tar.xz'..."
tar -caf $NAME-$VERSION.tar.xz $NAME-$VERSION
diff --git a/remove-dependencies-on-empty-source-bundles.patch b/remove-dependencies-on-empty-source-bundles.patch
new file mode 100644
index 0000000..af8faa0
--- /dev/null
+++ b/remove-dependencies-on-empty-source-bundles.patch
@@ -0,0 +1,119 @@
+commit 23752fdef858fdf973d53dfe0a3446df81aa4234
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 16:31:51 2012 -0400
+
+ Remove feature requirement on empty source bundles
+
+diff --git a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
+index a837a13..2a455d2 100644
+--- a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
++++ b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
+@@ -32,10 +32,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.eclipse.dltk.core.index.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+ </feature>
+diff --git a/core/features/org.eclipse.dltk.core.sdk/feature.xml b/core/features/org.eclipse.dltk.core.sdk/feature.xml
+index 600221d..e84b1a0 100644
+--- a/core/features/org.eclipse.dltk.core.sdk/feature.xml
++++ b/core/features/org.eclipse.dltk.core.sdk/feature.xml
+@@ -82,13 +82,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.dltk.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.dltk.testing.source"
+ download-size="0"
+ install-size="0"
+diff --git a/itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml b/itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml
+index 33678df..e789404 100644
+--- a/itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml
++++ b/itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml
+@@ -28,10 +28,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.eclipse.dltk.itcl.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+ </feature>
+diff --git a/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml b/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
+index ae47826..4329852 100644
+--- a/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
++++ b/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
+@@ -64,13 +64,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.dltk.ruby.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.dltk.ruby.abstractdebugger.source"
+ download-size="0"
+ install-size="0"
+diff --git a/tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml b/tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml
+index dbc03c1..3b50e66 100644
+--- a/tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml
++++ b/tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml
+@@ -78,13 +78,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.dltk.tcl.doc.user.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.dltk.tcl.parser.source"
+ download-size="0"
+ install-size="0"
+@@ -99,12 +92,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.dltk.tcl.tcllib.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+ id="org.eclipse.dltk.tcl.formatter.source"
+ download-size="0"
+ install-size="0"
+diff --git a/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml b/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml
+index ddc65f6..f2f59e5 100644
+--- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml
++++ b/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml
+@@ -35,11 +35,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.eclipse.dltk.xotcl.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ </feature>
diff --git a/remove-missing-files-from-build.properties-files.patch b/remove-missing-files-from-build.properties-files.patch
new file mode 100644
index 0000000..855e4f8
--- /dev/null
+++ b/remove-missing-files-from-build.properties-files.patch
@@ -0,0 +1,67 @@
+commit 58ff7f817889aff27bc28cc75f64c88f82a788ba
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 16:33:23 2012 -0400
+
+ Remove missing files from build.properties
+
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties b/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
+index bdcf028..3531e32 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
++++ b/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
+@@ -13,5 +13,4 @@ bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ about.html,\
+- debugger/,\
+ plugin.xml
+diff --git a/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties b/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
+index 505ff1b..ddec73f 100644
+--- a/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
++++ b/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
+@@ -3,11 +3,6 @@ bin.includes = META-INF/,\
+ about.properties,\
+ book.css,\
+ concepts/,\
+- contexts_APT.xml,\
+- contexts_Debugger.xml,\
+- contexts_JDT.xml,\
+- contexts_JDT_Debugger.xml,\
+- contexts_JDT_JUnit.xml,\
+ cpy.png,\
+ eclipse32.png,\
+ gettingStarted/,\
+@@ -16,12 +11,8 @@ bin.includes = META-INF/,\
+ notices.html,\
+ plugin.properties,\
+ plugin.xml,\
+- reference/,\
+ tasks/,\
+- tips/,\
+ toc.xml,\
+ topics_Concepts.xml,\
+ topics_GettingStarted.xml,\
+- topics_Reference.xml,\
+- topics_Tasks.xml,\
+ whatsNew/
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
+index 1ce546c..43621b6 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
++++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
+@@ -15,5 +15,4 @@ bin.includes = META-INF/,\
+ scripts/,\
+ plugin.properties,\
+ about.html,\
+- icons/,\
+ console/
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
+index 3fc6549..342192d 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
++++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
+@@ -14,7 +14,6 @@ bin.includes = plugin.xml,\
+ .,\
+ plugin.properties,\
+ build.properties,\
+- icons/,\
+ resources/,\
+ about.html
+ src.includes = models/,\
diff --git a/rename-tycho-plugins-to-0.14.0-names.patch b/rename-tycho-plugins-to-0.14.0-names.patch
new file mode 100644
index 0000000..5b726d3
--- /dev/null
+++ b/rename-tycho-plugins-to-0.14.0-names.patch
@@ -0,0 +1,39 @@
+commit eaf13a50e0b48f375bf45593d3dc2940803da009
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Mon Apr 23 15:23:41 2012 -0400
+
+ Update tycho version to 0.14
+
+ and rename plugins with their 0.14 names
+
+diff --git a/build/pom.xml b/build/pom.xml
+index 0bae91b..034ea3d 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -9,7 +9,7 @@
+ <packaging>pom</packaging>
+
+ <properties>
+- <tycho-version>0.12.0</tycho-version>
++ <tycho-version>0.14.0</tycho-version>
+ <tycho-groupid>org.eclipse.tycho</tycho-groupid>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <eclipse-repository-url>http://download.eclipse.org/releases/indigo/</eclipse-repository-url>
+@@ -42,7 +42,7 @@
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+- <artifactId>maven-osgi-packaging-plugin</artifactId>
++ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+
+@@ -59,7 +59,7 @@
+ </plugin>
+ <plugin>
+ <groupId>${tycho-groupid}</groupId>
+- <artifactId>maven-osgi-compiler-plugin</artifactId>
++ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+
diff --git a/sources b/sources
index cf48b51..8cd0110 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcb173cccbff400cb2dc485dc230b860 dltk-4.0.0.tar.xz
+e9409d69730a6037ddcf5b102f80268e dltk-4.0.0.tar.xz
diff --git a/use-JavaSE-1.6-instead-of-J2SE-1.4.patch b/use-JavaSE-1.6-instead-of-J2SE-1.4.patch
new file mode 100644
index 0000000..7fc9130
--- /dev/null
+++ b/use-JavaSE-1.6-instead-of-J2SE-1.4.patch
@@ -0,0 +1,319 @@
+commit 141ff7c7f11545e7379dc00fb17b8340595ef68f
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Wed Apr 18 16:37:17 2012 -0400
+
+ J2SE-1.4 -> JavaSE-1.6
+
+diff --git a/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
+index 7d49365..59c7900 100644
+--- a/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.debug.tests/META-INF/MANIFEST.MF
+@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core.tests
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.debug.tests
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
+index 8d84d91..59d3be9 100644
+--- a/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.debug.ui.tests/META-INF/MANIFEST.MF
+@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.debug.ui,
+ org.eclipse.debug.core
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/core/tests/org.eclipse.dltk.ui.bot.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.ui.bot.tests/META-INF/MANIFEST.MF
+index fba066a..d1744dc 100644
+--- a/core/tests/org.eclipse.dltk.ui.bot.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.ui.bot.tests/META-INF/MANIFEST.MF
+@@ -16,6 +16,6 @@ Require-Bundle: org.junit,
+ org.eclipse.dltk.core.tests,
+ org.eclipse.dltk.ui,
+ org.eclipse.dltk.core
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Eclipse-LazyStart: true
+ Bundle-Vendor: %pluginProvider
+diff --git a/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
+index 5235444..5e191de 100644
+--- a/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.validators.core.tests/META-INF/MANIFEST.MF
+@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.junit
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.validators.core.tests
+diff --git a/itcl/tests/org.eclipse.dltk.itcl.core.tests/META-INF/MANIFEST.MF b/itcl/tests/org.eclipse.dltk.itcl.core.tests/META-INF/MANIFEST.MF
+index 00952e5..a70fa11 100644
+--- a/itcl/tests/org.eclipse.dltk.itcl.core.tests/META-INF/MANIFEST.MF
++++ b/itcl/tests/org.eclipse.dltk.itcl.core.tests/META-INF/MANIFEST.MF
+@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core.tests,
+ org.eclipse.core.resources
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.itcl.core.tests
+ Bundle-Activator: org.eclipse.dltk.itcl.core.tests.ITclTestsPlugin
+ Bundle-Localization: plugin
+diff --git a/performance/plugins/org.eclipse.dltk.core.tests.performance/META-INF/MANIFEST.MF b/performance/plugins/org.eclipse.dltk.core.tests.performance/META-INF/MANIFEST.MF
+index 2edba38..79d23f1 100644
+--- a/performance/plugins/org.eclipse.dltk.core.tests.performance/META-INF/MANIFEST.MF
++++ b/performance/plugins/org.eclipse.dltk.core.tests.performance/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.dltk.core.tests.performance;singleton:=true
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.test.performance,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+diff --git a/performance/plugins/org.eclipse.dltk.performance/META-INF/MANIFEST.MF b/performance/plugins/org.eclipse.dltk.performance/META-INF/MANIFEST.MF
+index 7dc4882..5f24ce6 100644
+--- a/performance/plugins/org.eclipse.dltk.performance/META-INF/MANIFEST.MF
++++ b/performance/plugins/org.eclipse.dltk.performance/META-INF/MANIFEST.MF
+@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.dltk.xotcl
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/performance/plugins/org.eclipse.dltk.tests.performance/META-INF/MANIFEST.MF b/performance/plugins/org.eclipse.dltk.tests.performance/META-INF/MANIFEST.MF
+index 04b9ce6..5f5963b 100644
+--- a/performance/plugins/org.eclipse.dltk.tests.performance/META-INF/MANIFEST.MF
++++ b/performance/plugins/org.eclipse.dltk.tests.performance/META-INF/MANIFEST.MF
+@@ -32,5 +32,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.ruby.formatter.tests,
+ org.eclipse.ui,
+ org.eclipse.dltk.ui.tests
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Eclipse-LazyStart: true
+diff --git a/performance/plugins/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF b/performance/plugins/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
+index c8c57af..9c87701 100644
+--- a/performance/plugins/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
++++ b/performance/plugins/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
+@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ Cloudscape;resolution:=optional,
+ org.junit,
+ org.apache.derby.core
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.test.performance.ui
+diff --git a/performance/plugins/org.eclipse.test.performance/META-INF/MANIFEST.MF b/performance/plugins/org.eclipse.test.performance/META-INF/MANIFEST.MF
+index 0521f44..85d0927 100644
+--- a/performance/plugins/org.eclipse.test.performance/META-INF/MANIFEST.MF
++++ b/performance/plugins/org.eclipse.test.performance/META-INF/MANIFEST.MF
+@@ -21,4 +21,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ Cloudscape;resolution:=optional
+ Eclipse-LazyStart: true
+ Bundle-ClassPath: .
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/python/plugins/org.eclipse.dltk.python.core/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.core/META-INF/MANIFEST.MF
+index f991954..bb56e57 100644
+--- a/python/plugins/org.eclipse.dltk.python.core/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.core/META-INF/MANIFEST.MF
+@@ -21,5 +21,5 @@ Export-Package: org.eclipse.dltk.python.core,
+ org.eclipse.dltk.python.parser,
+ org.eclipse.dltk.python.parser.ast,
+ org.eclipse.dltk.python.parser.ast.expressions
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/python/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF
+index 2ac7566..6752589 100644
+--- a/python/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.debug/META-INF/MANIFEST.MF
+@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.python.internal.debug
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/python/tests/org.eclipse.dltk.python.tests/META-INF/MANIFEST.MF b/python/tests/org.eclipse.dltk.python.tests/META-INF/MANIFEST.MF
+index 3ed917c..f2e14d5 100644
+--- a/python/tests/org.eclipse.dltk.python.tests/META-INF/MANIFEST.MF
++++ b/python/tests/org.eclipse.dltk.python.tests/META-INF/MANIFEST.MF
+@@ -18,5 +18,5 @@ Export-Package: org.eclipse.dltk.python.tests,
+ org.eclipse.dltk.python.tests.buildpath,
+ org.eclipse.dltk.python.tests.eval.generated,
+ org.eclipse.dltk.python.tests.model
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
+diff --git a/python/tests/org.eclipse.dltk.python.ui.tests/META-INF/MANIFEST.MF b/python/tests/org.eclipse.dltk.python.ui.tests/META-INF/MANIFEST.MF
+index cd62a12..67fbc31 100644
+--- a/python/tests/org.eclipse.dltk.python.ui.tests/META-INF/MANIFEST.MF
++++ b/python/tests/org.eclipse.dltk.python.ui.tests/META-INF/MANIFEST.MF
+@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.ui,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.python.ui.tests,
+ org.eclipse.dltk.python.ui.tests.indenting
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
+index 80558f8..c642981 100644
+--- a/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
++++ b/rse/plugins/org.eclipse.dltk.rse/META-INF/MANIFEST.MF
+@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.dltk.rse
+ Bundle-Version: 4.0.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/examples/org.eclipse.dltk.ruby.testing.example.category/META-INF/MANIFEST.MF b/ruby/examples/org.eclipse.dltk.ruby.testing.example.category/META-INF/MANIFEST.MF
+index b05a73a..3a96f9f 100644
+--- a/ruby/examples/org.eclipse.dltk.ruby.testing.example.category/META-INF/MANIFEST.MF
++++ b/ruby/examples/org.eclipse.dltk.ruby.testing.example.category/META-INF/MANIFEST.MF
+@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: Example Plug-in
+ Bundle-SymbolicName: org.eclipse.dltk.ruby.testing.example.category;singleton:=true
+ Bundle-Version: 1.0.0
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.dltk.testing
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.abstractdebugger/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.abstractdebugger/META-INF/MANIFEST.MF
+index dd102a2..e8bd1dd 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.abstractdebugger/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.abstractdebugger/META-INF/MANIFEST.MF
+@@ -10,4 +10,4 @@ Eclipse-LazyStart: true
+ Bundle-Vendor: %providerName
+ Export-Package: org.eclipse.dltk.ruby.abstractdebugger
+ Bundle-Activator: org.eclipse.dltk.ruby.abstractdebugger.AbstractRubyDebuggerPlugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
+index c4e8664..f50fb1a 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.activestatedebugger/META-INF/MANIFEST.MF
+@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.ruby.launching,
+ org.eclipse.dltk.ruby.core
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.basicdebugger/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.basicdebugger/META-INF/MANIFEST.MF
+index f1254f2..9ba1f5b 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.basicdebugger/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.basicdebugger/META-INF/MANIFEST.MF
+@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.ruby.core
+ Eclipse-LazyStart: true
+ Bundle-Vendor: %providerName
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Localization: plugin
+
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.debug/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.debug/META-INF/MANIFEST.MF
+index b5d5793..9f802a8 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.debug/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.debug/META-INF/MANIFEST.MF
+@@ -13,4 +13,4 @@ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.ruby.debug
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.fastdebugger/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.fastdebugger/META-INF/MANIFEST.MF
+index 07768a4..6c5e7df 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.fastdebugger/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.fastdebugger/META-INF/MANIFEST.MF
+@@ -20,4 +20,4 @@ Bundle-Localization: plugin
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.ruby.fastdebugger,
+ org.eclipse.dltk.ruby.fastdebugger.preferences
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/tests/org.eclipse.dltk.ruby.core.tests/META-INF/MANIFEST.MF b/ruby/tests/org.eclipse.dltk.ruby.core.tests/META-INF/MANIFEST.MF
+index c62e690..ece8f60 100644
+--- a/ruby/tests/org.eclipse.dltk.ruby.core.tests/META-INF/MANIFEST.MF
++++ b/ruby/tests/org.eclipse.dltk.ruby.core.tests/META-INF/MANIFEST.MF
+@@ -18,4 +18,4 @@ Require-Bundle: org.junit,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.ruby.core.tests,
+ org.eclipse.dltk.ruby.core.tests.parser
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF b/ruby/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF
+index b768a88..8a6c21a 100644
+--- a/ruby/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF
++++ b/ruby/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF
+@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.formatter,
+ org.eclipse.dltk.formatter.tests
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.ruby.formatter.tests
+ Bundle-Activator: org.eclipse.dltk.ruby.formatter.tests.RubyFormatterTestsPlugin
+ Bundle-ActivationPolicy: lazy
+diff --git a/ruby/tests/org.eclipse.dltk.ruby.testing.tests/META-INF/MANIFEST.MF b/ruby/tests/org.eclipse.dltk.ruby.testing.tests/META-INF/MANIFEST.MF
+index 5f65042..071ff06 100644
+--- a/ruby/tests/org.eclipse.dltk.ruby.testing.tests/META-INF/MANIFEST.MF
++++ b/ruby/tests/org.eclipse.dltk.ruby.testing.tests/META-INF/MANIFEST.MF
+@@ -6,6 +6,6 @@ Bundle-SymbolicName: org.eclipse.dltk.ruby.testing.tests
+ Bundle-Version: 4.0.0
+ Bundle-Vendor: %pluginProvider
+ Fragment-Host: org.eclipse.dltk.ruby.testing
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.dltk.core.tests,
+ org.junit
+diff --git a/ruby/tests/org.eclipse.dltk.ruby.ui.bot.tests/META-INF/MANIFEST.MF b/ruby/tests/org.eclipse.dltk.ruby.ui.bot.tests/META-INF/MANIFEST.MF
+index 4a3ae65..5577176 100644
+--- a/ruby/tests/org.eclipse.dltk.ruby.ui.bot.tests/META-INF/MANIFEST.MF
++++ b/ruby/tests/org.eclipse.dltk.ruby.ui.bot.tests/META-INF/MANIFEST.MF
+@@ -20,6 +20,6 @@ Require-Bundle: org.junit,
+ org.eclipse.dltk.launching,
+ org.eclipse.dltk.ui.bot.tests,
+ org.eclipse.test.performance
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Eclipse-LazyStart: true
+ Bundle-Vendor: %pluginProvider
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/META-INF/MANIFEST.MF
+index 0512d1c..3a909e1 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/META-INF/MANIFEST.MF
+@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.tcl.launching;bundle-version="4.0.0",
+ org.eclipse.ui
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.tests/META-INF/MANIFEST.MF
+index f3e82c6..91bdded 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.tests/META-INF/MANIFEST.MF
+@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.tcl.tests,
+ org.eclipse.dltk.tcl.tests.model
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/META-INF/MANIFEST.MF b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/META-INF/MANIFEST.MF
+index 7e1e4e7..56bf436 100644
+--- a/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/META-INF/MANIFEST.MF
++++ b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/META-INF/MANIFEST.MF
+@@ -19,4 +19,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.debug,
+ org.eclipse.ui
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/META-INF/MANIFEST.MF b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/META-INF/MANIFEST.MF
+index f6f9f25..e3296fa 100644
+--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/META-INF/MANIFEST.MF
++++ b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/META-INF/MANIFEST.MF
+@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.xotcl.core;bundle-version="4.0.0",
+ org.eclipse.ui.editors
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/use-JavaSE-1.6-instead-of-J2SE-1.5.patch b/use-JavaSE-1.6-instead-of-J2SE-1.5.patch
new file mode 100644
index 0000000..581b66f
--- /dev/null
+++ b/use-JavaSE-1.6-instead-of-J2SE-1.5.patch
@@ -0,0 +1,978 @@
+commit 6387fcceff2280c281655c7fcd81647fbe0baa95
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Tue Apr 17 14:44:06 2012 -0400
+
+ J2SE-1.5 -> JavaSE-1.6
+
+diff --git a/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
+index 70fef72..8e34c10 100644
+--- a/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.console.ui/META-INF/MANIFEST.MF
+@@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0"
+ Export-Package: org.eclipse.dltk.console.ui,
+ org.eclipse.dltk.console.ui.internal
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
+index 5350243..9a5ce2c 100644
+--- a/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.console/META-INF/MANIFEST.MF
+@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0"
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.console
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
+index ea49bb2..71f137b 100644
+--- a/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.core.index.sql.h2/META-INF/MANIFEST.MF
+@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.h2,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.core.index.sql;bundle-version="4.0.0"
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.core.index.sql.h2,
+ org.eclipse.dltk.internal.core.index.sql.h2
+diff --git a/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
+index e3cdc18..beb913b 100644
+--- a/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.core.index.sql/META-INF/MANIFEST.MF
+@@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse.org
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.dltk.core;bundle-version="4.0.0"
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package:
+ org.eclipse.dltk.core.index.sql,
+diff --git a/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
+index c86c0ca..fa10293 100644
+--- a/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.core.manipulation/META-INF/MANIFEST.MF
+@@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.dltk.core.manipulation;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+ Bundle-Activator: org.eclipse.dltk.internal.core.manipulation.ScriptManipulationPlugin
+ Bundle-Vendor: %pluginProvider
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+diff --git a/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
+index 2f5cbe7..876af43 100644
+--- a/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.core.tools.ui/META-INF/MANIFEST.MF
+@@ -9,5 +9,5 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
+index fd890a2..80a6fb7 100644
+--- a/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.core/META-INF/MANIFEST.MF
+@@ -72,4 +72,4 @@ Export-Package: org.eclipse.dltk.annotations,
+ org.eclipse.dltk.ti.types,
+ org.eclipse.dltk.utils
+ Bundle-ClassPath: .
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
+index 551a351..71032d2 100644
+--- a/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.debug.ui/META-INF/MANIFEST.MF
+@@ -38,6 +38,6 @@ Export-Package: org.eclipse.dltk.debug.ui,
+ org.eclipse.dltk.internal.debug.ui.handlers,
+ org.eclipse.dltk.internal.debug.ui.interpreters,
+ org.eclipse.dltk.internal.debug.ui.launcher
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Import-Package: com.ibm.icu.text
+diff --git a/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
+index 0fed8b8..732340e 100644
+--- a/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.debug/META-INF/MANIFEST.MF
+@@ -24,5 +24,5 @@ Export-Package: org.eclipse.dltk.dbgp,
+ org.eclipse.dltk.debug.core.model,
+ org.eclipse.dltk.internal.debug.core.model,
+ org.eclipse.dltk.internal.debug.core.model.operations
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
+index e41a8da..5ac128e 100644
+--- a/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.formatter/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-SymbolicName: org.eclipse.dltk.formatter;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+ Export-Package: org.eclipse.dltk.formatter,
+diff --git a/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
+index 91eb9b8..c525f22 100644
+--- a/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.launching/META-INF/MANIFEST.MF
+@@ -24,5 +24,5 @@ Export-Package: org.eclipse.dltk.internal.launching,
+ org.eclipse.dltk.launching.model.util,
+ org.eclipse.dltk.launching.process,
+ org.eclipse.dltk.launching.sourcelookup
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.logconsole.example/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.logconsole.example/META-INF/MANIFEST.MF
+index 3067cf9..5d40418 100644
+--- a/core/plugins/org.eclipse.dltk.logconsole.example/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.logconsole.example/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.dltk.logconsole.example;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.dltk.logconsole
+diff --git a/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
+index 574bf7e..0f64bbe 100644
+--- a/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.logconsole.ui/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.dltk.logconsole.ui;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.dltk.logconsole,
+ org.eclipse.core.runtime,
+ org.eclipse.core.jobs,
+diff --git a/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
+index 192fbfd..13f9566 100644
+--- a/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.logconsole/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-SymbolicName: org.eclipse.dltk.logconsole;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Activator: org.eclipse.dltk.logconsole.LogConsolePlugin
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+diff --git a/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
+index 9016e99..7c01c4b 100755
+--- a/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.testing/META-INF/MANIFEST.MF
+@@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier
+ Bundle-Activator: org.eclipse.dltk.testing.DLTKTestingPlugin
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+diff --git a/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
+index 1fce625..fd0b141 100644
+--- a/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.ui/META-INF/MANIFEST.MF
+@@ -104,5 +104,5 @@ Export-Package: org.eclipse.dltk.corext,
+ org.eclipse.dltk.ui.util,
+ org.eclipse.dltk.ui.viewsupport,
+ org.eclipse.dltk.ui.wizards
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
+index 94ac336..b1f22e4 100644
+--- a/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.validators.core/META-INF/MANIFEST.MF
+@@ -14,5 +14,5 @@ Export-Package: org.eclipse.dltk.validators.configs,
+ org.eclipse.dltk.validators.internal.core
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
+index 155717d..ca592a2 100644
+--- a/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.validators.externalchecker/META-INF/MANIFEST.MF
+@@ -18,5 +18,5 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.validators.core,
+ org.eclipse.dltk.validators.ui
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %providerName
+diff --git a/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
+index b7a7040..177f31a 100644
+--- a/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
++++ b/core/plugins/org.eclipse.dltk.validators.ui/META-INF/MANIFEST.MF
+@@ -18,6 +18,6 @@ Export-Package: org.eclipse.dltk.validators.internal.ui;x-internal:=true,
+ org.eclipse.dltk.validators.ui
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Import-Package: com.ibm.icu.text
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
+index 0a433cc..20194a9 100644
+--- a/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF
+@@ -21,5 +21,5 @@ Export-Package: org.eclipse.dltk.core.tests,
+ org.eclipse.dltk.core.tests.model,
+ org.eclipse.dltk.core.tests.util,
+ org.eclipse.dltk.core.tests.xml
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
+index 66ffbb0..9439eaa 100644
+--- a/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.formatter.tests/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.dltk.formatter.tests
+ Bundle-Version: 4.0.0.qualifier
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.junit,
+ org.eclipse.core.runtime,
+ org.eclipse.text,
+diff --git a/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
+index a2831ae..a634bdd 100644
+--- a/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
++++ b/core/tests/org.eclipse.dltk.ui.tests/META-INF/MANIFEST.MF
+@@ -20,5 +20,5 @@ Require-Bundle: org.eclipse.ui,
+ Export-Package: org.eclipse.dltk.ui.tests,
+ org.eclipse.dltk.ui.tests.core,
+ org.eclipse.dltk.ui.tests.navigator
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/core/tools/org.eclipse.dltk.dev-tools.handle-identifiers/META-INF/MANIFEST.MF b/core/tools/org.eclipse.dltk.dev-tools.handle-identifiers/META-INF/MANIFEST.MF
+index 281f61b..89de439 100644
+--- a/core/tools/org.eclipse.dltk.dev-tools.handle-identifiers/META-INF/MANIFEST.MF
++++ b/core/tools/org.eclipse.dltk.dev-tools.handle-identifiers/META-INF/MANIFEST.MF
+@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.ui;bundle-version="4.0.0"
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/core/tools/org.eclipse.dltk.ui.tools.astview/META-INF/MANIFEST.MF b/core/tools/org.eclipse.dltk.ui.tools.astview/META-INF/MANIFEST.MF
+index 33ba7c0..7dc7a7e 100644
+--- a/core/tools/org.eclipse.dltk.ui.tools.astview/META-INF/MANIFEST.MF
++++ b/core/tools/org.eclipse.dltk.ui.tools.astview/META-INF/MANIFEST.MF
+@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/META-INF/MANIFEST.MF b/itcl/plugins/org.eclipse.dltk.itcl.core/META-INF/MANIFEST.MF
+index effa1e7..e83af0b 100644
+--- a/itcl/plugins/org.eclipse.dltk.itcl.core/META-INF/MANIFEST.MF
++++ b/itcl/plugins/org.eclipse.dltk.itcl.core/META-INF/MANIFEST.MF
+@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/itcl/plugins/org.eclipse.dltk.itcl.ui/META-INF/MANIFEST.MF b/itcl/plugins/org.eclipse.dltk.itcl.ui/META-INF/MANIFEST.MF
+index 20a33f2..3ba0169 100644
+--- a/itcl/plugins/org.eclipse.dltk.itcl.ui/META-INF/MANIFEST.MF
++++ b/itcl/plugins/org.eclipse.dltk.itcl.ui/META-INF/MANIFEST.MF
+@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/javascript/examples/org.eclipse.dltk.javascript.typeinfo.examples/META-INF/MANIFEST.MF b/javascript/examples/org.eclipse.dltk.javascript.typeinfo.examples/META-INF/MANIFEST.MF
+index 116c57d..3affedc 100644
+--- a/javascript/examples/org.eclipse.dltk.javascript.typeinfo.examples/META-INF/MANIFEST.MF
++++ b/javascript/examples/org.eclipse.dltk.javascript.typeinfo.examples/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: Examples
+ Bundle-SymbolicName: org.eclipse.dltk.javascript.typeinfo.examples;singleton:=true
+ Bundle-Version: 1.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.emf.ecore,
+ org.eclipse.dltk.javascript.core,
+ org.eclipse.dltk.javascript.parser
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/META-INF/MANIFEST.MF
+index 0ba0cda..cf0fb00 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.core.dom.support/META-INF/MANIFEST.MF
+@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.4.0"
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dlkt.javascript.dom.support
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
+index f313cf4..aa5b533 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
+@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.javascript.parser,
+ org.eclipse.emf.ecore.change,
+ org.eclipse.text
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Import-Package: com.ibm.icu.text
+ Export-Package: org.eclipse.dltk.internal.javascript.corext.refactoring,
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
+index e1f5d80..1e61dbc 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
+@@ -26,5 +26,5 @@ Export-Package: org.eclipse.dltk.internal.javascript.parser,
+ org.eclipse.dltk.javascript.typeinfo.model,
+ org.eclipse.dltk.javascript.typeinfo.model.impl,
+ org.eclipse.dltk.javascript.typeinfo.model.util;x-internal:=true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
+index 9b9a5fb..2a70d13 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
+@@ -35,4 +35,4 @@ Export-Package: org.eclipse.dltk.javascript.internal.console.ui,
+ org.eclipse.dltk.javascript.internal.debug.ui.launcher
+ Bundle-ActivationPolicy: lazy
+ Bundle-Activator: org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugUIPlugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
+index 0e3100d..ea682a3 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
+@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.dltk.debug,
+ Bundle-Activator: org.eclipse.dltk.javascript.internal.debug.JavaScriptDebugPlugin
+ Export-Package: org.eclipse.dltk.javascript.internal.debug
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
+index d884f2c..e94c1d3 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
+@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.ui,
+ org.eclipse.dltk.javascript.ui,
+ org.eclipse.dltk.javascript.parser
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.javascript.formatter,
+ org.eclipse.dltk.javascript.formatter.preferences
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
+index a95dea5..0491034 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: DLTK JS JDT UI
+ Bundle-SymbolicName: org.eclipse.dltk.javascript.jdt.integration.ui;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
+index 3324c55..b4fcc8d 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
+@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.javascript.core,
+ org.eclipse.jdt.core
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.javascript.jdt.integration;x-friends:="org.eclipse.dltk.javascript.jdt.integration.ui"
+ Bundle-ActivationPolicy: lazy
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
+index aeb5116..afb45e9 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
+@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.debug,
+ org.eclipse.dltk.javascript.core
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+ Export-Package: org.eclipse.dltk.javascript.jsjdtdebugger,
+ org.eclipse.dltk.javascript.jsjdtdebugger.preferences
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
+index 32b1823..522bd63 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
+@@ -23,5 +23,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ Export-Package: org.eclipse.dltk.javascript.console,
+ org.eclipse.dltk.javascript.launching,
+ org.eclipse.dltk.javascript.internal.launching
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.nodejs/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.nodejs/META-INF/MANIFEST.MF
+index 8972fdd..1ef7f32 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.nodejs/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.nodejs/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: Nodejs
+ Bundle-SymbolicName: org.eclipse.dltk.javascript.nodejs;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.dltk.core,
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
+index f837889..4006ff7 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
+@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.antlr.runtime;bundle-version="[3.0.0,3.0.9)"
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.javascript.ast,
+ org.eclipse.dltk.javascript.parser,
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF
+index 652b6d4..5560252 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.rhino.dbgp/META-INF/MANIFEST.MF
+@@ -6,4 +6,4 @@ Bundle-Version: 4.0.0.qualifier
+ Require-Bundle: org.eclipse.dltk.javascript.rhino
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF
+index 3294365..3770b59 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.rhino/META-INF/MANIFEST.MF
+@@ -20,4 +20,4 @@ Export-Package: org.mozilla.classfile,
+ org.mozilla.javascript.xml
+ Bundle-Localization: plugin
+ Bundle-Vendor: %pluginProvider
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF b/javascript/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
+index d0d8c3d..70f55d9 100644
+--- a/javascript/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
++++ b/javascript/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
+@@ -38,4 +38,4 @@ Export-Package: org.eclipse.dltk.javascript.internal.ui,
+ org.eclipse.dltk.javascript.ui,
+ org.eclipse.dltk.javascript.ui.text,
+ org.eclipse.dltk.javascript.ui.typeinfo
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF b/javascript/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF
+index d20b705..cb630de 100644
+--- a/javascript/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF
++++ b/javascript/tests/org.eclipse.dltk.javascript.core.tests/META-INF/MANIFEST.MF
+@@ -16,4 +16,4 @@ Require-Bundle: org.junit,
+ Export-Package: org.eclipse.dltk.javascript.core.tests,
+ org.eclipse.dltk.javascript.core.tests.contentassist,
+ org.eclipse.dltk.javascript.core.tests.structure
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF b/javascript/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
+index a83f243..78ed7b4 100644
+--- a/javascript/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
++++ b/javascript/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
+@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
+ Bundle-Name: JavaScript Tests Plug-in
+ Bundle-SymbolicName: org.eclipse.dltk.javascript.formatter.tests;singleton:=true
+ Bundle-Version: 4.0.0.qualifier
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.dltk.core;bundle-version="4.0.0",
+ org.eclipse.dltk.formatter.tests,
+ org.eclipse.dltk.ui,
+diff --git a/javascript/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF b/javascript/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
+index 6392fcc..d2090c3 100644
+--- a/javascript/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
++++ b/javascript/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
+@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.javascript.parser;bundle-version="4.0.0",
+ org.antlr.runtime;bundle-version="[3.0.0,3.0.9)"
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.javascript.parser.tests
+diff --git a/javascript/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF b/javascript/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
+index 65d855e..37d44d7 100644
+--- a/javascript/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
++++ b/javascript/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
+@@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.javascript.core,
+ org.eclipse.dltk.javascript.ui
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.edit/META-INF/MANIFEST.MF b/javascript/tools/org.eclipse.dltk.javascript.core.edit/META-INF/MANIFEST.MF
+index 03dd7a0..17d961c 100644
+--- a/javascript/tools/org.eclipse.dltk.javascript.core.edit/META-INF/MANIFEST.MF
++++ b/javascript/tools/org.eclipse.dltk.javascript.core.edit/META-INF/MANIFEST.MF
+@@ -7,7 +7,7 @@ Bundle-ClassPath: .
+ Bundle-Activator: org.eclipse.dltk.javascript.typeinfo.model.provider.ReferencesEditPlugin$Implementation
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.javascript.typeinfo.model.provider
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.javascript.core;visibility:=reexport,
+diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF b/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF
+index dc9bffb..fc6a5b1 100644
+--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF
++++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF
+@@ -7,7 +7,7 @@ Bundle-ClassPath: .
+ Bundle-Activator: org.eclipse.dltk.javascript.typeinfo.model.presentation.ReferencesEditorPlugin$Implementation
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.javascript.typeinfo.model.presentation
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+diff --git a/javascript/tools/org.eclipse.dltk.javascript.dev-tools/META-INF/MANIFEST.MF b/javascript/tools/org.eclipse.dltk.javascript.dev-tools/META-INF/MANIFEST.MF
+index 509a197..1f80ad3 100644
+--- a/javascript/tools/org.eclipse.dltk.javascript.dev-tools/META-INF/MANIFEST.MF
++++ b/javascript/tools/org.eclipse.dltk.javascript.dev-tools/META-INF/MANIFEST.MF
+@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
+index 405a17b..85f8805 100644
+--- a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
++++ b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
+@@ -35,4 +35,4 @@ Export-Package: org.eclipse.dltk.internal.mylyn,
+ org.eclipse.dltk.internal.mylyn.actions,
+ org.eclipse.dltk.internal.mylyn.editor,
+ org.eclipse.dltk.internal.mylyn.search
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/build.properties b/mylyn/plugins/org.eclipse.dltk.mylyn/build.properties
+index 87f64a8..1f3822f 100644
+--- a/mylyn/plugins/org.eclipse.dltk.mylyn/build.properties
++++ b/mylyn/plugins/org.eclipse.dltk.mylyn/build.properties
+@@ -13,5 +13,4 @@ bin.includes = plugin.xml,\
+ .
+ src.includes = about.html,\
+ schema/
+-jre.compilation.profile = J2SE-1.5
+ source.. = src/
+diff --git a/python/plugins/org.eclipse.dltk.python.activestatedebugger/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.activestatedebugger/META-INF/MANIFEST.MF
+index 950e435..08d587e 100644
+--- a/python/plugins/org.eclipse.dltk.python.activestatedebugger/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.activestatedebugger/META-INF/MANIFEST.MF
+@@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.python.debug,
+ org.eclipse.dltk.python.core
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/python/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF
+index b0ab3a7..dccc85f 100644
+--- a/python/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF
+@@ -31,4 +31,4 @@ Export-Package: org.eclipse.dltk.python.internal.debug.ui,
+ org.eclipse.dltk.python.internal.debug.ui.interpreters,
+ org.eclipse.dltk.python.internal.debug.ui.launchConfigurations,
+ org.eclipse.dltk.python.internal.debug.ui.launcher
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/python/plugins/org.eclipse.dltk.python.launching/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.launching/META-INF/MANIFEST.MF
+index 93ffb7f..9c15fbe 100644
+--- a/python/plugins/org.eclipse.dltk.python.launching/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.launching/META-INF/MANIFEST.MF
+@@ -18,4 +18,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.debug
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.python.launching
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/python/plugins/org.eclipse.dltk.python.ui/META-INF/MANIFEST.MF b/python/plugins/org.eclipse.dltk.python.ui/META-INF/MANIFEST.MF
+index ff005bd..6c5ae71 100644
+--- a/python/plugins/org.eclipse.dltk.python.ui/META-INF/MANIFEST.MF
++++ b/python/plugins/org.eclipse.dltk.python.ui/META-INF/MANIFEST.MF
+@@ -24,4 +24,4 @@ Export-Package: org.eclipse.dltk.python.internal.ui,
+ org.eclipse.dltk.python.internal.ui.text,
+ org.eclipse.dltk.python.ui,
+ org.eclipse.dltk.python.ui.text
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+index 8eca9ac..2d9c981 100644
+--- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
++++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+@@ -23,4 +23,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.core.internal.rse;x-friends:=org.eclipse.dltk.rse.ui,
+ org.eclipse.dltk.core.internal.rse.perfomance;x-internal:=true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
+index 6a6f70a..5554529 100644
+--- a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
++++ b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
+@@ -19,4 +19,4 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.rse.subsystems.files.core
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.internal.ui.rse;x-internal:=true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
+index da00bc8..4b71394 100644
+--- a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
++++ b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
+@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="4.0.0",
+ com.jcraft.jsch,
+ org.eclipse.jsch.core
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.ssh.core
+ Bundle-Localization: plugin
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.core/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.core/META-INF/MANIFEST.MF
+index 150a410..2153416 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.core/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.core/META-INF/MANIFEST.MF
+@@ -75,5 +75,5 @@ Export-Package: org.eclipse.dltk.ruby.ast;
+ org.eclipse.dltk.ast.declarations,
+ org.eclipse.dltk.core,
+ org.eclipse.dltk.ruby.typeinference.internal"
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
+index cd0f4db..a9c70b1 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.debug.ui/META-INF/MANIFEST.MF
+@@ -29,4 +29,4 @@ Export-Package: org.eclipse.dltk.ruby.internal.debug.ui,
+ org.eclipse.dltk.ruby.internal.debug.ui.interpreters,
+ org.eclipse.dltk.ruby.internal.debug.ui.launchConfigurations,
+ org.eclipse.dltk.ruby.internal.debug.ui.launcher
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.formatter/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.formatter/META-INF/MANIFEST.MF
+index b36a092..1910670 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.formatter/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.formatter/META-INF/MANIFEST.MF
+@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.ruby.ui;bundle-version="4.0.0",
+ org.eclipse.ui
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.ruby.formatter,
+ org.eclipse.dltk.ruby.formatter.internal,
+ org.eclipse.dltk.ruby.formatter.internal.nodes,
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
+index 071a675..2bcfea9 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
+@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.debug.core,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.ruby.internal.launching,
+ org.eclipse.dltk.ruby.launching
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.testing/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.testing/META-INF/MANIFEST.MF
+index e8f1655..b67c585 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.testing/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.testing/META-INF/MANIFEST.MF
+@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.console
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.ruby.testing.internal
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+ Bundle-ActivationPolicy: lazy
+diff --git a/ruby/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF b/ruby/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
+index 4b1e050..1ab6f79 100644
+--- a/ruby/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
++++ b/ruby/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
+@@ -32,4 +32,4 @@ Export-Package: org.eclipse.dltk.ruby.internal.ui,
+ org.eclipse.dltk.ruby.internal.ui.text.hyperlink,
+ org.eclipse.dltk.ruby.internal.ui.text.rules,
+ org.eclipse.dltk.ruby.ui.preferences
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/ruby/tests/org.eclipse.dltk.ruby.ui.tests/META-INF/MANIFEST.MF b/ruby/tests/org.eclipse.dltk.ruby.ui.tests/META-INF/MANIFEST.MF
+index c9bc56c..909dfcd 100644
+--- a/ruby/tests/org.eclipse.dltk.ruby.ui.tests/META-INF/MANIFEST.MF
++++ b/ruby/tests/org.eclipse.dltk.ruby.ui.tests/META-INF/MANIFEST.MF
+@@ -20,4 +20,4 @@ Bundle-Activator: org.eclipse.dltk.ruby.ui.tests.internal.RubyUITestsPlugin
+ Eclipse-LazyStart: true
+ Bundle-Vendor: %pluginProvider
+ Export-Package: org.eclipse.dltk.ruby.ui.tests
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/META-INF/MANIFEST.MF
+index 783324c..96674c6 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/META-INF/MANIFEST.MF
+@@ -26,5 +26,5 @@ Require-Bundle: org.eclipse.ui,
+ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.tcl.activestatedebugger,
+ org.eclipse.dltk.tcl.activestatedebugger.preferences
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
+index 28cffc3..5b4cd3b 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.core.indexer/META-INF/MANIFEST.MF
+@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.xotcl.core;bundle-version="4.0.0",
+ org.eclipse.core.filesystem
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.core/META-INF/MANIFEST.MF
+index a3679c9..9fc559b 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.core/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.core/META-INF/MANIFEST.MF
+@@ -38,4 +38,4 @@ Export-Package: org.eclipse.dltk.tcl.ast,
+ org.eclipse.dltk.tcl.internal.parser.ext,
+ org.eclipse.dltk.tcl.internal.structure;x-internal:=true,
+ org.eclipse.dltk.tcl.structure
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/META-INF/MANIFEST.MF
+index f43f45b..f1559f8 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/META-INF/MANIFEST.MF
+@@ -38,5 +38,5 @@ Export-Package: org.eclipse.dltk.tcl.internal.console.ui,
+ org.eclipse.dltk.tcl.internal.debug.ui.preferences
+ Eclipse-LazyStart: true
+ Bundle-Activator: org.eclipse.dltk.tcl.internal.debug.ui.TclDebugUIPlugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.debug/META-INF/MANIFEST.MF
+index 510b1b7..ab10c77 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.debug/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.debug/META-INF/MANIFEST.MF
+@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.dltk.debug;bundle-version="4.0.0",
+ Bundle-Activator: org.eclipse.dltk.tcl.internal.debug.TclDebugPlugin
+ Export-Package: org.eclipse.dltk.tcl.internal.debug
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.formatter/META-INF/MANIFEST.MF
+index 02a221a..48ecfb6 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/META-INF/MANIFEST.MF
+@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.dltk.formatter;bundle-version="4.0.0",
+ org.eclipse.emf.ecore
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+ Export-Package: org.eclipse.dltk.tcl.formatter
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.launching/META-INF/MANIFEST.MF
+index a9eb39e..e4b7f10 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/META-INF/MANIFEST.MF
+@@ -18,4 +18,4 @@ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.tcl.console,
+ org.eclipse.dltk.tcl.internal.launching,
+ org.eclipse.dltk.tcl.launching
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
+index 81ff3fd..c458d2c 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
+@@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier
+ Bundle-ClassPath: .
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.tcl.ast,
+ org.eclipse.dltk.tcl.ast.impl,
+ org.eclipse.dltk.tcl.ast.util,
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/META-INF/MANIFEST.MF
+index 6290f4d..5829296 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/META-INF/MANIFEST.MF
+@@ -30,5 +30,5 @@ Export-Package: org.eclipse.dltk.tcl.internal.tclchecker,
+ org.eclipse.dltk.tcl.tclchecker,
+ org.eclipse.dltk.tcl.tclchecker.model.configs,
+ org.eclipse.dltk.tcl.tclchecker.model.messages
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.testing/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.testing/META-INF/MANIFEST.MF
+index b497744..3fa749f 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.testing/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.testing/META-INF/MANIFEST.MF
+@@ -30,5 +30,5 @@ Require-Bundle: org.eclipse.ui,
+ Eclipse-LazyStart: true
+ Bundle-Vendor: %providerName
+ Export-Package: org.eclipse.dltk.tcl.testing
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.ui/META-INF/MANIFEST.MF
+index 978a705..1bbb368 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/META-INF/MANIFEST.MF
+@@ -42,4 +42,4 @@ Export-Package: org.eclipse.dltk.tcl.internal.ui,
+ org.eclipse.dltk.tcl.ui.manpages.dialogs,
+ org.eclipse.dltk.tcl.ui.semantilhighlighting,
+ org.eclipse.dltk.tcl.ui.text
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.validators/META-INF/MANIFEST.MF
+index f5d6cd6..a4c3940 100644
+--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/META-INF/MANIFEST.MF
++++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/META-INF/MANIFEST.MF
+@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.launching;bundle-version="4.0.0",
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.tcl.internal.validators,
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/META-INF/MANIFEST.MF
+index ad9cd6d..254d5cd 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/META-INF/MANIFEST.MF
+@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.dltk.core
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.tcl.activestatedebugger.tests
+ Bundle-ActivationPolicy: lazy
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.core.tests/META-INF/MANIFEST.MF
+index ffd0058..5df4766 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/META-INF/MANIFEST.MF
+@@ -25,4 +25,4 @@ Export-Package: org.eclipse.dltk.tcl.core.tests,
+ org.eclipse.dltk.tcl.core.tests.model,
+ org.eclipse.dltk.tcl.parser.structure,
+ org.eclipse.dltk.tcl.parser.tests
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/META-INF/MANIFEST.MF
+index 3bfe182..897ff59 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/META-INF/MANIFEST.MF
+@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.tcl.parser,
+ org.eclipse.dltk.tcl.parser.tests,
+ org.eclipse.dltk.tcl.formatter
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.dltk.tcl.formatter.tests
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/META-INF/MANIFEST.MF
+index 7d7649c..7ae4bfb 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/META-INF/MANIFEST.MF
+@@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier
+ Bundle-ClassPath: .
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.dltk.tcl.parser;visibility:=reexport,
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.ui.tests.swtbot/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.ui.tests.swtbot/META-INF/MANIFEST.MF
+index 5653ede..c33efa3 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests.swtbot/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests.swtbot/META-INF/MANIFEST.MF
+@@ -23,5 +23,5 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.swtbot.eclipse.finder,
+ org.eclipse.swtbot.swt.finder
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/META-INF/MANIFEST.MF
+index 0233c0e..100a7de 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/META-INF/MANIFEST.MF
+@@ -25,4 +25,4 @@ Eclipse-LazyStart: true
+ Export-Package: org.eclipse.dltk.tcl.ui.tests,
+ org.eclipse.dltk.tcl.ui.tests.folding,
+ org.eclipse.dltk.tcl.ui.tests.indenting
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/META-INF/MANIFEST.MF b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/META-INF/MANIFEST.MF
+index 85fd2db..04e853a 100644
+--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/META-INF/MANIFEST.MF
++++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/META-INF/MANIFEST.MF
+@@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.dltk.tcl.parser.tests,
+ org.junit
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: %pluginProvider
+ Export-Package: org.eclipse.dltk.tcl.validators.tests
+diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/META-INF/MANIFEST.MF b/xotcl/plugins/org.eclipse.dltk.xotcl.core/META-INF/MANIFEST.MF
+index 5922a4d..a9c5742 100644
+--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/META-INF/MANIFEST.MF
++++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/META-INF/MANIFEST.MF
+@@ -22,4 +22,4 @@ Export-Package: org.eclipse.dltk.xotcl.core,
+ org.eclipse.dltk.xotcl.internal.core.search;x-friends:="org.eclipse.dltk.xotcl.core,org.eclipse.dltk.xotcl.ui",
+ org.eclipse.dltk.xotcl.internal.core.search.mixin,
+ org.eclipse.dltk.xotcl.internal.core.search.mixin.model
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+diff --git a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/META-INF/MANIFEST.MF b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/META-INF/MANIFEST.MF
+index d30afbd..11bc1e1 100644
+--- a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/META-INF/MANIFEST.MF
++++ b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/META-INF/MANIFEST.MF
+@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.dltk.tcl.parser
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.dltk.xotcl.core.tests
More information about the scm-commits
mailing list