Remove JSR305 dependency from metrics-impl

There is only a single reference, move it to JDT.

Change-Id: I562ea4a4b4c23388587757bd102c8c223b13ac91
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/metrics/impl/pom.xml b/metrics/impl/pom.xml
index c4c4c69f98cfb3a79e26e47b04e617514f930bbe..568c384638c0cf1c705d12960fddfbd3555156e9 100644 (file)
--- a/metrics/impl/pom.xml
+++ b/metrics/impl/pom.xml
@@ -59,11 +59,6 @@
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/metrics/impl/src/main/java/org/opendaylight/infrautils/metrics/internal/MetricProviderImpl.java b/metrics/impl/src/main/java/org/opendaylight/infrautils/metrics/internal/MetricProviderImpl.java
index dfc50d73d9d6f5d577960e0a4144f4d1bc90b60f..f8e094030837cf307464a318995ba7e80d8a76c4 100644 (file)
--- a/metrics/impl/src/main/java/org/opendaylight/infrautils/metrics/internal/MetricProviderImpl.java
+++ b/metrics/impl/src/main/java/org/opendaylight/infrautils/metrics/internal/MetricProviderImpl.java
@@ -29,10 +29,10 @@ import java.lang.management.ManagementFactory;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
 import javax.annotation.PreDestroy;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Service;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.infrautils.metrics.Counter;
 import org.opendaylight.infrautils.metrics.Labeled;
 import org.opendaylight.infrautils.metrics.Meter;