Consolidate versions control (#26)

.travis.yml

@@ -29,8 +29,6 @@ cache:
   - $HOME/.thrift-build
 
 before_install:
-- apt-cache madison docker-engine
-- sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION}
 - docker version
 - sudo rm /usr/local/bin/docker-compose
 - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname
@@ -41,7 +39,7 @@ before_install:
 - bash travis/install-thrift.sh
 
 script:
-- make test
+- make clean test
 - make crossdock-fresh
 
 after_success:

build.gradle

@@ -7,21 +7,22 @@ plugins {
 }
 
 
+ext.opentracingVersion = '0.2.0'
 ext.guavaVersion = '18.0'
 ext.apacheThriftVersion = '0.9.3'
-ext.mavenThriftPluginVersion = '0.1.11'
-ext.opentracingVersion = '0.2.0'
 ext.jerseyVersion = '2.22.2'
-ext.mockitoVersion = '1.10.19'
-ext.powermockVersion = '1.6.4'
-ext.slf4jVersion = '1.7.12'
+ext.slf4jVersion = '1.7.16'
+ext.jacksonVersion = '2.7.4'
 
+ext.junitVersion = '4.12'
+ext.mockitoVersion = '2.0.2-beta'
+ext.powermockVersion = '1.6.4'
 
 allprojects {
     apply plugin: 'idea' // intellij support
 
     group = 'com.uber.jaeger'
-    version = '0.5.0'
+    version = '0.5.1-SNAPSHOT'
 
     task wrapper(type: Wrapper) {
         gradleVersion = '2.12' //version required

jaeger-context/build.gradle

@@ -4,11 +4,11 @@ apply plugin: 'com.github.kt3k.coveralls'
 description = 'A library for thread-local context and utility methods for propagating spans across thread boundaries'
 
 dependencies {
-    compile group: 'io.opentracing', name: 'opentracing-api', version: '0.2.0'
+    compile group: 'io.opentracing', name: 'opentracing-api', version: opentracingVersion
 
     // Testing Frameworks
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '2.0.2-beta'
+    testCompile group: 'junit', name: 'junit', version: junitVersion
+    testCompile group: 'org.mockito', name: 'mockito-all', version: mockitoVersion
 }
 
 jacocoTestReport {

jaeger-core/build.gradle

@@ -5,14 +5,11 @@ apply plugin: 'com.github.kt3k.coveralls'
 description = 'Core library for jaeger-client'
 
 dependencies {
-    //compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.8'
-    //testCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.8'
-
-    compile group: 'io.opentracing', name: 'opentracing-api', version: '0.2.0'
-    compile group: 'org.apache.thrift', name: 'libthrift', version: '0.9.3'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.4'
-    compile group: 'com.google.guava', name: 'guava', version: '18.0'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.16'
+    compile group: 'io.opentracing', name: 'opentracing-api', version: opentracingVersion
+    compile group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+    compile group: 'com.google.guava', name: 'guava', version: guavaVersion
+    compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 
     // Testing frameworks
     // Jersey dependencies for unit tests
@@ -22,8 +19,8 @@ dependencies {
     testCompile group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVersion
     testCompile group: 'org.glassfish.jersey.media', name: 'jersey-media-moxy', version: '2.12'
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '2.0.2-beta'
+    testCompile group: 'junit', name: 'junit', version: junitVersion
+    testCompile group: 'org.mockito', name: 'mockito-all', version: mockitoVersion
     // TODO use only one mocking framework
     testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: powermockVersion
     testCompile group: 'org.powermock', name: 'powermock-core', version: powermockVersion

jaeger-dropwizard/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     compile group: 'io.dropwizard', name: 'dropwizard-hibernate', version: '0.9.1'
 
     testCompile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: jerseyVersion
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '2.0.2-beta'
+    testCompile group: 'junit', name: 'junit', version: junitVersion
+    testCompile group: 'org.mockito', name: 'mockito-all', version: mockitoVersion
 }
 
 jacocoTestReport {

jaeger-java-crossdock/build.gradle

@@ -21,8 +21,8 @@ dependencies {
 
 
     // Testing Frameworks
-    testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.16'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4jVersion
+    testCompile group: 'junit', name: 'junit', version: junitVersion
 }
 
 jacocoTestReport {

jaeger-jaxrs2/build.gradle

@@ -13,9 +13,9 @@ dependencies {
     testCompile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: jerseyVersion
     testCompile group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jerseyVersion
     testCompile group: 'org.glassfish.jersey.media', name: 'jersey-media-moxy', version: jerseyVersion
-    testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.7.4'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '2.0.2-beta'
+    testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
+    testCompile group: 'junit', name: 'junit', version: junitVersion
+    testCompile group: 'org.mockito', name: 'mockito-all', version: mockitoVersion
     // TODO use only one mocking framework
     testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: powermockVersion
     testCompile group: 'org.powermock', name: 'powermock-core', version: powermockVersion