aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Fix for multiple slf4j jars in intellij
Date Wed, 06 Dec 2017 04:47:21 GMT
Repository: aurora
Updated Branches:
  refs/heads/master a0628efd1 -> e74fb3240


Fix for multiple slf4j jars in intellij

Testing Done:
`./gradlew idea`, 'External Libraries' no longer has rogue slf4j jars, and
tests don't fail as a result.

Reviewed at https://reviews.apache.org/r/64359/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/e74fb324
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/e74fb324
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/e74fb324

Branch: refs/heads/master
Commit: e74fb32403794e96612e29fb1313d9f7fe53578e
Parents: a0628ef
Author: Bill Farner <wfarner@apache.org>
Authored: Tue Dec 5 20:47:18 2017 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Dec 5 20:47:18 2017 -0800

----------------------------------------------------------------------
 build.gradle | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/e74fb324/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index af11991..fd606a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,31 +95,30 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169
   ext.thriftRev = '0.9.1'
   ext.zookeeperRev = '3.4.8'
 
-  configurations {
-    compile {
-      exclude module: 'junit-dep'
-      // We use logback, so we do not want to pull in log4j artifacts.
-      exclude module: 'log4j'
-      exclude module: 'slf4j-log4j12'
-
-      // ResolutionStrategy needs to be set in the allprojects block otherwise dependent
projects
-      // will not inherit it. Note that dependencies still need to be specified in a dependencies
-      // block - this only affects strategy.
-      // See http://forums.gradle.org/gradle/topics/shouldnt-resolutionstrategy-affect-depending-projects-transitive-dependencies
-      resolutionStrategy {
-        failOnVersionConflict()
-        force "com.fasterxml.jackson.core:jackson-annotations:${jacksonRev}"
-        force "com.fasterxml.jackson.core:jackson-core:${jacksonRev}"
-        force "com.google.code.gson:gson:${gsonRev}"
-        force "com.google.guava:guava:${guavaRev}"
-        force "com.google.protobuf:protobuf-java:${protobufRev}"
-        force "io.netty:netty-handler:${nettyRev}"
-        force "junit:junit:${junitRev}"
-        force "org.apache.thrift:libthrift:${thriftRev}"
-        force "org.apache.zookeeper:zookeeper:${zookeeperRev}"
-        force "org.hamcrest:hamcrest-core:1.3"
-        force "org.slf4j:slf4j-api:${slf4jRev}"
-      }
+  configurations.all {
+    exclude module: 'junit-dep'
+    // We use logback, so we do not want to pull in log4j artifacts.
+    exclude module: 'log4j'
+    exclude module: 'slf4j-log4j12'
+
+    // ResolutionStrategy needs to be set in the allprojects block otherwise dependent projects
+    // will not inherit it. Note that dependencies still need to be specified in a dependencies
+    // block - this only affects strategy.
+    // See http://forums.gradle.org/gradle/topics/shouldnt-resolutionstrategy-affect-depending-projects-transitive-dependencies
+    resolutionStrategy {
+      failOnVersionConflict()
+      force "com.fasterxml.jackson.core:jackson-annotations:${jacksonRev}"
+      force "com.fasterxml.jackson.core:jackson-core:${jacksonRev}"
+      force "com.google.code.gson:gson:${gsonRev}"
+      force "com.google.guava:guava:${guavaRev}"
+      force "com.google.protobuf:protobuf-java:${protobufRev}"
+      force "io.netty:netty-handler:${nettyRev}"
+      force "junit:junit:${junitRev}"
+      force "org.apache.thrift:libthrift:${thriftRev}"
+      force "org.apache.zookeeper:zookeeper:${zookeeperRev}"
+      force "org.hamcrest:hamcrest-core:1.3"
+      force 'org.objenesis:objenesis:2.2'
+      force "org.slf4j:slf4j-api:${slf4jRev}"
     }
   }
 }


Mime
View raw message