You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jf...@apache.org on 2014/03/11 03:08:06 UTC
git commit: Aurora-102: Add failOnVersionConfict() to scheduler build
Repository: incubator-aurora
Updated Branches:
refs/heads/master 172f30124 -> 9642eee84
Aurora-102: Add failOnVersionConfict() to scheduler build
Adds resolution strategy to compile time to detect and fail if any dependency
versions have conflicts.
Testing Done:
ran local build with protobuf dependency set to 2.4.1
FAILURE: Build failed with an exception.
* What went wrong:
Could not resolve all dependencies for configuration ':compile'.
> A conflict was found between the following modules:
- com.google.protobuf:protobuf-java:2.4.1
- com.google.protobuf:protobuf-java:2.5.0
changed to version 2.5.0
BUILD SUCCESSFUL
Bugs closed: AURORA-102
Reviewed at https://reviews.apache.org/r/18926/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/9642eee8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/9642eee8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/9642eee8
Branch: refs/heads/master
Commit: 9642eee84cc9bbcbd62e24c567c66ed686ba1bd8
Parents: 172f301
Author: Jake Farrell <jf...@apache.org>
Authored: Mon Mar 10 22:05:32 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Mon Mar 10 22:05:32 2014 -0400
----------------------------------------------------------------------
build.gradle | 36 ++++++++++++++++----
.../scheduler/log/testing/FileLogTest.java | 2 +-
2 files changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9642eee8/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9b8827e..f38888b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,13 +135,20 @@ jar {
}
dependencies {
+ def jerseyRev = '1.12'
+ def libthriftRev = '0.9.1'
+ def log4jRev = '1.2.17'
+ def slf4jRev = '1.6.1'
+ def junitRev = '4.11'
+
+ def guavaDep = 'com.google.guava:guava:15.0'
+ def thriftLib = "org.apache.thrift:libthrift:${libthriftRev}"
+
compile 'aopalliance:aopalliance:1.0'
compile 'com.google.code.findbugs:jsr305:1.3.9'
- def guavaDep = 'com.google.guava:guava:15.0'
compile guavaDep
compile 'com.google.inject:guice:3.0'
compile 'com.google.protobuf:protobuf-java:2.5.0'
- def jerseyRev = '1.12'
compile "com.sun.jersey:jersey-core:${jerseyRev}"
compile "com.sun.jersey:jersey-json:${jerseyRev}"
compile "com.sun.jersey:jersey-server:${jerseyRev}"
@@ -150,13 +157,11 @@ dependencies {
compile 'commons-lang:commons-lang:2.5'
compile 'javax.inject:javax.inject:1'
compile 'javax.servlet:servlet-api:2.5'
- compile 'log4j:log4j:1.2.17'
+ compile "log4j:log4j:${log4jRev}"
compile 'org.antlr:stringtemplate:3.2.1'
compile 'org.apache.mesos:mesos:0.17.0'
- def thriftLib = 'org.apache.thrift:libthrift:0.9.1'
compile thriftLib
compile 'org.apache.zookeeper:zookeeper:3.3.4'
- def slf4jRev = '1.6.1'
compile "org.slf4j:slf4j-api:${slf4jRev}"
compile "org.slf4j:slf4j-jdk14:${slf4jRev}"
compile 'com.twitter.common.logging:log4j:0.0.4'
@@ -197,12 +202,31 @@ dependencies {
compile 'com.twitter.common:util-testing:0.0.7'
compile 'com.twitter.common:util:0.0.87'
compile 'com.twitter.common:zookeeper-testing:0.0.40'
- testCompile 'junit:junit:4.10'
+
+ testCompile "junit:junit:${junitRev}"
generatedCompile guavaDep
generatedCompile thriftLib
checkstyle 'com.puppycrawl.tools:checkstyle:5.6'
+
+ configurations.compile {
+ resolutionStrategy {
+ failOnVersionConflict()
+
+ def forceDepVersions = [
+ // Force versions based on the dependencies we use from above
+ 'org.slf4j:slf4j-api' : slf4jRev,
+ 'log4j:log4j' : log4jRev,
+ 'org.apache.thrift:libthrift' : libthriftRev,
+ 'junit:junit' : junitRev,
+ // Force versions based on inter-dependency collisions
+ 'org.hamcrest:hamcrest-core' : '1.3',
+ ]
+
+ force forceDepVersions.collect { dep, ver -> "$dep:$ver" }
+ }
+ }
}
checkstyle {
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9642eee8/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
index 50c76df..cc31187 100644
--- a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java
@@ -24,7 +24,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
public class FileLogTest {