Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-11-16 17:27:46 -0500
committerJeff Johnston2018-11-23 12:10:12 -0500
commit8943a654114cdd905a4de6471f82bf2521e42ea4 (patch)
tree6bc491e3f205ea6fb5eee43c4d0a5347117eeb80
parent9a494093d2d70e48965f9bc2444c1dabf017b7c8 (diff)
downloadorg.eclipse.linuxtools-8943a654114cdd905a4de6471f82bf2521e42ea4.tar.gz
org.eclipse.linuxtools-8943a654114cdd905a4de6471f82bf2521e42ea4.tar.xz
org.eclipse.linuxtools-8943a654114cdd905a4de6471f82bf2521e42ea4.zip
Bug 539483 - Docker tooling unusable when running on Java 11
- add java.xml.stream to docker category.xml - add java.xml.stream to docker.core MANIFEST.MF dependencies - add java.xml.stream to linuxtools-e4.10.target - disable PushImageTest temporarily Change-Id: Ia8a67e375cc1ebbbb41ccd9aed0ed858cf8e7d92 Reviewed-on: https://git.eclipse.org/r/132598 Tested-by: CI Bot Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF3
-rw-r--r--containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java2
-rw-r--r--releng/org.eclipse.linuxtools.docker-site/category.xml3
-rw-r--r--releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target1
4 files changed, 8 insertions, 1 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
index 4961f532d7..eda2cd208c 100644
--- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.glassfish.jersey.core.jersey-common;bundle-version="2.14.0",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
org.eclipse.debug.core;bundle-version="3.10.100",
- javax.xml.bind;bundle-version="2.2.0"
+ javax.xml.bind;bundle-version="2.2.0",
+ javax.xml.stream;bundle-version="1.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.docker.core,
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
index e180735448..b654a8e657 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
@@ -24,8 +24,10 @@ import org.eclipse.reddeer.common.wait.WaitWhile;
import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore
public class PushImageTest extends AbstractImageBotTest {
private static final String DOCKERFILE_FOLDER = "resources/test-variables";
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index 2e82b4b148..9c41bc20a9 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -119,6 +119,9 @@
<iu id="javax.xml.bind" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="javax.xml.stream" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="com.github.jnr.jffi" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target
index 5a412420f5..1aac16c0fe 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.10.target
@@ -22,6 +22,7 @@
<unit id="javassist" version="3.13.0.GA_v201209210905"/>
<unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="jnr.x86asm" version="1.0.2.v201505052040"/>
<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>

Back to the top