From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 23 Feb 2015 10:43:00 +0000 (+0000)
Subject: Merge "Do not override jsr305 version"
X-Git-Tag: release/lithium~470^2~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b5e3b3f436f8534ddb6c7f326ccbef995b96ddc3;hp=-c

Merge "Do not override jsr305 version"
---

b5e3b3f436f8534ddb6c7f326ccbef995b96ddc3
diff --combined opendaylight/commons/opendaylight/pom.xml
index 338db8b03a,39c5672ca0..43ac4ae91c
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -15,7 -15,7 +15,7 @@@
  
    <properties>
  
 -    <akka.version>2.3.4</akka.version>
 +    <akka.version>2.3.9</akka.version>
      <appauth.version>0.5.0-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.1.0-SNAPSHOT</archetype-app-northbound>
      <arphandler.version>0.6.0-SNAPSHOT</arphandler.version>
@@@ -61,7 -61,6 +61,7 @@@
      <config.xsql.configfile>04-xsql.xml</config.xsql.configfile>
      <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
      <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>
 +    <config.netconf.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
      <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
      <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
      <configuration.implementation.version>0.5.0-SNAPSHOT</configuration.implementation.version>
@@@ -104,7 -103,6 +104,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>
@@@ -287,11 -285,6 +286,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>