Skip to content

Commit b82bff5

Browse files
authored
Merge pull request #12 from jenkinsci/feature/docker-java-3.2.13
Update docker-java to 3.2.13
2 parents e54af4f + 52cfcbb commit b82bff5

File tree

3 files changed

+71
-3
lines changed

3 files changed

+71
-3
lines changed

pom.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>docker-java-api</artifactId>
12-
<version>${revision}.3-${changelist}</version>
12+
<version>${revision}-${changelist}</version>
1313
<packaging>hpi</packaging>
1414

1515
<name>Docker API Plugin</name>
@@ -24,12 +24,12 @@
2424
</scm>
2525

2626
<properties>
27-
<revision>3.1.5</revision>
27+
<revision>3.2.13</revision>
2828
<changelist>999999-SNAPSHOT</changelist>
2929
<jenkins.version>1.609.1</jenkins.version>
3030
<java.level>8</java.level>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<hpi.compatibleSinceVersion>3.1</hpi.compatibleSinceVersion>
32+
<hpi.compatibleSinceVersion>3.2</hpi.compatibleSinceVersion>
3333
</properties>
3434

3535
<licenses>
@@ -63,6 +63,10 @@
6363
<groupId>com.fasterxml.jackson.core</groupId>
6464
<artifactId>jackson-databind</artifactId>
6565
</exclusion>
66+
<exclusion>
67+
<groupId>com.fasterxml.jackson.core</groupId>
68+
<artifactId>jackson-annotations</artifactId>
69+
</exclusion>
6670
<exclusion>
6771
<groupId>com.fasterxml.jackson.jaxrs</groupId>
6872
<artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -87,6 +91,14 @@
8791
<groupId>commons-lang</groupId>
8892
<artifactId>commons-lang</artifactId>
8993
</exclusion>
94+
<exclusion>
95+
<groupId>org.slf4j</groupId>
96+
<artifactId>slf4j-api</artifactId>
97+
</exclusion>
98+
<exclusion>
99+
<groupId>org.slf4j</groupId>
100+
<artifactId>jcl-over-slf4j</artifactId>
101+
</exclusion>
90102

91103
<!-- disable JAX-RS transport, otherwise, it requires shading and messy stuff -->
92104
<exclusion>

src/main/java/io/jenkins/dockerjavaapi/client/DelegatingDockerClient.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,4 +478,59 @@ public LogSwarmObjectCmd logTaskCmd(String taskId) {
478478
public PruneCmd pruneCmd(PruneType pruneType) {
479479
return interceptAnswer(getDelegate().pruneCmd(pruneType));
480480
}
481+
482+
@Override
483+
public RemoveConfigCmd removeConfigCmd(String configId) {
484+
return interceptAnswer(getDelegate().removeConfigCmd(configId));
485+
}
486+
487+
@Override
488+
public InspectConfigCmd inspectConfigCmd(String configId) {
489+
return interceptAnswer(getDelegate().inspectConfigCmd(configId));
490+
}
491+
492+
@Override
493+
public CreateConfigCmd createConfigCmd() {
494+
return interceptAnswer(getDelegate().createConfigCmd());
495+
}
496+
497+
@Override
498+
public ListConfigsCmd listConfigsCmd() {
499+
return interceptAnswer(getDelegate().listConfigsCmd());
500+
}
501+
502+
@Override
503+
public RemoveSecretCmd removeSecretCmd(String secretId) {
504+
return interceptAnswer(getDelegate().removeSecretCmd(secretId));
505+
}
506+
507+
@Override
508+
public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) {
509+
return interceptAnswer(getDelegate().createSecretCmd(secretSpec));
510+
}
511+
512+
@Override
513+
public ListSecretsCmd listSecretsCmd() {
514+
return interceptAnswer(getDelegate().listSecretsCmd());
515+
}
516+
517+
@Override
518+
public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) {
519+
return interceptAnswer(getDelegate().removeSwarmNodeCmd(swarmNodeId));
520+
}
521+
522+
@Override
523+
public ResizeContainerCmd resizeContainerCmd(String containerId) {
524+
return interceptAnswer(getDelegate().resizeContainerCmd(containerId));
525+
}
526+
527+
@Override
528+
public SaveImagesCmd saveImagesCmd() {
529+
return interceptAnswer(getDelegate().saveImagesCmd());
530+
}
531+
532+
@Override
533+
public ResizeExecCmd resizeExecCmd(String execId) {
534+
return interceptAnswer(getDelegate().resizeExecCmd(execId));
535+
}
481536
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

0 commit comments

Comments
 (0)