diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index da995d62d4..5bab0db9ee 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -94,10 +94,16 @@ org.jclouds.driver - jclouds-log4j + jclouds-slf4j ${project.version} test + + ch.qos.logback + logback-classic + 1.0.0 + test + diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java index 10fcc168a6..6a3ea0a3a0 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java @@ -59,7 +59,7 @@ import org.jclouds.compute.domain.Template; import org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials; import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate; import org.jclouds.domain.Credentials; -import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; import org.jclouds.predicates.RetryablePredicate; import org.jclouds.rest.annotations.Identity; import org.testng.annotations.AfterGroups; @@ -135,7 +135,7 @@ public class CloudStackComputeServiceAdapterLiveTest extends BaseCloudStackClien return CacheBuilder.newBuilder().build(getIPForwardingRule); } }; - adapter = Guice.createInjector(module, new Log4JLoggingModule()).getInstance( + adapter = Guice.createInjector(module, new SLF4JLoggingModule()).getInstance( CloudStackComputeServiceAdapter.class); keyPairName = prefix + "-adapter-test-keypair"; diff --git a/apis/cloudstack/src/test/resources/log4j.xml b/apis/cloudstack/src/test/resources/log4j.xml deleted file mode 100644 index 9d2dd7db2f..0000000000 --- a/apis/cloudstack/src/test/resources/log4j.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -