Update deps and exclude opencensus artifacts from dependencies. (#1687)

* Update deps and exclude opencensus artifacts from dependencies.

* Fix java style after google-java-format update.

* Downgrade apt-plugin to 0.18 to support java7.

* Downgrade typesafe to 1.2.1 to support java7.

Author: Bogdan Drutu

build.gradle

@@ -11,9 +11,9 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.16'
         classpath "net.ltgt.gradle:gradle-apt-plugin:0.18"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
-        classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.7.1"
-        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.7"
-        classpath "gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.7.0"
+        classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8"
+        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.8"
+        classpath "gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0"
     }
 }
 
@@ -165,30 +165,30 @@ subprojects {
     }
 
     ext {
-        appengineVersion = '1.9.64'
+        appengineVersion = '1.9.71'
         aspectjVersion = '1.8.11'
         autoValueVersion = '1.4'
         findBugsAnnotationsVersion = '3.0.1'
         findBugsJsr305Version = '3.0.2'
         errorProneVersion = '2.3.2'
         grpcVersion = '1.18.0'
         guavaVersion = '25.1-android'
-        googleAuthVersion = '0.12.0'
-        googleCloudBetaVersion = '0.77.0-beta'
-        googleCloudGaVersion = '1.59.0'
+        googleAuthVersion = '0.13.0'
+        googleCloudBetaVersion = '0.79.0-beta'
+        googleCloudGaVersion = '1.61.0'
         log4j2Version = '2.11.1'
         signalfxVersion = '0.0.48'
         springBootVersion = '1.5.15.RELEASE'
         springCloudVersion = '1.3.4.RELEASE'
         springVersion = '4.3.12.RELEASE'
         prometheusVersion = '0.6.0'
-        protobufVersion = '3.5.1'
-        zipkinReporterVersion = '2.3.2'
+        protobufVersion = '3.6.1'
+        zipkinReporterVersion = '2.7.14'
         jaegerReporterVersion = '0.27.0'
         opencensusProtoVersion = '0.1.0'
         gsonVersion = '2.8.5'
         dropwizardVersion = '3.1.2'
-        dropwizard5Version = '5.0.0-rc2'
+        dropwizard5Version = '5.0.0'
 
         libraries = [
                 appengine_api: "com.google.appengine:appengine-api-1.0-sdk:${appengineVersion}",
@@ -241,10 +241,7 @@ subprojects {
         compile {
             // Detect Maven Enforcer's dependencyConvergence failures. We only
             // care for artifacts used as libraries by others.
-            if (!(project.name in ['benchmarks', 'opencensus-all',
-                                   'opencensus-exporter-stats-stackdriver',
-                                   'opencensus-exporter-trace-stackdriver',
-                                   'opencensus-exporter-trace-jaeger'])) {
+            if (!(project.name in ['benchmarks', 'opencensus-all'])) {
                 resolutionStrategy.failOnVersionConflict()
             }
         }
@@ -329,7 +326,7 @@ subprojects {
     // Google formatter works only on java8.
     if (JavaVersion.current().isJava8Compatible()) {
         googleJavaFormat {
-            toolVersion '1.6'
+            toolVersion '1.7'
         }
 
         afterEvaluate {  // Allow subproject to add more source sets.

contrib/appengine_standard_util/build.gradle

@@ -3,14 +3,14 @@ description = 'OpenCensus AppEngine Standard Util'
 apply plugin: 'java'
 apply plugin: 'com.google.protobuf'
 
-def protocVersion = '3.5.1-1'
+def protocVersion = '3.6.1'
 
 buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8"
     }
 }
 

contrib/http_jaxrs/build.gradle

@@ -14,11 +14,11 @@ dependencies {
     compile project(':opencensus-contrib-http-util')
 
     // Will be provided from elsewhere at runtime
-    compileOnly('javax.ws.rs:javax.ws.rs-api:2.1')
-    compileOnly('javax.annotation:javax.annotation-api:1.2')
+    compileOnly('javax.ws.rs:javax.ws.rs-api:2.1.1')
+    compileOnly('javax.annotation:javax.annotation-api:1.3.2')
 
-    testCompile('javax.ws.rs:javax.ws.rs-api:2.1')
-    testCompile('javax.annotation:javax.annotation-api:1.2')
+    testCompile('javax.ws.rs:javax.ws.rs-api:2.1.1')
+    testCompile('javax.annotation:javax.annotation-api:1.3.2')
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
 }

contrib/log_correlation/stackdriver/build.gradle

@@ -3,8 +3,12 @@ description = 'OpenCensus Stackdriver Log Correlation'
 apply plugin: 'java'
 
 dependencies {
-    compile project(':opencensus-api'),
-            libraries.google_cloud_logging
+    compile project(':opencensus-api')
+
+    compile (libraries.google_cloud_logging) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
 
     testCompile libraries.guava
 

exporters/metrics/ocagent/build.gradle

@@ -9,11 +9,27 @@ dependencies {
     compileOnly libraries.auto_value
 
     compile project(':opencensus-api'),
-            project(':opencensus-contrib-monitored-resource-util'),
-            libraries.grpc_core,
-            libraries.grpc_netty,
-            libraries.grpc_stub,
-            libraries.opencensus_proto
+            project(':opencensus-contrib-monitored-resource-util')
+
+    compile (libraries.grpc_core) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.grpc_stub) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.grpc_netty) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.opencensus_proto) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
 }

exporters/trace/datadog/src/main/java/io/opencensus/exporter/trace/datadog/DatadogExporterHandler.java

@@ -85,9 +85,7 @@ private static String attributeValueToString(AttributeValue attributeValue) {
   private static Map<String, String> attributesToMeta(
       final Map<String, AttributeValue> attributes) {
     final HashMap<String, String> result = new HashMap<>();
-    attributes
-        .entrySet()
-        .stream()
+    attributes.entrySet().stream()
         .filter(entry -> entry.getValue() != null)
         .forEach(entry -> result.put(entry.getKey(), attributeValueToString(entry.getValue())));
     return result;
@@ -157,8 +155,7 @@ String convertToJson(Collection<SpanData> spanDataList) {
     }
 
     final Collection<List<DatadogSpan>> traces =
-        datadogSpans
-            .stream()
+        datadogSpans.stream()
             .collect(Collectors.groupingBy(DatadogSpan::getTraceId, Collectors.toList()))
             .values();
 

exporters/trace/ocagent/build.gradle

@@ -9,11 +9,27 @@ dependencies {
     compileOnly libraries.auto_value
 
     compile project(':opencensus-api'),
-            project(':opencensus-contrib-monitored-resource-util'),
-            libraries.grpc_core,
-            libraries.grpc_netty,
-            libraries.grpc_stub,
-            libraries.opencensus_proto
+            project(':opencensus-contrib-monitored-resource-util')
+
+    compile (libraries.grpc_core) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.grpc_stub) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.grpc_netty) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
+
+    compile (libraries.opencensus_proto) {
+        // We will always be more up to date.
+        exclude group: 'io.opencensus', module: 'opencensus-api'
+    }
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
 }