From 90a6993d29a5621d877e286aec98c775706fd6b8 Mon Sep 17 00:00:00 2001 From: Jae Gangemi Date: Sat, 25 Jul 2015 20:26:01 -0400 Subject: [PATCH] - removed 'default-value' for 'apiVersion' param, rely on constant if not set Signed-off-by: Jae Gangemi --- .../java/org/jolokia/docker/maven/AbstractDockerMojo.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jolokia/docker/maven/AbstractDockerMojo.java b/src/main/java/org/jolokia/docker/maven/AbstractDockerMojo.java index 4884f358a..f59a76e40 100644 --- a/src/main/java/org/jolokia/docker/maven/AbstractDockerMojo.java +++ b/src/main/java/org/jolokia/docker/maven/AbstractDockerMojo.java @@ -57,7 +57,6 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Context // docker installations. public static final String DOCKER_HTTPS_PORT = "2376"; - // don't forget to change 'apiVersion' default-value as well public static final String API_VERSION = "v1.17"; // Current maven project @@ -92,8 +91,7 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Context */ protected boolean removeVolumes; - // don't forget to change 'API_VERSION' - /** @parameter property = "docker.apiVersion" default-value = "v1.15" */ + /** @parameter property = "docker.apiVersion" */ private String apiVersion; // URL to docker daemon @@ -230,10 +228,10 @@ protected boolean matchesConfiguredImages(String imageList, ImageConfiguration i return imagesAllowed.contains(imageConfig.getName()) || imagesAllowed.contains(imageConfig.getAlias()); } - // visible for testing private DockerAccess createDockerAccess(String baseUrl) throws MojoExecutionException { try { - DockerAccess client = new DockerAccessWithHcClient(apiVersion, baseUrl, + String version = (apiVersion == null) ? API_VERSION : apiVersion; + DockerAccess client = new DockerAccessWithHcClient(version, baseUrl, EnvUtil.getCertPath(certPath), log); client.start();