From d9c6894d8186562ae8211e56afc36e8981e69363 Mon Sep 17 00:00:00 2001 From: Igor Fedorenko Date: Sun, 7 Jun 2015 15:13:52 -0400 Subject: require java 8 to build and run Change-Id: I9f21ebf471b992e9aa2e6a6dcb944a469598277e Signed-off-by: Igor Fedorenko --- m2e-maven-runtime/pom.xml | 2 +- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.discovery/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.launching/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 3 +-- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF | 3 +-- 18 files changed, 18 insertions(+), 35 deletions(-) diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml index 3907fd4a..5eb9d795 100644 --- a/m2e-maven-runtime/pom.xml +++ b/m2e-maven-runtime/pom.xml @@ -93,7 +93,7 @@ <_snapshot>${osgi-version-qualifier} ${project.artifactId};singleton:=false - JavaSE-1.7,JavaSE-1.8 + JavaSE-1.8 %Bundle-Name %Bundle-Vendor {maven-dependencies} diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index 96cd4fba..495cdef4 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -2,8 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true Bundle-Version: 1.7.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index c05dc4ca..b4891125 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0", com.google.guava;bundle-version="[14.0.1,16.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.archetype;x-friends:="org.eclipse.m2e.core.ui", org.eclipse.m2e.core.embedder, diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index 44bb2236..64a0c2df 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true Bundle-Version: 1.7.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . Bundle-Localization: plugin diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF index 0e65e7fc..c78a0fa9 100644 --- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF @@ -31,6 +31,5 @@ Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true, org.eclipse.m2e.editor.xml.preferences;x-internal:=true Bundle-ClassPath: . Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Service-Component: OSGI-INF/component.xml diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index d9c22dca..f0466789 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -25,8 +25,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.common, org.eclipse.emf.ecore Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . Export-Package: org.eclipse.m2e.editor;x-internal:=true, diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF index e2dc61ee..0e54be37 100644 --- a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF @@ -20,6 +20,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2e.core;bundle-version="[1.7.0,1.8.0)", org.slf4j.api;bundle-version="1.6.2", org.eclipse.m2e.core.ui;bundle-version="[1.7.0,1.8.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index b498798f..08222288 100644 --- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF @@ -17,6 +17,5 @@ Require-Bundle: org.eclipse.core.runtime, org.slf4j.api;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index 1884b583..9bf92cf0 100644 --- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF @@ -28,8 +28,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2e.workspace.cli;bundle-version="0.1.0", com.google.guava;bundle-version="[14.0.1,16.0.0) Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.actions;x-internal:=true, org.eclipse.m2e.internal.launch;x-internal:=true, diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF index 44911840..5dba2891 100644 --- a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF @@ -7,5 +7,4 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.7.0,1.8.0)", org.eclipse.m2e.jdt;bundle-version="[1.7.0,1.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF index fdfd5df3..66bccf86 100644 --- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-SymbolicName: org.eclipse.m2e.logback.appender;singleton:=true Bundle-Version: 1.7.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: ch.qos.logback.classic Export-Package: org.eclipse.m2e.logback.appender;x-internal:=true Require-Bundle: org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF index 0e962c82..e693ab28 100644 --- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF @@ -10,6 +10,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", ch.qos.logback.core;bundle-version="0.9.24", org.slf4j.api;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.m2e.logback.configuration;x-internal:=true diff --git a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF index 79fbbf2c..a0f33c87 100644 --- a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Bundle-Name: %Bundle-Name -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.7.0.qualifier Bundle-ManifestVersion: 2 diff --git a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF index 6eba7869..e8965380 100644 --- a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF @@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.m2e.core;bundle-version="[1.7.0,1.8.0)";visibility:=reexport, org.eclipse.m2e.maven.runtime;bundle-version="[1.7.0,1.8.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.profiles.core.internal;x-friends:="org.eclipse.m2e.profiles.ui", org.eclipse.m2e.profiles.core.internal.management;x-internal:=true diff --git a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF index a0365b60..35f3c236 100644 --- a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF @@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.m2e.profiles.core;bundle-version="[1.7.0,1.8.0)", org.slf4j.api;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.profiles.ui.internal;x-internal:=true, org.eclipse.m2e.profiles.ui.internal.actions;x-internal:=true, diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index 77ab3628..c4ef7c96 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -23,6 +23,5 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.7.0,1.8.0)", org.eclipse.m2e.core.ui;bundle-version="[1.7.0,1.8.0)", org.slf4j.api;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal:=true diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index 7b4f8bf6..670bd7a5 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -2,8 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.scm;singleton:=true Bundle-Version: 1.7.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF index a18db127..8d1860e6 100644 --- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF @@ -13,8 +13,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.debug.core, org.eclipse.core.resources Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7, - JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., jars/javax.servlet_2.5.0.v201103041518.jar, jars/org.mortbay.jetty.server_6.1.23.v201012071420.jar, -- cgit v1.2.3