Revert "Bug 491566 - SWT fragments specify <executionEnvironment> "I20161219-0145

This reverts commit 0da4de5aec072f5741c327a6b9dc87299083ac5b.

Change-Id: Ic1e6f56937b465e6f100dbb6c753279eee2ea545

18 files changed, 15 insertions, 17 deletions

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 3c84fee0f..399afce19 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 @@ Export-Package:
  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 40ae30f41..2dcb249bf 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 @@ Export-Package:
  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 50636336e..5273238f7 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 @@ Export-Package:
  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 2a3020c53..d410f66ce 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 @@ Export-Package:
  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 348d47aee..f0c5bb7c9 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 @@ Export-Package:
  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 1f912dbe9..a499ce2be 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 @@ Export-Package:
  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 1f675d4dd..ea36a4f1c 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 @@ Export-Package:
  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 7ef951bbd..292a71689 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 @@ Export-Package:
  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 7e1bf92d9..6e2f5ccbc 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 @@ Export-Package:
  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 a8a815132..a92ae4743 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 @@ Export-Package:
  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 db8cbf11d..c9edc522f 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 @@ Export-Package:
  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 e025dcaec..b81018db2 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 @@ Export-Package:
  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 64440d7ba..7009e63ac 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 @@ Export-Package:
  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 0a6747994..a9d1e2924 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 @@ Export-Package:
  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 8f2aeb517..66e49dfc7 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 @@ Export-Package:
  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 a6a215d86..55684ab09 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 @@ Export-Package:
  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 45ec31b96..22a522959 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 @@ Export-Package:
  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 53eea6dd9..5ccbd2552 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>