diff --git a/client/pom.xml b/client/pom.xml index e6706a4..1462c4d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -55,10 +55,6 @@ org.apache.commons commons-compress - - commons-codec - commons-codec - com.squareup.okhttp3 okhttp diff --git a/client/src/main/java/io/fabric8/docker/client/Config.java b/client/src/main/java/io/fabric8/docker/client/Config.java index f4e9c83..9bd1ee6 100644 --- a/client/src/main/java/io/fabric8/docker/client/Config.java +++ b/client/src/main/java/io/fabric8/docker/client/Config.java @@ -28,7 +28,6 @@ import io.fabric8.docker.client.utils.Utils; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.Inline; -import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +39,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.xml.bind.DatatypeConverter; import static io.fabric8.docker.client.utils.Utils.getSystemPropertyOrEnvVar; import static io.fabric8.docker.client.utils.Utils.hasSystemPropertyOrEnvVar; @@ -225,8 +225,7 @@ private boolean tryDockerConfig(Config config) { String serverAddress = entry.getKey(); AuthConfig authConfig = entry.getValue(); if (authConfig.getAuth() != null) { - String auth = new String(Base64.decodeBase64(authConfig.getAuth().getBytes(UTF_8)), UTF_8); - Matcher m = AUTH_PATTERN.matcher(auth); + Matcher m = AUTH_PATTERN.matcher(DatatypeConverter.printBase64Binary(authConfig.getAuth().getBytes(UTF_8))); if (m.matches()) { String username = m.group(USERNAME_LABEL); String password = m.group(PASSWORD_LABEL); diff --git a/client/src/main/java/io/fabric8/docker/client/impl/BuildImage.java b/client/src/main/java/io/fabric8/docker/client/impl/BuildImage.java index e94ef11..ccf8951 100644 --- a/client/src/main/java/io/fabric8/docker/client/impl/BuildImage.java +++ b/client/src/main/java/io/fabric8/docker/client/impl/BuildImage.java @@ -55,10 +55,10 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.xml.bind.DatatypeConverter; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; @@ -261,7 +261,7 @@ public OutputHandle fromTar(String path) { RequestBody body = RequestBody.create(MEDIA_TYPE_TAR, new File(path)); Request request = new Request.Builder() - .header("X-Registry-Config", new String(Base64.encodeBase64(JSON_MAPPER.writeValueAsString(config.getAuthConfigs()).getBytes("UTF-8")), "UTF-8")) + .header("X-Registry-Config", DatatypeConverter.printBase64Binary(JSON_MAPPER.writeValueAsString(config.getAuthConfigs()).getBytes("UTF-8"))) .post(body) .url(sb.toString()).build(); diff --git a/client/src/main/java/io/fabric8/docker/client/impl/ImportImage.java b/client/src/main/java/io/fabric8/docker/client/impl/ImportImage.java index 6635cfb..9d00fef 100644 --- a/client/src/main/java/io/fabric8/docker/client/impl/ImportImage.java +++ b/client/src/main/java/io/fabric8/docker/client/impl/ImportImage.java @@ -31,11 +31,11 @@ import io.fabric8.docker.dsl.image.RedirectingWritingOutputTagAsRepoInterface; import io.fabric8.docker.dsl.image.TagAsRepoInterface; import io.fabric8.docker.dsl.image.UsingListenerRedirectingWritingOutputTagAsRepoInterface; -import org.apache.commons.codec.binary.Base64; import java.io.OutputStream; import java.io.PipedOutputStream; import java.util.concurrent.TimeUnit; +import javax.xml.bind.DatatypeConverter; public class ImportImage extends BaseImageOperation implements UsingListenerRedirectingWritingOutputTagAsRepoInterface, @@ -72,7 +72,7 @@ public OutputHandle asRepo(String src) { } AuthConfig authConfig = RegistryUtils.getConfigForImage(name, config); Request request = new Request.Builder() - .header("X-Registry-Auth", new String(Base64.encodeBase64(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8")), "UTF-8")) + .header("X-Registry-Auth", DatatypeConverter.printBase64Binary(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8"))) .post(RequestBody.create(MEDIA_TYPE_TEXT, EMPTY)) .url(sb.toString()).build(); diff --git a/client/src/main/java/io/fabric8/docker/client/impl/PullImage.java b/client/src/main/java/io/fabric8/docker/client/impl/PullImage.java index e2629bf..087897c 100644 --- a/client/src/main/java/io/fabric8/docker/client/impl/PullImage.java +++ b/client/src/main/java/io/fabric8/docker/client/impl/PullImage.java @@ -31,11 +31,11 @@ import io.fabric8.docker.dsl.image.RedirectingWritingOutputTagFromRegistryInterface; import io.fabric8.docker.dsl.image.TagFromRegistryInterface; import io.fabric8.docker.dsl.image.UsingListenerRedirectingWritingOutputTagFromRegistryInterface; -import org.apache.commons.codec.binary.Base64; import java.io.OutputStream; import java.io.PipedOutputStream; import java.util.concurrent.TimeUnit; +import javax.xml.bind.DatatypeConverter; public class PullImage extends BaseImageOperation implements UsingListenerRedirectingWritingOutputTagFromRegistryInterface, @@ -96,7 +96,7 @@ public OutputHandle fromRegistry() { AuthConfig authConfig = RegistryUtils.getConfigForImage(name, config); Request request = new Request.Builder() - .header("X-Registry-Auth", new String(Base64.encodeBase64(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8")), "UTF-8")) + .header("X-Registry-Auth", DatatypeConverter.printBase64Binary(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8"))) .post(RequestBody.create(MEDIA_TYPE_TEXT, EMPTY)) .url(sb.toString()).build(); diff --git a/client/src/main/java/io/fabric8/docker/client/impl/PushImage.java b/client/src/main/java/io/fabric8/docker/client/impl/PushImage.java index 08862f4..be2b69f 100644 --- a/client/src/main/java/io/fabric8/docker/client/impl/PushImage.java +++ b/client/src/main/java/io/fabric8/docker/client/impl/PushImage.java @@ -32,11 +32,11 @@ import io.fabric8.docker.dsl.image.TagForceToRegistryInterface; import io.fabric8.docker.dsl.image.ToRegistryInterface; import io.fabric8.docker.dsl.image.UsingListenerRedirectingWritingOutputTagForceToRegistryInterface; -import org.apache.commons.codec.binary.Base64; import java.io.OutputStream; import java.io.PipedOutputStream; import java.util.concurrent.TimeUnit; +import javax.xml.bind.DatatypeConverter; public class PushImage extends BaseImageOperation implements UsingListenerRedirectingWritingOutputTagForceToRegistryInterface, @@ -77,7 +77,7 @@ public OutputHandle toRegistry() { AuthConfig authConfig = RegistryUtils.getConfigForImage(name, config); RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, "{}"); Request request = new Request.Builder() - .header("X-Registry-Auth", new String(Base64.encodeBase64(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8")), "UTF-8")) + .header("X-Registry-Auth", DatatypeConverter.printBase64Binary(JSON_MAPPER.writeValueAsString(authConfig != null ? authConfig : new AuthConfig()).getBytes("UTF-8"))) .post(body) .url(sb.toString()).build(); diff --git a/platforms/karaf/features/src/main/resources/feature.xml b/platforms/karaf/features/src/main/resources/feature.xml index 8136310..87a1195 100644 --- a/platforms/karaf/features/src/main/resources/feature.xml +++ b/platforms/karaf/features/src/main/resources/feature.xml @@ -25,7 +25,6 @@ mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version} mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} - mvn:commons-codec/commons-codec/${commons-codec.version} mvn:org.apache.commons/commons-compress/${commons-compress.version} mvn:org.ow2.asm/asm/${asm.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version} @@ -36,4 +35,4 @@ mvn:io.fabric8/docker-client/${project.version}/jar/bundle - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 3d76f8b..cea12a7 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ UTF-8 - 1.10 1.9 3.2 1.9.8 @@ -144,11 +143,6 @@ - - commons-codec - commons-codec - ${commons-codec.version} - org.apache.commons commons-compress