diff --git a/.devtoolset-4-docker-client.metadata b/.devtoolset-4-docker-client.metadata index 1503535..bbfad80 100644 --- a/.devtoolset-4-docker-client.metadata +++ b/.devtoolset-4-docker-client.metadata @@ -1 +1 @@ -1334ee3d6d24e373680b0dfd38b84202ccb14ba5 SOURCES/v3.1.1.tar.gz +69f0bf0380d25fe168f3eaa35336011349210fa9 SOURCES/v3.1.9.tar.gz diff --git a/.gitignore b/.gitignore index 21d94c8..5cfed78 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v3.1.1.tar.gz +SOURCES/v3.1.9.tar.gz diff --git a/SOURCES/add-manifest.patch b/SOURCES/add-manifest.patch index 2c5456e..5a38be4 100644 --- a/SOURCES/add-manifest.patch +++ b/SOURCES/add-manifest.patch @@ -6,7 +6,7 @@ diff -up ./MANIFEST.MF.fix ./MANIFEST.MF +Bundle-ManifestVersion: 2 +Bundle-Name: Docker Client +Bundle-SymbolicName: com.spotify.docker.client -+Bundle-Version: 3.1.1.qualifier ++Bundle-Version: 3.1.9.qualifier +Bundle-ActivationPolicy: lazy +Bundle-Vendor: Eclipse Orbit +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/SOURCES/notimeoutresource.patch b/SOURCES/notimeoutresource.patch new file mode 100644 index 0000000..6fbd304 --- /dev/null +++ b/SOURCES/notimeoutresource.patch @@ -0,0 +1,29 @@ +--- src/main/java/com/spotify/docker/client/DefaultDockerClient.java.orig 2015-10-13 22:15:28.000000000 +0100 ++++ src/main/java/com/spotify/docker/client/DefaultDockerClient.java 2016-02-10 19:57:30.637197090 +0000 +@@ -795,7 +795,7 @@ + throws DockerException, InterruptedException, IOException { + checkNotNull(handler, "handler"); + +- WebTarget resource = resource().path("build"); ++ WebTarget resource = noTimeoutResource().path("build"); + + for (final BuildParameter param : params) { + resource = resource.queryParam(param.buildParamName, String.valueOf(param.buildParamValue)); +@@ -885,7 +885,7 @@ + @Override + public LogStream logs(final String containerId, final LogsParameter... params) + throws DockerException, InterruptedException { +- WebTarget resource = resource() ++ WebTarget resource = noTimeoutResource() + .path("containers").path(containerId).path("logs"); + + for (final LogsParameter param : params) { +@@ -909,7 +909,7 @@ + public LogStream attachContainer(final String containerId, + final AttachParameter... params) throws DockerException, + InterruptedException { +- WebTarget resource = resource().path("containers").path(containerId) ++ WebTarget resource = noTimeoutResource().path("containers").path(containerId) + .path("attach"); + + for (final AttachParameter param : params) { diff --git a/SPECS/docker-client.spec b/SPECS/docker-client.spec index a154796..7090e38 100644 --- a/SPECS/docker-client.spec +++ b/SPECS/docker-client.spec @@ -1,10 +1,12 @@ %{?scl:%scl_package docker-client} %{!?scl:%global pkg_name %{name}} - %{?java_common_find_provides_and_requires} + +%global baserelease 3 + Name: %{?scl_prefix}docker-client -Version: 3.1.1 -Release: 1.1%{?dist} +Version: 3.1.9 +Release: 1.%{baserelease}%{?dist} Summary: Docker Client License: ASL 2.0 @@ -14,17 +16,10 @@ Source0: https://github.com/spotify/docker-client/archive/v%{version}.tar Patch0: add-manifest.patch # Apache httpcomponents-core >= 4.4 calls setSoLinger Patch2: %{pkg_name}-so-linger.patch +Patch3: notimeoutresource.patch BuildRequires: %{?scl_prefix_java_common}maven-local -BuildRequires: %{?scl_prefix}tycho >= 0.21.0 -BuildRequires: %{?scl_prefix}tycho-extras -BuildRequires: %{?scl_prefix}aopalliance >= 1.0 -BuildRequires: %{?scl_prefix_java_common}apache-commons-codec BuildRequires: %{?scl_prefix_java_common}apache-commons-compress -BuildRequires: %{?scl_prefix_java_common}apache-commons-logging -BuildRequires: %{?scl_prefix_java_common}atinject -BuildRequires: %{?scl_prefix}base64coder -BuildRequires: %{?scl_prefix}bouncycastle >= 1.50 BuildRequires: %{?scl_prefix}bouncycastle-pkix >= 1.50 BuildRequires: %{?scl_prefix}glassfish-hk2-utils >= 2.4.0-0.4.b24 BuildRequires: %{?scl_prefix}jffi >= 1.2.7 @@ -39,7 +34,6 @@ BuildRequires: %{?scl_prefix}glassfish-hk2-api >= 2.4.0-0.4.b24 BuildRequires: %{?scl_prefix}glassfish-hk2-locator >= 2.4.0-0.4.b24 BuildRequires: %{?scl_prefix}glassfish-jaxb-api >= 2.2.12 BuildRequires: %{?scl_prefix}glassfish-jax-rs-api >= 2.0.1 -BuildRequires: %{?scl_prefix}guava >= 18.0 BuildRequires: %{?scl_prefix}jackson-annotations >= 2.5.0 BuildRequires: %{?scl_prefix}jackson-core >= 2.5.0 BuildRequires: %{?scl_prefix}jackson-databind >= 2.5.0 @@ -47,11 +41,7 @@ BuildRequires: %{?scl_prefix}jackson-datatype-guava >= 2.5.0 BuildRequires: %{?scl_prefix}jackson-jaxrs-json-provider >= 2.5.0 BuildRequires: %{?scl_prefix}jackson-jaxrs-providers >= 2.5.0 BuildRequires: %{?scl_prefix}jackson-module-jaxb-annotations >= 2.5.0 -BuildRequires: %{?scl_prefix}javassist >= 3.18.1 BuildRequires: %{?scl_prefix}jersey >= 2.17 -BuildRequires: %{?scl_prefix_java_common}objectweb-asm5 -BuildRequires: %{?scl_prefix}osgi-resource-locator >= 1.0.1 -BuildRequires: %{?scl_prefix_java_common}slf4j # This is provided by JRE but need it until either # - jackson-module-jaxb-annotations adds Requires to it @@ -64,39 +54,75 @@ BuildArch: noarch The Docker Client is a Java API library for accessing a Docker daemon. %prep - %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %setup -q -n docker-client-%{version} %patch0 %patch2 +%patch3 %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin %pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin - %{?scl:EOF} -%build +%build %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" %mvn_build -j -f - %{?scl:EOF} -%install +%install %{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_install - %{?scl:EOF} + %files -f .mfiles -%doc NOTICE README.md LICENSE +%dir %{_javadir}/docker-client +%dir %{_mavenpomdir}/docker-client +%doc LICENSE +%doc NOTICE README.md %changelog +* Wed Feb 10 2016 Mat Booth - 3.1.9-1.3 +- Add patch to remove timeout for certain API calls + +* Tue Feb 09 2016 Mat Booth - 3.1.9-1.2 +- Fix dependency on commons-compress + +* Fri Feb 05 2016 Mat Booth - 3.1.9-1.1 +- Import latest from Fedora + +* 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 Roland Grunberg - 3.1.1-1.1 - Import latest from Fedora. +* 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. + * Thu Jul 16 2015 Roland Grunberg - 3.0.0-1.2 - Reduce commons-compress requirement to match available version.