Fix some metadata issues with Docker Tooling stack
- Add javax.annotation 1.3.5 package requirement in docker.ui
- Fix remaining 'bundle-version' attributes in Import-Package
Change-Id: I967c813444b93089d082a49fd9e4b8f0f969e486
Reviewed-on: https://git.eclipse.org/r/164344
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
index cfc9e3c..5c1ee20 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@
org.eclipse.ui,
org.eclipse.swt,
com.google.guava;bundle-version="21.0.0"
-Import-Package: javax.xml.bind;bundle-version="2.3.3"
+Import-Package: javax.xml.bind;version="2.3.3"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.debug.core,
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
index 08688b0..22c8b9c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@
org.eclipse.ui.console;bundle-version="3.6.100",
org.eclipse.launchbar.ui;bundle-version="2.0.1",
org.eclipse.launchbar.ui.controls;bundle-version="1.0.0"
-Import-Package: javax.xml.bind;bundle-version="2.3.3"
+Import-Package: javax.xml.bind;version="2.3.3"
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.linuxtools.internal.docker.ui.testutils;x-friends:="org.eclipse.linuxtools.docker.reddeer,org.eclipse.linuxtools.docker.reddeer.ui,org.eclipse.linuxtools.docker.integration.tests"
diff --git a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
index e5022a3..d6e8640 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@
org.eclipse.tm.terminal.view.ui;bundle-version="4.1.0",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
org.apache.commons.compress;bundle-version="1.6.0"
-Import-Package: javax.xml.bind; bundle-version="2.3.3"
+Import-Package: javax.xml.bind;version="2.3.3",
+ javax.annotation;version="1.3.5"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
index cd2bb09..b3c9559 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
@@ -19,5 +19,5 @@
org.eclipse.linuxtools.docker.core,
org.mandas.docker-client,
org.eclipse.core.runtime
-Import-Package: javax.xml.bind;bundle-version="2.3.3"
+Import-Package: javax.xml.bind;version="2.3.3"
Automatic-Module-Name: org.eclipse.linuxtools.jdt.docker.launcher
