From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Mon, 14 Dec 2015 17:39:46 +0000 (-0500)
Subject: Bug 4773 Package uses conflict between authn and restconf
X-Git-Tag: release/beryllium~55
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d1943ed97eaca5a294c953e7cc5648395526db86;p=netconf.git

Bug 4773 Package uses conflict between authn and restconf

Add in the javax.annotation dependencies, and make the bundles private
so there is no package uses conflict.

Change-Id: Ic6b3cc7906179ae63524035eff4e8d9faa33c61b
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/opendaylight/restconf/sal-rest-connector/pom.xml b/opendaylight/restconf/sal-rest-connector/pom.xml
index 31dc585104..d826a25735 100644
--- a/opendaylight/restconf/sal-rest-connector/pom.xml
+++ b/opendaylight/restconf/sal-rest-connector/pom.xml
@@ -115,6 +115,15 @@
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.2</version>
+    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
@@ -158,6 +167,7 @@
               org.opendaylight.netconf.sal.restconf.impl,
               org.opendaylight.netconf.md.sal.rest.common.*,
               org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.rest.connector.rev140724.*,
+              javax.annotation
             </Private-Package>
             <Import-Package>
               *,