Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorRoland Grunberg2016-11-18 16:33:54 +0000
committerRoland Grunberg2016-12-12 18:42:52 +0000
commit1838703f74ce3ca20f449af8bc8b2aa2602aa87f (patch)
treea848878e241c66c47a757b0844f0342b488b020a /releng
parent9a1f34ca2b8519ca21bb32388eed70da5c711db8 (diff)
downloadorg.eclipse.linuxtools-1838703f74ce3ca20f449af8bc8b2aa2602aa87f.tar.gz
org.eclipse.linuxtools-1838703f74ce3ca20f449af8bc8b2aa2602aa87f.tar.xz
org.eclipse.linuxtools-1838703f74ce3ca20f449af8bc8b2aa2602aa87f.zip
Bug 492235: Update to docker-client 3.6.8.
- Update to Orbit Oxygen M4 - Update the Docker Client stack to 3.6.8 - Bundle-SymbolicName change 'jnr.*' -> 'com.github.jnr.*' - Remove workaround for lack of Guava 18.0 - Remove workaround for lack of proper ExecStartParameter.TTY value Change-Id: I3c38ceb728bfd7f4d1ec9664e33a96081cb10852 Reviewed-on: https://git.eclipse.org/r/85313 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.linuxtools.docker-site/category.xml37
-rw-r--r--releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target6
2 files changed, 31 insertions, 12 deletions
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index d7e32a88a2..0dfe5c3088 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -24,6 +24,12 @@
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="org.apache.httpcomponents.httpcore" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.apache.httpcomponents.httpclient" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -42,28 +48,28 @@
<iu id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0">
+ <iu id="javax.ws.rs" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="javax.ws.rs" version="0.0.0">
+ <iu id="com.github.jnr.jffi" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="com.kenai.jffi" version="0.0.0">
+ <iu id="com.github.jnr.jffi.native" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.constants" version="0.0.0">
+ <iu id="com.github.jnr.constants" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.enxio" version="0.0.0">
+ <iu id="com.github.jnr.enxio" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.ffi" version="0.0.0">
+ <iu id="com.github.jnr.ffi" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.posix" version="0.0.0">
+ <iu id="com.github.jnr.posix" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.unixsocket" version="0.0.0">
+ <iu id="com.github.jnr.unixsocket" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="jnr.x86asm" version="0.0.0">
@@ -102,6 +108,12 @@
<iu id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.glassfish.jersey.core.jersey-server" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="javassist" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -117,6 +129,15 @@
<iu id="org.objectweb.asm" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="org.objectweb.asm.tree" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.objectweb.asm.util" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.objectweb.asm.analysis" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="org.apache.commons.compress" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target
index 8a2e7d3667..9c9dce66af 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target
@@ -1,20 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="linuxtools-e4.6" sequenceNumber="4">
+<?pde version="3.8"?><target name="linuxtools-e4.6" sequenceNumber="5">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.swtchart" version="0.0.0"/>
<unit id="org.cyberneko.html" version="0.0.0"/>
<unit id="org.apache.xerces" version="0.0.0"/>
<unit id="org.objectweb.asm" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
<unit id="com.spotify.docker.client" version="0.0.0"/>
<unit id="com.spotify.docker.client.source" version="0.0.0"/>
<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
<unit id="org.bouncycastle.bcpkix" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.assertj" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
-<repository location="http://download.eclipse.org/linuxtools/docker-client"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20161205183421/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>

Back to the top