From: Robert Varga <rovarga@cisco.com>
Date: Wed, 18 Feb 2015 10:41:43 +0000 (+0100)
Subject: Do not override jsr305 version
X-Git-Tag: release/lithium~514^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0b9c6c495bae321c38f274602f14e91d1e16db58;hp=-c

Do not override jsr305 version

The override puts it at 2.0.1, odlparent has it 2.0.3, which causes
compile-time maven warnings. Remove the override.

Change-Id: I99b874977b670d8af811642ecb28c2240d965dfd
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

0b9c6c495bae321c38f274602f14e91d1e16db58
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 70b60c2dd5..39c5672ca0 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -103,7 +103,6 @@
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <jolokia-bridge.version>0.1.0-SNAPSHOT</jolokia-bridge.version>
     <jolokia.version>1.1.4</jolokia.version>
-    <jsr305.api.version>2.0.1</jsr305.api.version>
     <jsr311.api.version>1.1.1</jsr311.api.version>
     <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
     <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
@@ -286,11 +285,6 @@
         <artifactId>java-concurrent-hash-trie-map</artifactId>
         <version>${ctrie.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>${jsr305.api.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>