Reverts change to use JSR 305 dependency, due to problems w/OSGi, Java 9

Before, we optimized to drop our source-retention Nullable in favor of
JSR 305. In doing so, we got null analysis from Intellij. However, in
doing so, we entered a swamp of dependency conflicts, which started with
OSGi (hence switch to service mix bundle) and now with Java 9 (conflict
with apps using jax-ws.

Since we are a core dependency, and particularly not a user-api, this
change caused more problems than it fixed. Hence, this reverts to the
safer model of using internal source-retention nullable (which allows
things like AutoValue to work, but don't introduce any chance of runtime
class conflicts).

See #1703
See openzipkin/brave#451

pom.xml

@@ -434,19 +434,6 @@
   </dependencyManagement>
 
   <dependencies>
-    <!--
-     For javax.annotation.ParametersAreNonnullByDefault and javax.annotation.Nullable
-     This is added as a root-level dependency to prevent javadoc from failing.
-     servicemix is used as it is OSGi friendly
-     -->
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.jsr305</artifactId>
-      <version>3.0.2_1</version>
-      <!-- eventhough annotations are runtime retention, we do not look them up reflectively -->
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

zipkin-autoconfigure/storage-elasticsearch-aws/src/main/java/zipkin/autoconfigure/storage/elasticsearch/aws/AWSCredentials.java

@@ -13,7 +13,7 @@
  */
 package zipkin.autoconfigure.storage.elasticsearch.aws;
 
-import javax.annotation.Nullable;
+import zipkin.internal.Nullable;
 
 import static zipkin.internal.Util.checkNotNull;
 

zipkin-collector/scribe/src/main/java/zipkin/collector/scribe/ScribeSpanConsumer.java

@@ -20,11 +20,11 @@
 import java.util.Base64;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 import zipkin.Span;
 import zipkin.SpanDecoder;
 import zipkin.collector.Collector;
 import zipkin.collector.CollectorMetrics;
+import zipkin.internal.Nullable;
 import zipkin.storage.Callback;
 
 final class ScribeSpanConsumer implements Scribe {

zipkin-guava/src/main/java/zipkin/storage/guava/GuavaSpanStore.java

@@ -15,9 +15,9 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
-import javax.annotation.Nullable;
 import zipkin.DependencyLink;
 import zipkin.Span;
+import zipkin.internal.Nullable;
 import zipkin.storage.QueryRequest;
 import zipkin.storage.SpanStore;
 

zipkin-guava/src/main/java/zipkin/storage/guava/InternalForwardingCallback.java

@@ -14,7 +14,7 @@
 package zipkin.storage.guava;
 
 import com.google.common.util.concurrent.FutureCallback;
-import javax.annotation.Nullable;
+import zipkin.internal.Nullable;
 import zipkin.storage.Callback;
 
 import static zipkin.internal.Util.checkNotNull;

zipkin-guava/src/main/java/zipkin/storage/guava/InternalGuavaSpanConsumerAdapter.java

@@ -16,8 +16,8 @@
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
-import javax.annotation.Nullable;
 import zipkin.Span;
+import zipkin.internal.Nullable;
 import zipkin.storage.AsyncSpanConsumer;
 import zipkin.storage.Callback;
 

zipkin-guava/src/main/java/zipkin/storage/guava/InternalGuavaSpanStoreAdapter.java

@@ -16,9 +16,9 @@
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
-import javax.annotation.Nullable;
 import zipkin.DependencyLink;
 import zipkin.Span;
+import zipkin.internal.Nullable;
 import zipkin.storage.AsyncSpanStore;
 import zipkin.storage.Callback;
 import zipkin.storage.QueryRequest;

zipkin-guava/src/main/java/zipkin/storage/guava/InternalGuavaToAsyncSpanStoreAdapter.java

@@ -14,9 +14,9 @@
 package zipkin.storage.guava;
 
 import java.util.List;
-import javax.annotation.Nullable;
 import zipkin.DependencyLink;
 import zipkin.Span;
+import zipkin.internal.Nullable;
 import zipkin.storage.AsyncSpanStore;
 import zipkin.storage.Callback;
 import zipkin.storage.QueryRequest;