From 414662b320eb39491c22f748d1ffb85aa5a3ae6a Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Thu, 23 Mar 2017 19:45:09 +0100 Subject: [PATCH] ref #6539 Fix build problems - set Bundle-RequiredExecutionEnvironment back to Java 1.8 - Remove indigo osgi dependency from target platform --- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + eu.etaxonomy.taxeditor/rcp.target | 59 +++++++++---------- 13 files changed, 41 insertions(+), 30 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index 9082988c8..41083e5a4 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Vendor: EDIT Bundle-Localization: OSGI-INF/l10n/plugin Export-Package: eu.etaxonomy.taxeditor Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: eu.etaxonomy.cdm.database, org.apache.log4j, org.eclipse.equinox.app, diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 0e9aa0905..23e313721 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions, eu.etaxonomy.taxeditor.store, eu.etaxonomy.taxeditor.cdmlib +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: eu.etaxonomy.taxeditor.editor, org.eclipse.core.runtime, diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 013737db7..d09e9df7a 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -510,6 +510,7 @@ Export-Package: com.google.api, org.springframework.ui, javax.servlet.http" Bundle-Vendor: EDIT +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.osgi, org.eclipse.equinox.common, org.apache.commons.httpclient;bundle-version="3.1.0", diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index 1231dbfc4..577a82f05 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -29,6 +29,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.zest.layouts, eu.etaxonomy.taxeditor.cdmlib, org.eclipse.ui.ide +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.databinding.beans, org.eclipse.core.databinding.observable.list, diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF index 9652a208f..a156ce60b 100644 --- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.help.ui, org.eclipse.help.webapp +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF index 791522b68..dc2f9162a 100644 --- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF @@ -239,3 +239,4 @@ Export-Package: info.bioinfweb.commons, Bundle-ActivationPolicy: lazy Import-Package: javax.swing Require-Bundle: org.eclipse.swt +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF index 8f2e92b51..8ec58c19c 100644 --- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.jface.databinding;bundle-version="1.5.0", org.eclipse.core.databinding.property;bundle-version="1.4.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.taxeditor.molecular, diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 1bcaab1a4..168a86746 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -27,3 +27,4 @@ Import-Package: org.eclipse.core.resources, org.eclipse.ui.forms.widgets, org.osgi.framework Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index 0514faf7c..351006cdc 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: org.apache.log4j, Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index b39c91e10..a64aca87b 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -94,4 +94,5 @@ Import-Package: eu.etaxonomy.taxeditor.webapp, org.osgi.framework, org.osgi.service.prefs;version="1.1.1" Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: OSGI-INF/l10n/bundle diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF index 656aa1a8d..fb17e2776 100644 --- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true Bundle-Version: 4.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.ide, diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF index 2ae13d730..153d8a6d3 100644 --- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF @@ -4,6 +4,7 @@ Bundle-Name: Webapp Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true Bundle-Version: 4.7.0.qualifier Require-Bundle: org.eclipse.core.runtime +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: eu.etaxonomy.taxeditor.webapp Bundle-ClassPath: ., diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target index 870c330f0..6168ac722 100644 --- a/eu.etaxonomy.taxeditor/rcp.target +++ b/eu.etaxonomy.taxeditor/rcp.target @@ -1,31 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + -- 2.34.1