From f45510381a848e6db54ba5b136e24150ecd00001 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 16 2017 17:10:17 +0000 Subject: Update to docker-client 6.2.5 Remove SCL macros forbidden in Fedora --- diff --git a/add-manifest.patch b/add-manifest.patch deleted file mode 100644 index f396714..0000000 --- a/add-manifest.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -up ./MANIFEST.MF.fix ./MANIFEST.MF ---- ./MANIFEST.MF.fix 2015-06-08 16:40:00.000000000 -0400 -+++ ./MANIFEST.MF 2015-06-08 16:40:33.000000000 -0400 -@@ -0,0 +1,51 @@ -+Manifest-Version: 1.0 -+Bundle-ManifestVersion: 2 -+Bundle-Name: Docker Client -+Bundle-SymbolicName: com.spotify.docker.client -+Bundle-Version: 4.0.6 -+Bundle-ActivationPolicy: lazy -+Bundle-Vendor: Eclipse Orbit -+Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -+Bundle-Localization: plugin -+Export-Package: com.spotify.docker.client, -+ com.spotify.docker.client.exceptions, -+ com.spotify.docker.client.messages -+Import-Package: com.fasterxml.jackson.annotation;version="2.2.3", -+ com.fasterxml.jackson.core;version="2.2.3", -+ com.fasterxml.jackson.databind;version="2.2.3", -+ com.fasterxml.jackson.databind.module;version="2.2.3", -+ com.fasterxml.jackson.databind.node;version="2.2.3", -+ com.fasterxml.jackson.databind.util;version="2.2.3", -+ com.fasterxml.jackson.datatype.guava;version="2.2.3", -+ com.google.common.base;version="15.0.0", -+ com.google.common.collect;version="15.0.0", -+ com.google.common.io;version="15.0.0", -+ com.google.common.net;version="15.0.0", -+ javax.net.ssl, -+ javax.ws.rs;version="2.0.1", -+ javax.ws.rs.client;version="2.0.1", -+ javax.ws.rs.core;version="2.0.1", -+ javax.ws.rs.ext;version="2.0.1", -+ jnr.unixsocket;version="0.4.0", -+ org.apache.commons.compress.archivers;version="1.6.0", -+ org.apache.commons.compress.archivers.tar;version="1.6.0", -+ org.apache.commons.compress.compressors.gzip;version="1.6.0", -+ org.apache.http;version="4.3.2", -+ org.apache.http.client.config;version="4.3.5", -+ org.apache.http.client.methods;version="4.3.5", -+ org.apache.http.config;version="4.3.2", -+ org.apache.http.conn;version="4.3.4", -+ org.apache.http.conn.socket;version="4.3.5", -+ org.apache.http.conn.ssl;version="4.3.5", -+ org.apache.http.impl.conn;version="4.3.5", -+ org.apache.http.protocol;version="4.3.2", -+ org.bouncycastle.asn1.pkcs, -+ org.bouncycastle.openssl, -+ org.glassfish.hk2.api;version="2.3.0", -+ org.glassfish.jersey.apache.connector, -+ org.glassfish.jersey.client;version="2.13.0", -+ org.glassfish.jersey.client.spi;version="2.13.0", -+ org.glassfish.jersey.internal.util;version="2.13.0", -+ org.glassfish.jersey.jackson;version="2.13.0", -+ org.slf4j;version="1.7.2" -+Require-Bundle: org.glassfish.hk2.locator;bundle-version="2.3.0" -diff -up ./pom.xml.fix ./pom.xml ---- ./pom.xml.fix 2015-06-08 16:37:22.000000000 -0400 -+++ ./pom.xml 2015-06-08 16:39:49.000000000 -0400 -@@ -225,6 +225,17 @@ - - - -+ -+ -+ org.apache.maven.plugins -+ maven-jar-plugin -+ -+ -+ MANIFEST.MF -+ -+ -+ -+ - - org.apache.maven.plugins - maven-source-plugin diff --git a/docker-client.spec b/docker-client.spec index 7530b8b..aead277 100644 --- a/docker-client.spec +++ b/docker-client.spec @@ -1,50 +1,34 @@ -%{?scl:%scl_package docker-client} -%{!?scl:%global pkg_name %{name}} - -Name: %{?scl_prefix}docker-client -Version: 4.0.6 -Release: 5%{?dist} +Name: docker-client +Version: 6.2.5 +Release: 1%{?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 -Patch0: add-manifest.patch -Patch1: httpcomponents-annotations.patch - -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: %{?scl_prefix}apache-commons-compress >= 1.9 -BuildRequires: %{?scl_prefix}bouncycastle-pkix >= 1.50 -BuildRequires: %{?scl_prefix}glassfish-hk2-utils >= 2.4.0-0.4.b24 -BuildRequires: %{?scl_prefix}jnr-unixsocket >= 0.2 -BuildRequires: %{?scl_prefix}glassfish-annotation-api >= 1.2 -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}jackson-annotations >= 2.5.0 -BuildRequires: %{?scl_prefix}jackson-core >= 2.5.0 -BuildRequires: %{?scl_prefix}jackson-databind >= 2.5.0 -BuildRequires: %{?scl_prefix}jackson-dataformat-yaml >= 2.5.0 -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}jersey >= 2.17 +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) +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: %{?scl_prefix}glassfish-jaxb-api >= 2.2.12 - -# API change in httpcomponents makes this version important -%if 0%{fedora} >= 25 -Requires: httpcomponents-core >= 4.4.5 -%endif +Requires: glassfish-jaxb-api >= 2.2.12 BuildArch: noarch @@ -53,15 +37,37 @@ The Docker Client is a Java API library for accessing a Docker daemon. %prep %setup -q -n docker-client-%{version} -%patch0 -%if 0%{fedora} >= 25 -%patch1 -%endif -%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 + +# 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 @@ -73,6 +79,10 @@ The Docker Client is a Java API library for accessing a Docker daemon. %doc NOTICE README.md %changelog +* 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 diff --git a/httpcomponents-annotations.patch b/httpcomponents-annotations.patch deleted file mode 100644 index 02cc1f9..0000000 --- a/httpcomponents-annotations.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/main/java/com/spotify/docker/client/UnixConnectionSocketFactory.java.orig 2016-06-30 10:15:02.960534825 +0100 -+++ src/main/java/com/spotify/docker/client/UnixConnectionSocketFactory.java 2016-06-30 10:16:21.198595135 +0100 -@@ -18,7 +18,8 @@ - package com.spotify.docker.client; - - import org.apache.http.HttpHost; --import org.apache.http.annotation.Immutable; -+import org.apache.http.annotation.Contract; -+import org.apache.http.annotation.ThreadingBehavior; - import org.apache.http.conn.ConnectTimeoutException; - import org.apache.http.conn.socket.ConnectionSocketFactory; - import org.apache.http.protocol.HttpContext; -@@ -35,7 +36,7 @@ - /** - * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets. - */ --@Immutable -+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) - public class UnixConnectionSocketFactory implements ConnectionSocketFactory { - - private File socketFile; diff --git a/sources b/sources index 7070aba..2133d2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6df789a4f3a085dede7df3a14ebcdd1 v4.0.6.tar.gz +SHA512 (v6.2.5.tar.gz) = 46bf6ddba0435aee5c324893db26a18e3ffc01706d8fffdc34b83b71aa1307addc4e6a2d15e8fe71c67273d9826abba4663c8850d131fb98237a15a7fd57b86e