Merge pull request grpc#3 from songy23/update-opencensus

Resolve conflicts in core

Author: sebright

core/build.gradle

@@ -4,8 +4,7 @@ dependencies {
     compile project(':grpc-context'),
             libraries.guava,
             libraries.errorprone,
-            libraries.jsr305,
-            libraries.opencensus_contrib_grpc_metrics
+            libraries.jsr305
     compile (libraries.instrumentation_api) {
         // prefer 2.0.19 from libraries instead of 2.0.11
         exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
@@ -20,6 +19,12 @@ dependencies {
         // we'll always be more up-to-date
         exclude group: 'io.grpc', module: 'grpc-context'
     }
+    compile (libraries.opencensus_contrib_grpc_metrics) {
+        // prefer 3.0.0 from libraries instead of 3.0.1
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        // we'll always be more up-to-date
+        exclude group: 'io.grpc', module: 'grpc-context'
+    }
 
     testCompile project(':grpc-testing')