From b3936a215939756c53418518e03a12351f2f0f52 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Thu, 30 Mar 2017 20:59:50 +0100 Subject: [PATCH] Exclude commons-logging for all projects at top level. (#473) --- build.gradle | 6 ++++++ core/build.gradle | 6 ------ node-api/build.gradle | 6 ------ node/build.gradle | 4 ---- test-utils/build.gradle | 6 ------ verifier/build.gradle | 6 ------ 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 8cbb168b6f..aba4fd6e3c 100644 --- a/build.gradle +++ b/build.gradle @@ -106,6 +106,12 @@ allprojects { } maven { url 'https://jitpack.io' } } + + configurations.compile { + // We want to use SLF4J's version of these bindings: jcl-over-slf4j + // Remove any transitive dependency on Apache's version. + exclude group: 'commons-logging', module: 'commons-logging' + } } // Check that we are running on a Java 8 JDK. The source/targetCompatibility values above aren't sufficient to diff --git a/core/build.gradle b/core/build.gradle index cda93dfc3c..bdf5f70dde 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -88,12 +88,6 @@ dependencies { } configurations { - compile { - // We want to use SLF4J's version of these binding: jcl-over-slf4j - // Remove any transitive dependency on Apache's version. - exclude group: 'commons-logging', module: 'commons-logging' - } - testArtifacts.extendsFrom testRuntime } diff --git a/node-api/build.gradle b/node-api/build.gradle index b13820e6c2..00803ed047 100644 --- a/node-api/build.gradle +++ b/node-api/build.gradle @@ -39,9 +39,3 @@ dependencies { // TypeSafe Config: for simple and human friendly config files. compile "com.typesafe:config:$typesafe_config_version" } - -configurations.compile { - // We want to use SLF4J's version of these binding: jcl-over-slf4j - // Remove any transitive dependency on Apache's version. - exclude group: 'commons-logging', module: 'commons-logging' -} diff --git a/node/build.gradle b/node/build.gradle index 2fb317498d..17ede82ba4 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -14,10 +14,6 @@ configurations { // We don't need these because we already include netty-all. exclude group: 'io.netty', module: 'netty-transport' exclude group: 'io.netty', module: 'netty-handler' - - // We want to use SLF4J's version of these bindings: jcl-over-slf4j - // Remove any transitive dependency on Apache's version. - exclude group: 'commons-logging', module: 'commons-logging' } testCompile { diff --git a/test-utils/build.gradle b/test-utils/build.gradle index fb27cd22bf..59707671ad 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -32,9 +32,3 @@ dependencies { // OkHTTP: Simple HTTP library. compile "com.squareup.okhttp3:okhttp:$okhttp_version" } - -configurations.compile { - // We want to use SLF4J's version of these bindings: jcl-over-slf4j - // Remove any transitive dependency on Apache's version. - exclude group: 'commons-logging', module: 'commons-logging' -} diff --git a/verifier/build.gradle b/verifier/build.gradle index 28ce49d2bb..862db49c7e 100644 --- a/verifier/build.gradle +++ b/verifier/build.gradle @@ -51,12 +51,6 @@ dependencies { integrationTestCompile "org.apache.activemq:artemis-server:${artemis_version}" } -configurations.compile { - // We want to use SLF4J's version of these bindings: jcl-over-slf4j - // Remove any transitive dependency on Apache's version. - exclude group: 'commons-logging', module: 'commons-logging' -} - task standaloneJar(type: Jar) { // Create a fat jar by packing all deps into the output from {