diff --git a/pom.xml b/pom.xml index 2d0116531..3ae2e1f82 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 2015-01-27T15-02-14 - 1.0.1 + 1.1.0 5.12.1 1.3 1.6 @@ -143,11 +143,11 @@ ${slf4j-api.version} - - org.slf4j - jul-to-slf4j - ${slf4j-api.version} - + + + + + org.bouncycastle diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java index 744f0c63c..78cd8427c 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java +++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java @@ -4,7 +4,9 @@ import java.io.IOException; import java.net.URI; -import java.util.logging.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.net.ssl.SSLContext; import javax.ws.rs.client.Client; @@ -65,7 +67,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory { - private static final Logger LOGGER = Logger.getLogger(DockerCmdExecFactoryImpl.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName()); private Client client; private WebTarget baseResource; diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java index 9679f230a..eda72b835 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/util/LoggingFilter.java @@ -53,7 +53,9 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicLong; -import java.util.logging.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.ClientRequestContext; @@ -68,7 +70,6 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptorContext; - import javax.annotation.Priority; @@ -86,7 +87,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter, ClientResponseFilter, WriterInterceptor { - private static final Logger LOGGER = Logger.getLogger(LoggingFilter.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(LoggingFilter.class.getName()); private static final String NOTIFICATION_PREFIX = "* "; private static final String REQUEST_PREFIX = "> "; private static final String RESPONSE_PREFIX = "< "; @@ -150,7 +151,7 @@ public LoggingFilter(final Logger logger, final int maxEntitySize) { private void log(final StringBuilder b) { if (logger != null) { - logger.info(b.toString()); + logger.debug(b.toString()); } } diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java index 9c577fd54..6771ebe88 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/util/SelectiveLoggingFilter.java @@ -4,12 +4,13 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import java.util.logging.Logger; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; +import org.slf4j.Logger; + /** * A version of the logging filter that will avoid trying to log entities which can cause diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java index 71bfb9304..f5519283c 100644 --- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java +++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java @@ -39,6 +39,8 @@ public abstract class AbstractDockerClientTest extends Assert { protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory()); public void beforeTest() { + + LOG.info("======================= BEFORETEST ======================="); LOG.info("Connecting to Docker server"); dockerClient = DockerClientBuilder.getInstance(config()) diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 318af2861..bdb0ee75a 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -6,10 +6,10 @@ - - + + - +