commit 1810ffa0c8167c4552cfda07d6ca0a0c037ed212
author Stephane Bouchet <sbouchet@redhat.com> Tue Jun 16 19:21:22 2020 +0200
committer Jeff Johnston <jjohnstn@redhat.com> Tue Jun 16 15:02:40 2020 -0400
tree 961fc9d53088fac15c70ae5263cb17d6e3e7f1b5
parent 88fa44fb2639a80d1f1affd303d0e5b83fb2518a

bug 564339 - fix resolution errors on JDK18

Change-Id: I09a57235364af6c13cddf22a47c913f99d05cd4d
Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>
Reviewed-on: https://git.eclipse.org/r/165009
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF

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 5c1ee20..ae499d2 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,10 +30,10 @@
  org.eclipse.ui,
  org.eclipse.swt,
  com.google.guava;bundle-version="21.0.0"
-Import-Package: javax.xml.bind;version="2.3.3"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.debug.core,
+Import-Package: javax.xml.bind;version="2.3.3", 
+ org.eclipse.debug.core,
  org.eclipse.linuxtools.docker.reddeer,
  org.eclipse.linuxtools.docker.reddeer.condition,
  org.eclipse.linuxtools.docker.reddeer.core.ui.wizards,
@@ -42,7 +42,8 @@
  org.eclipse.linuxtools.docker.reddeer.ui,
  org.eclipse.linuxtools.docker.reddeer.ui.resources,
  org.eclipse.linuxtools.docker.reddeer.utils,
- org.hamcrest;version="1.3.0"
+ org.hamcrest;version="1.3.0",
+ javax.annotation;version="1.3.5"
 Automatic-Module-Name: org.eclipse.linuxtools.docker.integration.tests
 
 

containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF

diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
index 8bb954c..1378b68 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
@@ -33,5 +33,6 @@
  org.eclipse.linuxtools.docker.reddeer.utils,
  org.eclipse.linuxtools.docker.reddeer.requirements,
  org.eclipse.linuxtools.docker.reddeer
-Import-Package: org.eclipse.linuxtools.internal.docker.ui.testutils
+Import-Package: org.eclipse.linuxtools.internal.docker.ui.testutils,
+ javax.annotation;version="1.3.5"
 Automatic-Module-Name: org.eclipse.linuxtools.docker.reddeer

containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF

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 22c8b9c..17daea9 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,8 @@
  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;version="2.3.3"
+Import-Package: javax.xml.bind;version="2.3.3",
+ javax.annotation;version="1.3.5"
 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"