From 0f750f141d75efa0801b05d89bafa7ea9cddc648 Mon Sep 17 00:00:00 2001 From: Brice Thomas Date: Tue, 26 Jul 2016 23:45:41 +0200 Subject: [PATCH 1/2] Support Docker Swarm way to indicate successful pull --- .../com/github/dockerjava/api/model/PullResponseItem.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 90b3ee3367..281ca8c26b 100644 --- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -18,6 +18,8 @@ public class PullResponseItem extends ResponseItem { private static final String IMAGE_UP_TO_DATE = "Image is up to date"; private static final String DOWNLOAD_COMPLETE = "Download complete"; + + private static final String DOWNLOADED = "downloaded"; /** * Returns whether the status indicates a successful pull operation @@ -31,6 +33,7 @@ public boolean isPullSuccessIndicated() { } return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE) - || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY)); + || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY) + || getStatus().contains(DOWNLOADED)); } } From afa9634d2ab36f83655f70cce8ef5a3238721267 Mon Sep 17 00:00:00 2001 From: Brice Thomas Date: Fri, 10 Mar 2017 11:24:03 +0100 Subject: [PATCH 2/2] Update pom.xml to add fat jar building --- pom.xml | 29 ++++++++++++++++++- .../api/model/PullResponseItem.java | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bc1970e660..579ce0ad0c 100644 --- a/pom.xml +++ b/pom.xml @@ -368,6 +368,33 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 2.4.1 + + + + jar-with-dependencies + + + + + + + + + + + make-assembly + + package + + single + + + + org.sonatype.plugins nexus-staging-maven-plugin @@ -482,7 +509,7 @@ true true false - src/test/resources/checkstyle/checkstyle-config.xml diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 281ca8c26b..e937ec4975 100644 --- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -18,7 +18,7 @@ public class PullResponseItem extends ResponseItem { private static final String IMAGE_UP_TO_DATE = "Image is up to date"; private static final String DOWNLOAD_COMPLETE = "Download complete"; - + private static final String DOWNLOADED = "downloaded"; /**