Merge pull request #12 from jenkinsci/feature/docker-java-3.2.13

Update docker-java to 3.2.13
jenkinsci · Apr 19, 2022 · b82bff5 · b82bff5
2 parents e54af4f + 52cfcbb
commit b82bff5
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>docker-java-api</artifactId>
-    <version>${revision}.3-${changelist}</version>
+    <version>${revision}-${changelist}</version>
     <packaging>hpi</packaging>
 
     <name>Docker API Plugin</name>
@@ -24,12 +24,12 @@
     </scm>
 
     <properties>
-        <revision>3.1.5</revision>
+        <revision>3.2.13</revision>
         <changelist>999999-SNAPSHOT</changelist>
         <jenkins.version>1.609.1</jenkins.version>
         <java.level>8</java.level>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hpi.compatibleSinceVersion>3.1</hpi.compatibleSinceVersion>
+        <hpi.compatibleSinceVersion>3.2</hpi.compatibleSinceVersion>
     </properties>
 
     <licenses>
@@ -63,6 +63,10 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.jaxrs</groupId>
                     <artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -87,6 +91,14 @@
                     <groupId>commons-lang</groupId>
                     <artifactId>commons-lang</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
 
                 <!-- disable JAX-RS transport, otherwise, it requires shading and messy stuff -->
                 <exclusion>

diff --git a/src/main/java/io/jenkins/dockerjavaapi/client/DelegatingDockerClient.java b/src/main/java/io/jenkins/dockerjavaapi/client/DelegatingDockerClient.java
@@ -478,4 +478,59 @@ public LogSwarmObjectCmd logTaskCmd(String taskId) {
     public PruneCmd pruneCmd(PruneType pruneType) {
         return interceptAnswer(getDelegate().pruneCmd(pruneType));
     }
+
+    @Override
+    public RemoveConfigCmd removeConfigCmd(String configId) {
+        return interceptAnswer(getDelegate().removeConfigCmd(configId));
+    }
+
+    @Override
+    public InspectConfigCmd inspectConfigCmd(String configId) {
+        return interceptAnswer(getDelegate().inspectConfigCmd(configId));
+    }
+
+    @Override
+    public CreateConfigCmd createConfigCmd() {
+        return interceptAnswer(getDelegate().createConfigCmd());
+    }
+
+    @Override
+    public ListConfigsCmd listConfigsCmd() {
+        return interceptAnswer(getDelegate().listConfigsCmd());
+    }
+
+    @Override
+    public RemoveSecretCmd removeSecretCmd(String secretId) {
+        return interceptAnswer(getDelegate().removeSecretCmd(secretId));
+    }
+
+    @Override
+    public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) {
+        return interceptAnswer(getDelegate().createSecretCmd(secretSpec));
+    }
+
+    @Override
+    public ListSecretsCmd listSecretsCmd() {
+        return interceptAnswer(getDelegate().listSecretsCmd());
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) {
+        return interceptAnswer(getDelegate().removeSwarmNodeCmd(swarmNodeId));
+    }
+
+    @Override
+    public ResizeContainerCmd resizeContainerCmd(String containerId) {
+        return interceptAnswer(getDelegate().resizeContainerCmd(containerId));
+    }
+
+    @Override
+    public SaveImagesCmd saveImagesCmd() {
+        return interceptAnswer(getDelegate().saveImagesCmd());
+    }
+
+    @Override
+    public ResizeExecCmd resizeExecCmd(String execId) {
+        return interceptAnswer(getDelegate().resizeExecCmd(execId));
+    }
 }
diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline