Specify explicit javax.ws.rs version in restconf

This seems to fix the intermittent issue where restconf
fails to install due to 2 versions of javax.ws.rs and
javax.annotation.

Change-Id: I6b106d700b89df575ee975f45e047cedb8c03e02
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml
index bed5e5fb7288c2d8e20abee3b9df6c98bb0d2063..5cdbd8963e1407dd386e23dd7bc25fcc096dd11b 100644 (file)
--- a/restconf/restconf-common/pom.xml
+++ b/restconf/restconf-common/pom.xml
@@ -63,4 +63,23 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              !javax.annotation,
+              javax.ws.rs.*;version="[1.1.0,2.0.0)",
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index 4a90ef4b77c09a129c0b79a3be046b6bd2ad92bb..cadda6787beddaa91791e9a40c78d43c4f02a8f8 100644 (file)
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -212,6 +212,8 @@
               org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.rest.connector.rev140724.*,
             </Private-Package>
             <Import-Package>
+              !javax.annotation,
+              javax.ws.rs.*;version="[1.1.0,2.0.0)",
               *,
               com.sun.jersey.spi.container.servlet,
               org.eclipse.jetty.servlets,

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index a5b2060633dd38cb82202087d2e0213b1e09709c..e10030557f173ba19ff783c27683c21924bb4c9c 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -155,6 +155,8 @@
           <instructions>
             <Bundle-Name>MD SAL Restconf Connector</Bundle-Name>
             <Import-Package>
+              !javax.annotation,
+              javax.ws.rs.*;version="[1.1.0,2.0.0)",
               *,
               com.sun.jersey.spi.container.servlet,
               org.eclipse.jetty.servlets,