Checkstyle passes

.baseline/checkstyle/checkstyle.xml

@@ -153,10 +153,6 @@
             <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
             <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
         </module>
-        <module name="IllegalImport">
-            <property name="illegalClasses" value="com.google.common.base.Optional, com.google.common.base.Supplier"/>
-            <message key="import.illegal" value="Use the Java8 version of Guava objects."/>
-        </module>
         <module name="IllegalInstantiation"> <!-- Java Coding Guidelines: Never instantiate primitive types -->
             <property name="classes" value="java.lang.Boolean"/>
             <property name="classes" value="java.lang.Byte"/>

build.gradle

@@ -16,7 +16,7 @@
 
 buildscript {
     repositories {
-        jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
         maven { url "http://palantir.bintray.com/releases" }
     }
 
@@ -26,41 +26,26 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:4.9.5'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.5'
         classpath 'com.palantir.baseline:gradle-baseline-java:0.37.4'
+        classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
+        classpath 'gradle.plugin.org.inferred:gradle-processors:2.0.0'
     }
 }
 
-plugins {
-    id 'com.palantir.git-version' version '0.11.0'
-    id 'org.inferred.processors' version '1.2.15'
-}
-
-apply plugin: 'com.palantir.baseline-config' // provides baselineUpdateConfig task
-apply plugin: 'com.palantir.baseline-idea'
+apply plugin: 'com.palantir.git-version'
 apply plugin: 'com.palantir.baseline'
 
 repositories {
     maven { url  "http://palantir.bintray.com/releases" }
 }
 
-dependencies {
-}
-
 allprojects {
     version gitVersion()
     group 'com.palantir.tracing'
-
-    dependencyRecommendations {
-        strategy OverrideTransitives
-        propertiesFile file: project.rootProject.file('versions.props')
-    }
 }
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'com.palantir.baseline-checkstyle'
-    apply plugin: 'com.palantir.baseline-eclipse'
-    apply plugin: 'com.palantir.baseline-idea'
-    apply plugin: 'com.palantir.baseline-error-prone'
+    apply plugin: "org.inferred.processors"
 
     repositories {
         jcenter()
@@ -102,11 +87,7 @@ subprojects {
 
     configurations.errorprone {
         resolutionStrategy {
-            force 'com.google.guava:guava:21.0'
+            force 'com.google.guava:guava:23.6.1-jre'
         }
     }
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs += ['-XepDisableWarningsInGeneratedCode']
-    }
 }

tracing-api/build.gradle

@@ -1,5 +1,3 @@
-apply plugin: "org.inferred.processors"
-
 apply from: "$rootDir/gradle/publish-jar.gradle"
 
 dependencies {
@@ -10,5 +8,6 @@ dependencies {
     testCompile "org.mockito:mockito-core"
     testCompile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }

tracing-jaxrs/build.gradle

@@ -28,5 +28,6 @@ dependencies {
     testCompile "org.jmock:jmock"
     testCompile "org.mockito:mockito-core"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }

tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java

@@ -28,7 +28,7 @@ public final class JaxRsTracersTest {
     @Test
     public void testWrappingStreamingOutput_streamingOutputTraceIsIsolated() throws Exception {
         Tracer.startSpan("outside");
-        StreamingOutput streamingOutput = JaxRsTracers.wrap((os) -> {
+        StreamingOutput streamingOutput = JaxRsTracers.wrap(os -> {
             Tracer.startSpan("inside"); // never completed
         });
         streamingOutput.write(new ByteArrayOutputStream());
@@ -38,7 +38,7 @@ public void testWrappingStreamingOutput_streamingOutputTraceIsIsolated() throws
     @Test
     public void testWrappingStreamingOutput_traceStateIsCapturedAtConstructionTime() throws Exception {
         Tracer.startSpan("before-construction");
-        StreamingOutput streamingOutput = JaxRsTracers.wrap((os) -> {
+        StreamingOutput streamingOutput = JaxRsTracers.wrap(os -> {
             assertThat(Tracer.completeSpan().get().getOperation()).isEqualTo("before-construction");
         });
         Tracer.startSpan("after-construction");

tracing-jersey/build.gradle

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {

tracing-okhttp3/build.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {

tracing/build.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {
@@ -35,5 +33,6 @@ dependencies {
     testCompile "org.mockito:mockito-core"
     testCompile "io.zipkin.java:zipkin"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }

tracing/src/main/java/com/palantir/tracing/WrappingExecutorService.java

@@ -77,7 +77,7 @@ protected Runnable wrapTask(Runnable command) {
      *
      * @throws NullPointerException if any element of {@code tasks} is null
      */
-    private final <T> ImmutableList<Callable<T>> wrapTasks(
+    private <T> ImmutableList<Callable<T>> wrapTasks(
             Collection<? extends Callable<T>> tasks) {
         ImmutableList.Builder<Callable<T>> builder = ImmutableList.builder();
         for (Callable<T> task : tasks) {

tracing/src/main/java/com/palantir/tracing/WrappingScheduledExecutorService.java

@@ -30,7 +30,7 @@
  */
 abstract class WrappingScheduledExecutorService extends WrappingExecutorService
         implements ScheduledExecutorService {
-    final ScheduledExecutorService delegate;
+    private final ScheduledExecutorService delegate;
 
     protected WrappingScheduledExecutorService(ScheduledExecutorService delegate) {
         super(delegate);

tracing/src/test/java/com/palantir/tracing/AsyncSlf4jSpanObserverTest.java

@@ -16,6 +16,8 @@
 
 package com.palantir.tracing;
 
+// CHECKSTYLE:OFF
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
@@ -50,6 +52,7 @@
 import zipkin.Codec;
 import zipkin.Endpoint;
 
+// CHECKSTYLE:ON
 
 public final class AsyncSlf4jSpanObserverTest {
 

tracing/src/test/java/com/palantir/tracing/TracerTest.java

@@ -69,6 +69,7 @@ public void after() {
     public void testIdsMustBeNonNullAndNotEmpty() throws Exception {
         try {
             Tracer.initTrace(Optional.empty(), null);
+            fail("Didn't throw");
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessage("traceId must be non-empty: null");
         }

versions.props

@@ -1,6 +1,6 @@
 ch.qos.logback:logback-classic = 1.1.7
 com.fasterxml.jackson.*:jackson-* = 2.9.5
-com.google.guava:guava = 20.0
+com.google.guava:guava = 23.6.1-jre
 com.palantir.safe-logging:* = 1.3.0
 com.squareup.okhttp3:okhttp = 3.9.0
 io.dropwizard:dropwizard-* = 1.3.1