palantir · schlosna · May 4, 2018 · May 4, 2018 · May 4, 2018 · May 4, 2018
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         classpath 'gradle.plugin.com.palantir:gradle-circle-style:1.1.2'
         classpath 'com.netflix.nebula:nebula-dependency-recommender:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.19.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.20.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.7.2'
         classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'

diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -5,6 +5,7 @@ apply plugin: 'com.palantir.baseline-error-prone'
 apply plugin: 'com.palantir.baseline-checkstyle'
 apply plugin: 'com.palantir.baseline-eclipse'
 apply plugin: 'com.palantir.baseline-idea'
+apply plugin: 'com.palantir.baseline-class-uniqueness'
 apply plugin: 'com.palantir.configuration-resolver'
 
 jacocoTestReport {

diff --git a/tritium-api/build.gradle b/tritium-api/build.gradle
@@ -1,7 +1,7 @@
 apply from: "${rootDir}/gradle/publish.gradle"
 
 dependencies {
-    compile 'com.google.code.findbugs:annotations'
+    compile 'com.google.code.findbugs:jsr305'
 
     testCompile 'com.google.guava:guava-testlib'
     testCompile 'junit:junit'

diff --git a/tritium-api/src/main/java/com/palantir/tritium/api/event/package-info.java b/tritium-api/src/main/java/com/palantir/tritium/api/event/package-info.java
diff --git a/tritium-api/src/main/java/com/palantir/tritium/api/functions/package-info.java b/tritium-api/src/main/java/com/palantir/tritium/api/functions/package-info.java
diff --git a/tritium-api/src/main/java/com/palantir/tritium/commons/annotations/NonnullByDefault.java b/tritium-api/src/main/java/com/palantir/tritium/commons/annotations/NonnullByDefault.java
diff --git a/tritium-api/src/main/java/com/palantir/tritium/commons/annotations/package-info.java b/tritium-api/src/main/java/com/palantir/tritium/commons/annotations/package-info.java
diff --git a/tritium-caffeine/build.gradle b/tritium-caffeine/build.gradle
@@ -8,7 +8,6 @@ dependencies {
     compile project(':tritium-core')
     compile project(':tritium-metrics')
     compile 'com.github.ben-manes.caffeine:caffeine'
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.google.guava:guava'
     compile 'com.palantir.safe-logging:safe-logging'
     compile 'io.dropwizard.metrics:metrics-core'

diff --git a/tritium-core/build.gradle b/tritium-core/build.gradle
@@ -3,7 +3,6 @@ apply from: "${rootDir}/gradle/publish.gradle"
 dependencies {
     compile project(':tritium-api')
     compile 'com.google.guava:guava'
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.palantir.safe-logging:safe-logging'
     compile 'org.slf4j:slf4j-api'
 

diff --git a/tritium-core/src/main/java/com/palantir/tritium/commons/annotations/package-info.java b/tritium-core/src/main/java/com/palantir/tritium/commons/annotations/package-info.java
diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java b/tritium-core/src/main/java/com/palantir/tritium/event/DefaultInvocationContext.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import javax.annotation.Nullable;
@@ -67,7 +66,6 @@ public final Method getMethod() {
     }
 
     @Override
-    @SuppressFBWarnings("EI_EXPOSE_REP")
     public final Object[] getArgs() {
         return args;
     }

diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/package-info.java b/tritium-core/src/main/java/com/palantir/tritium/event/package-info.java
diff --git a/tritium-jmh/build.gradle b/tritium-jmh/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     compile project(':tritium-slf4j')
     compile project(':tritium-tracing')
 
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.google.guava:guava'
     compile 'io.dropwizard.metrics:metrics-core'
     compile ('org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir') {

diff --git a/tritium-lib/build.gradle b/tritium-lib/build.gradle
@@ -8,7 +8,6 @@ dependencies {
     compile project(':tritium-proxy')
     compile project(':tritium-slf4j')
     compile project(':tritium-tracing')
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.google.guava:guava'
     compile 'com.palantir.safe-logging:safe-logging'
     compile 'org.slf4j:slf4j-api'

diff --git a/tritium-lib/src/main/java/com/palantir/tritium/package-info.java b/tritium-lib/src/main/java/com/palantir/tritium/package-info.java
diff --git a/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java b/tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java
@@ -27,7 +27,6 @@
 import com.palantir.tritium.event.log.LoggingInvocationEventHandler;
 import com.palantir.tritium.event.log.LoggingLevel;
 import com.palantir.tritium.event.metrics.MetricsInvocationEventHandler;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import org.slf4j.Logger;
@@ -97,13 +96,11 @@ public static <T> Logger getPerformanceLoggerForInterface(Class<T> serviceInterf
         return LoggerFactory.getLogger("performance." + serviceInterface.getName());
     }
 
-    @SuppressFBWarnings(justification = "Catch-22: Checkstyle wants final builder, but FindBugs doesn't")
     public static <T, U extends T> Builder<T, U> builder(Class<T> interfaceClass, U delegate) {
         return new Builder<>(interfaceClass, delegate);
     }
 
     @SuppressWarnings("WeakerAccess") // intended for public consumption
-    @SuppressFBWarnings(justification = "Catch-22: Checkstyle wants final builder, but FindBugs doesn't")
     public static final class Builder<T, U extends T> {
 
         private final Class<T> interfaceClass;

diff --git a/tritium-lib/src/main/java/com/palantir/tritium/proxy/package-info.java b/tritium-lib/src/main/java/com/palantir/tritium/proxy/package-info.java
diff --git a/tritium-metrics/build.gradle b/tritium-metrics/build.gradle
@@ -6,12 +6,10 @@ dependencies {
     compile project(':tritium-api')
     compile project(':tritium-core')
 
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.google.guava:guava'
     compile 'com.palantir.safe-logging:safe-logging'
     compile 'io.dropwizard.metrics:metrics-core'
     compile ('org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir') {
-        exclude group: 'com.google.code.findbugs', module: 'jsr305'
         exclude group: 'io.dropwizard.metrics', module: 'metrics-core'
         exclude group: 'org.hdrhistogram', module: 'HdrHistogram'
     }

diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/package-info.java b/tritium-metrics/src/main/java/com/palantir/tritium/event/metrics/package-info.java
diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/metrics/HistogramMetricBuilder.java b/tritium-metrics/src/main/java/com/palantir/tritium/metrics/HistogramMetricBuilder.java
@@ -19,7 +19,6 @@
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Reservoir;
 import com.google.common.base.Supplier;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 final class HistogramMetricBuilder extends AbstractReservoirMetricBuilder<Histogram> {
 
@@ -32,7 +31,6 @@ public Histogram newMetric() {
         return new ReservoirHistogram(getReservoirSupplier().get());
     }
 
-    @SuppressFBWarnings("PT_EXTENDS_CONCRETE_TYPE")
     private static class ReservoirHistogram extends Histogram {
         private final Reservoir reservoir;
 

diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/metrics/MetricRegistryWithReservoirs.java b/tritium-metrics/src/main/java/com/palantir/tritium/metrics/MetricRegistryWithReservoirs.java
@@ -23,9 +23,7 @@
 import com.codahale.metrics.Reservoir;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Supplier;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-@SuppressFBWarnings("PT_EXTENDS_CONCRETE_TYPE")
 final class MetricRegistryWithReservoirs extends MetricRegistry {
 
     private final Supplier<Reservoir> reservoirSupplier;

diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/metrics/TimerMetricBuilder.java b/tritium-metrics/src/main/java/com/palantir/tritium/metrics/TimerMetricBuilder.java
@@ -19,7 +19,6 @@
 import com.codahale.metrics.Reservoir;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Supplier;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 final class TimerMetricBuilder extends AbstractReservoirMetricBuilder<Timer> {
 
@@ -32,7 +31,6 @@ public Timer newMetric() {
         return new ReservoirTimer(getReservoirSupplier().get());
     }
 
-    @SuppressFBWarnings("PT_EXTENDS_CONCRETE_TYPE")
     private static class ReservoirTimer extends Timer {
         private final Reservoir reservoir;
 

diff --git a/tritium-metrics/src/main/java/com/palantir/tritium/metrics/package-info.java b/tritium-metrics/src/main/java/com/palantir/tritium/metrics/package-info.java
diff --git a/tritium-slf4j/build.gradle b/tritium-slf4j/build.gradle
@@ -3,7 +3,6 @@ apply from: "${rootDir}/gradle/publish.gradle"
 dependencies {
     compile project(':tritium-api')
     compile project(':tritium-core')
-    compile 'com.google.code.findbugs:annotations'
     compile 'com.palantir.safe-logging:safe-logging'
     compile 'org.slf4j:slf4j-api'
 

diff --git a/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/package-info.java b/tritium-slf4j/src/main/java/com/palantir/tritium/event/log/package-info.java