From 52cfcbb61cc825291a830f3cb681900e41dbef00 Mon Sep 17 00:00:00 2001 From: ericcitaire Date: Wed, 13 Apr 2022 13:02:06 +0000 Subject: [PATCH] Update docker-java to 3.2.13 --- pom.xml | 18 +++++- .../client/DelegatingDockerClient.java | 55 +++++++++++++++++++ .../org.mockito.plugins.MockMaker | 1 + 3 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/pom.xml b/pom.xml index 4cc9629..4d442b8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ docker-java-api - ${revision}.3-${changelist} + ${revision}-${changelist} hpi Docker API Plugin @@ -24,12 +24,12 @@ - 3.1.5 + 3.2.13 999999-SNAPSHOT 1.609.1 8 UTF-8 - 3.1 + 3.2 @@ -63,6 +63,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-annotations + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider @@ -87,6 +91,14 @@ commons-lang commons-lang + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + diff --git a/src/main/java/io/jenkins/dockerjavaapi/client/DelegatingDockerClient.java b/src/main/java/io/jenkins/dockerjavaapi/client/DelegatingDockerClient.java index d8ee197..79998dc 100644 --- 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 new file mode 100644 index 0000000..1f0955d --- /dev/null +++ b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline