Revert "Bug 491566 - SWT fragments specify <executionEnvironment> "
This reverts commit 0da4de5aec072f5741c327a6b9dc87299083ac5b.
Change-Id: Ic1e6f56937b465e6f100dbb6c753279eee2ea545
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
index 3c84fee..399afce 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@
org.eclipse.swt.internal.theme; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.cocoa; x-friends:="org.eclipse.ui"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) )
SWT-WS: cocoa
SWT-OS: macosx
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
index 40ae30f..2dcb249 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc))
SWT-WS: gtk
SWT-OS: aix
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
index 5063633..5273238 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc64))
SWT-WS: gtk
SWT-OS: aix
diff --git a/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
index 2a3020c..d410f66 100644
--- a/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=hpux) (osgi.arch=ia64))
SWT-WS: gtk
SWT-OS: hpux
diff --git a/bundles/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF
index 348d47a..f0c5bb7 100644
--- a/bundles/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.arm/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.arm/META-INF/MANIFEST.MF
index 1f912db..a499ce2 100644
--- a/bundles/org.eclipse.swt.gtk.linux.arm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.arm/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
index 1f675d4..ea36a4f 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
index 7ef951b..292a716 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF
index 7e1bf92..6e2f5cc 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
index a8a8151..a92ae47 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
index db8cbf1..c9edc52 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390x))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
index e025dca..b81018d 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
index 64440d7..7009e63 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
SWT-WS: gtk
SWT-OS: linux
diff --git a/bundles/org.eclipse.swt.gtk.solaris.sparcv9/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.solaris.sparcv9/META-INF/MANIFEST.MF
index 0a67479..a9d1e29 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.sparcv9/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.solaris.sparcv9/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=sparcv9))
SWT-WS: gtk
SWT-OS: solaris
diff --git a/bundles/org.eclipse.swt.gtk.solaris.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.solaris.x86_64/META-INF/MANIFEST.MF
index 8f2aeb5..66e49df 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.solaris.x86_64/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86_64))
SWT-WS: gtk
SWT-OS: solaris
diff --git a/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
index a6a215d..55684ab 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
@@ -29,7 +29,6 @@
org.eclipse.swt.internal.ole.win32; x-internal:=true,
org.eclipse.swt.internal.win32; x-internal:=true,
org.eclipse.swt.internal.opengl.win32; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
SWT-WS: win32
SWT-OS: win32
diff --git a/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
index 45ec31b..22a5229 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -29,7 +29,6 @@
org.eclipse.swt.internal.ole.win32; x-internal:=true,
org.eclipse.swt.internal.win32; x-internal:=true,
org.eclipse.swt.internal.opengl.win32; x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
SWT-WS: win32
SWT-OS: win32
diff --git a/pom.xml b/pom.xml
index 53eea6d..5ccbd25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,21 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>JavaSE-1.8</executionEnvironment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
