From acd2f206efafb95b0b65dc9d486718447a9888f5 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Jul 25 2017 01:23:15 +0000 Subject: Renamed to docker-client-java --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 40e66e3..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/v*.tar.gz -/*.src.rpm diff --git a/0001-Adapt-to-API-changes-in-latest-jnr-unixsocket.patch b/0001-Adapt-to-API-changes-in-latest-jnr-unixsocket.patch deleted file mode 100644 index 39cb313..0000000 --- a/0001-Adapt-to-API-changes-in-latest-jnr-unixsocket.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2beafcb61b32ebf6fd4af791f4e2d2aefef82763 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 3 Jul 2017 14:27:51 +0100 -Subject: [PATCH] Adapt to API changes in latest jnr-unixsocket. - -In the latest version of jnr-unixsocket, some getter/setter methods in -the UnixSocketChannel object went away. This change replaces usage of -those getters/setters with calls to getOption/setOption instead. - -Signed-off-by: Mat Booth ---- - pom.xml | 2 +- - .../spotify/docker/client/ApacheUnixSocket.java | 25 ++++++++++++++++++---- - 2 files changed, 22 insertions(+), 5 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 0550af5..4399a9d 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -139,7 +139,7 @@ - - com.github.jnr - jnr-unixsocket -- 0.8 -+ 0.18 - - - commons-lang -diff --git a/src/main/java/com/spotify/docker/client/ApacheUnixSocket.java b/src/main/java/com/spotify/docker/client/ApacheUnixSocket.java -index 4d8fb09..a19998f 100644 ---- a/src/main/java/com/spotify/docker/client/ApacheUnixSocket.java -+++ b/src/main/java/com/spotify/docker/client/ApacheUnixSocket.java -@@ -36,6 +36,7 @@ import java.util.Queue; - - import jnr.unixsocket.UnixSocketAddress; - import jnr.unixsocket.UnixSocketChannel; -+import jnr.unixsocket.UnixSocketOptions; - - /** - * Provides a socket that wraps an jnr.unixsocket.UnixSocketChannel and delays setting options until -@@ -196,14 +197,22 @@ public class ApacheUnixSocket extends Socket { - setSocketOption(new SocketOptionSetter() { - @Override - public void run() throws SocketException { -- inner.setSoTimeout(timeout); -+ try { -+ inner.setOption(UnixSocketOptions.SO_RCVTIMEO, Integer.valueOf(timeout)); -+ } catch (IOException e) { -+ throw (SocketException)new SocketException().initCause(e); -+ } - } - }); - } - - @Override - public synchronized int getSoTimeout() throws SocketException { -- return inner.getSoTimeout(); -+ try { -+ return inner.getOption(UnixSocketOptions.SO_RCVTIMEO).intValue(); -+ } catch (IOException e) { -+ throw (SocketException)new SocketException().initCause(e); -+ } - } - - @Override -@@ -231,14 +240,22 @@ public class ApacheUnixSocket extends Socket { - setSocketOption(new SocketOptionSetter() { - @Override - public void run() throws SocketException { -- inner.setKeepAlive(on); -+ try { -+ inner.setOption(UnixSocketOptions.SO_KEEPALIVE, Boolean.valueOf(on)); -+ } catch (IOException e) { -+ throw (SocketException)new SocketException().initCause(e); -+ } - } - }); - } - - @Override - public boolean getKeepAlive() throws SocketException { -- return inner.getKeepAlive(); -+ try { -+ return inner.getOption(UnixSocketOptions.SO_KEEPALIVE).booleanValue(); -+ } catch (IOException e) { -+ throw (SocketException)new SocketException().initCause(e); -+ } - } - - @Override --- -2.7.5 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..782a2c4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Renamed to docker-client-java diff --git a/docker-client.spec b/docker-client.spec deleted file mode 100644 index f20bc19..0000000 --- a/docker-client.spec +++ /dev/null @@ -1,173 +0,0 @@ -Name: docker-client -Version: 6.2.5 -Release: 2%{?dist} -Summary: Docker Client - -License: ASL 2.0 -URL: https://github.com/spotify/docker-client -Source0: https://github.com/spotify/docker-client/archive/v%{version}.tar.gz - -# Sent upstream: https://github.com/spotify/docker-client/pull/817 -Patch0: 0001-Adapt-to-API-changes-in-latest-jnr-unixsocket.patch - -BuildRequires: maven-local -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -BuildRequires: mvn(com.fasterxml.jackson.datatype:jackson-datatype-guava) -BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider) -BuildRequires: mvn(com.github.jnr:jnr-unixsocket) >= 0.18 -BuildRequires: mvn(com.google.guava:guava) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(org.apache.commons:commons-compress) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.httpcomponents:httpclient) -BuildRequires: mvn(org.apache.httpcomponents:httpcore) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) -BuildRequires: mvn(org.glassfish.jersey.connectors:jersey-apache-connector) -BuildRequires: mvn(org.glassfish.jersey.core:jersey-client) -BuildRequires: mvn(org.glassfish.jersey.media:jersey-media-json-jackson) -BuildRequires: mvn(org.slf4j:slf4j-api) - -# This is provided by JRE but need it until either -# - jackson-module-jaxb-annotations adds Requires to it -# - jackson-module-jaxb-annotations removes it from Import-Package entirely -Requires: glassfish-jaxb-api >= 2.2.12 - -BuildArch: noarch - -%description -The Docker Client is a Java API library for accessing a Docker daemon. - -%prep -%setup -q -n docker-client-%{version} -%patch0 -p1 - -# The parent pom doen't add anything we can't live without -%pom_remove_parent -sed -i -e '//acom.spotify' pom.xml - -# Plugins unnecessary for RPM builds -%pom_remove_plugin :maven-shade-plugin -%pom_remove_plugin :jacoco-maven-plugin - -# Generate OSGi metadata -%pom_add_plugin "org.apache.felix:maven-bundle-plugin" pom.xml \ -" - - \${project.groupId}.docker.client - <_nouses>true - - - - - create-manifest - process-classes - manifest - -" -%pom_add_plugin "org.apache.maven.plugins:maven-jar-plugin" pom.xml \ -" - - \${project.build.outputDirectory}/META-INF/MANIFEST.MF - -" - -%build -%mvn_build -j -f - -%install -%mvn_install - -%files -f .mfiles -%license LICENSE NOTICE -%doc README.md - -%changelog -* Mon Jul 03 2017 Mat Booth - 6.2.5-2 -- Adapt to unixsocket API changes - -* Fri Jun 16 2017 Mat Booth - 6.2.5-1 -- Update to docker-client 6.2.5 -- Remove SCL macros forbidden in Fedora - -* Fri Feb 10 2017 Fedora Release Engineering - 4.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 4.0.6-4 -- Remove BR on jacoco-maven-plugin - -* Thu Jun 30 2016 Mat Booth - 4.0.6-3 -- Add missing BR on oss-parent -- Add patch to avoid annotations removed from httpcomponents - -* Wed Jun 29 2016 Mat Booth - 4.0.6-2 -- Add missing import-packages in OSGi manifest - -* Thu May 19 2016 Alexander Kurtakov 4.0.6-1 -- Update to upstream 4.0.6 release. - -* Tue Apr 19 2016 Roland Grunberg - 4.0.1-2 -- Add com.spotify.docker.client.exceptions to exported packages. - -* Mon Apr 18 2016 Alexander Kurtakov 4.0.1-1 -- Update to upstream 4.0.1 release. - -* Wed Apr 6 2016 Alexander Kurtakov 3.6.8-1 -- Update to upstream 3.6.8 release. - -* Fri Mar 25 2016 Alexander Kurtakov 3.6.6-1 -- Update to upstream 3.6.6 release. - -* Thu Feb 11 2016 Alexander Kurtakov 3.5.12-1 -- Update to upstream 3.5.12 release. - -* Mon Feb 8 2016 Alexander Kurtakov 3.5.11-1 -- Update to upstream 3.5.11 release. - -* Thu Feb 4 2016 Alexander Kurtakov 3.5.10-1 -- Update to upstream 3.5.10 release. - -* Wed Feb 03 2016 Fedora Release Engineering - 3.5.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 20 2016 Alexander Kurtakov 3.5.9-1 -- Update to upstream 3.5.9 release. - -* Fri Oct 23 2015 Alexander Kurtakov 3.1.9-1 -- Update to upstream 3.1.9 release. - -* Tue Oct 6 2015 akurtakov 3.1.5-1 -- Update to upstream 3.1.5. -- Stripdown useless BRs. - -* Thu Sep 24 2015 Alexander Kurtakov 3.1.4-1 -- Update to upstream 3.1.4 release. - -* Mon Aug 17 2015 Alexander Kurtakov 3.1.3-1 -- Update to upstream 3.1.3 release. - -* Wed Aug 5 2015 Alexander Kurtakov 3.1.2-1 -- Update to upstream 3.1.2 release. - -* Thu Jul 30 2015 Roland Grunberg - 3.1.1-2 -- Update manifest's Bundle-Version to match %%{version}. - -* Thu Jul 30 2015 Alexander Kurtakov 3.1.1-1 -- Update to upstream 3.1.1 release. - -* Wed Jul 22 2015 Roland Grunberg - 3.0.0-2 -- Support the 1.19 Docker Remote API. -- Support SO_LINGER option needed when httpcomponents-core >= 4.4. - -* Wed Jul 08 2015 Roland Grunberg - 3.0.0-1 -- Update to 3.0.0. - -* Wed Jun 24 2015 Roland Grunberg - 2.7.26-3 -- Depend upon hk2-locator as it's needed by jersey-client at runtime. -- Require jaxb-api to temporarily satisfy an invalid requirement. - -* Tue Jun 23 2015 Roland Grunberg - 2.7.26-2 -- Depend on versionless bouncycastle within manifest. - -* Mon Jun 8 2015 Jeff Johnston 2.7.26-1 -- Initial packaging. diff --git a/sources b/sources deleted file mode 100644 index 2133d2d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (v6.2.5.tar.gz) = 46bf6ddba0435aee5c324893db26a18e3ffc01706d8fffdc34b83b71aa1307addc4e6a2d15e8fe71c67273d9826abba4663c8850d131fb98237a15a7fd57b86e