From 6c756afe7ab47b78a6f5bc71f965d4992f8f8d69 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 26 Mar 2018 14:21:55 +0800 Subject: [PATCH 1/2] Misc upgrades. --- .../agent-bootstrap/agent-bootstrap.gradle | 2 +- dd-java-agent/dd-java-agent.gradle | 2 +- dd-trace-java.gradle | 2 +- .../dropwizard-mongo-client.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/rest-spark/rest-spark.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/dependencies.gradle | 50 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle index 144a6634ca..d7353bb842 100644 --- a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle +++ b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle @@ -9,7 +9,7 @@ dependencies { compile project(':dd-trace-api') compile deps.opentracing compile deps.slf4j - compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' + compile group: 'org.slf4j', name: 'slf4j-simple', version: versions.slf4j // ^ Generally a bad idea for libraries, but we're shadowing. } diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 76d7923a50..b96c858035 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "2.0.1" + id "com.github.johnrengelman.shadow" version "2.0.3" } description = 'dd-java-agent' diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 9255026d3f..5ed6194951 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -30,7 +30,7 @@ description = 'dd-trace-java' // Applied here to allow publishing of artifactory build info apply from: "${rootDir}/gradle/publish.gradle" -ext.gradleWrapperVersion = '4.3.1' +ext.gradleWrapperVersion = '4.6' task wrapper(type: Wrapper) { gradleVersion = gradleWrapperVersion } diff --git a/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle index 24a9bd4545..10726c81d3 100644 --- a/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle +++ b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "2.0.1" + id "com.github.johnrengelman.shadow" version "2.0.3" } apply plugin: 'application' diff --git a/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties b/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties index 0e680f3759..ea720f986f 100644 --- a/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties +++ b/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip diff --git a/examples/rest-spark/gradle/wrapper/gradle-wrapper.properties b/examples/rest-spark/gradle/wrapper/gradle-wrapper.properties index 0e680f3759..ea720f986f 100644 --- a/examples/rest-spark/gradle/wrapper/gradle-wrapper.properties +++ b/examples/rest-spark/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip diff --git a/examples/rest-spark/rest-spark.gradle b/examples/rest-spark/rest-spark.gradle index 86e7484ed5..179a905842 100644 --- a/examples/rest-spark/rest-spark.gradle +++ b/examples/rest-spark/rest-spark.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "2.0.1" + id "com.github.johnrengelman.shadow" version "2.0.3" } apply plugin: 'application' diff --git a/examples/spring-boot-jdbc-redis/gradle/wrapper/gradle-wrapper.properties b/examples/spring-boot-jdbc-redis/gradle/wrapper/gradle-wrapper.properties index 0e680f3759..ea720f986f 100644 --- a/examples/spring-boot-jdbc-redis/gradle/wrapper/gradle-wrapper.properties +++ b/examples/spring-boot-jdbc-redis/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index a0499a8029..ea29cdca2f 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -2,56 +2,58 @@ def groovyVer = GroovySystem.version def spockGroovyVer = GroovySystem.version.replaceAll(/\.\d+$/, '') ext { - version = [ + versions = [ opentracing: '0.31.0', slf4j : "1.7.25", - guava : "20.0", - jackson : "2.6.3", + guava : "20.0", // Last version to support Java 7 + jackson : "2.6.3", // This is a transitive dependency for the tracer. + // Use an old version to not force an upgrade for others using tracer as a dependency. spock : "1.1-groovy-$spockGroovyVer", groovy : groovyVer, junit : "4.12", logback : "1.2.3", - bytebuddy : "1.7.9" + bytebuddy : "1.7.11", // Test failure when updating to 1.8.0. ] deps = [ // OpenTracing - opentracingApi : dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: version.opentracing), + opentracingApi : dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: versions.opentracing), opentracing : [ - dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: version.opentracing), - dependencies.create(group: 'io.opentracing', name: 'opentracing-noop', version: version.opentracing), - dependencies.create(group: 'io.opentracing', name: 'opentracing-util', version: version.opentracing), + dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: versions.opentracing), + dependencies.create(group: 'io.opentracing', name: 'opentracing-noop', version: versions.opentracing), + dependencies.create(group: 'io.opentracing', name: 'opentracing-util', version: versions.opentracing), ], - opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: version.opentracing), + opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: versions.opentracing), // General - slf4j : "org.slf4j:slf4j-api:${version.slf4j}", - guava : "com.google.guava:guava:$version.guava", + slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", + guava : "com.google.guava:guava:$versions.guava", jackson : [ - dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version.jackson), - dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: version.jackson), + dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jackson), + dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: versions.jackson), ], - bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${version.bytebuddy}"), + bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"), autoservice : [ dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'), - dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'), - dependencies.create(group: 'com.google.guava', name: 'guava', version: "${version.guava}"), + dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'), + // These are the last versions that support guava 20.0. Upgrading has odd interactions with shadow. + dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}"), ], // Testing - spock : dependencies.create("org.spockframework:spock-core:${version.spock}", { + spock : dependencies.create("org.spockframework:spock-core:${versions.spock}", { exclude group: "org.codehaus.groovy", module: "groovy-all" }), - bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${version.bytebuddy}"), - groovy : "org.codehaus.groovy:groovy-all:${version.groovy}", - junit : "junit:junit:${version.junit}", + bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"), + groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}", + junit : "junit:junit:${versions.junit}", testLogging : [ - dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: version.logback), - dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: version.slf4j), - dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: version.slf4j), - dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: version.slf4j), + dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: versions.logback), + dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: versions.slf4j), + dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j), + dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j), ], ] } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e680f3759..ea720f986f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip From 467301fe9018565c9d2df5b383349d36e109455b Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 29 Mar 2018 11:21:13 +0800 Subject: [PATCH 2/2] Try upgrading to latest version of BB. --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ea29cdca2f..a9b75a467d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -14,7 +14,7 @@ ext { groovy : groovyVer, junit : "4.12", logback : "1.2.3", - bytebuddy : "1.7.11", // Test failure when updating to 1.8.0. + bytebuddy : "1.8.1", ] deps = [