You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2014/11/26 02:49:45 UTC
incubator-aurora git commit: Fix resolutionStrategy to be global.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 91b8d1934 -> ae4d70fc7
Fix resolutionStrategy to be global.
Testing Done:
./gradlew -Pq build
Reviewed at https://reviews.apache.org/r/28460/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/ae4d70fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/ae4d70fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/ae4d70fc
Branch: refs/heads/master
Commit: ae4d70fc74730209aa3bc61c833c3ac87f980ef3
Parents: 91b8d19
Author: Kevin Sweeney <ke...@apache.org>
Authored: Tue Nov 25 17:49:26 2014 -0800
Committer: Kevin Sweeney <ke...@apache.org>
Committed: Tue Nov 25 17:49:26 2014 -0800
----------------------------------------------------------------------
build.gradle | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ae4d70fc/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index f1a3171..fb729c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,20 +66,30 @@ allprojects {
}
}
- ext.slf4jRev = '1.6.6'
- def slf4jApiDep = "org.slf4j:slf4j-api:${slf4jRev}"
- dependencies {
- compile slf4jApiDep
- }
+ ext.junitRev = '4.11'
+ ext.log4jRev = '1.2.17'
ext.gsonRev = '2.2.4'
ext.guavaRev = '16.0'
+ ext.slf4jRev = '1.6.6'
ext.thriftRev = '0.9.1'
configurations {
compile {
+ exclude module: 'junit-dep'
+ // 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 slf4jApiDep
+ force "org.slf4j:slf4j-api:${slf4jRev}"
+ force "com.google.code.gson:gson:${gsonRev}"
+ force "log4j:log4j:${log4jRev}"
+ force "junit:junit:${junitRev}"
+ // Force versions based on inter-dependency collisions
+ force "org.hamcrest:hamcrest-core:1.3"
+ force "org.apache.thrift:libthrift:${thriftRev}"
+ force "org.slf4j:slf4j-jdk14:${slf4jRev}"
}
}
}
@@ -213,8 +223,6 @@ sourceSets {
dependencies {
def guiceRev = '3.0'
def jerseyRev = '1.18.1'
- def log4jRev = '1.2.17'
- def junitRev = '4.11'
def gsonDep = "com.google.code.gson:gson:${gsonRev}"
def guavaDep = "com.google.guava:guava:${guavaRev}"
@@ -286,21 +294,6 @@ dependencies {
testCompile "junit:junit:${junitRev}"
configurations.compile {
- exclude module: 'junit-dep'
- resolutionStrategy {
- def forceDepVersions = [
- // Force versions based on the dependencies we use from above
- 'com.google.code.gson:gson': '2.2.4',
- 'log4j:log4j' : log4jRev,
- 'junit:junit' : junitRev,
- // Force versions based on inter-dependency collisions
- 'org.hamcrest:hamcrest-core' : '1.3',
- 'org.apache.thrift:libthrift': thriftRev,
- 'org.slf4j:slf4j-jdk14': slf4jRev,
- ]
-
- force forceDepVersions.collect { dep, ver -> "$dep:$ver" }
- }
}
}