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>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml
index 6260fbfbb993fa13ba1c9ec2b718b4b3c8584573..a3e308ec06ee35a6703b04e4af3747c1f7c35774 100644 (file)
--- a/restconf/restconf-common/pom.xml
+++ b/restconf/restconf-common/pom.xml
@@ -75,4 +75,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 8a2b28ee2d82fde597151e8cf95338f50feedcaa..dbe58c1ff1861a5b28cdc42f6803dafee2fa30fe 100644 (file)
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -261,6 +261,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 ac80a475349cc0bbf852dffdba320ba4fc43ed9b..29166ea8200028d16da8e7a0089988357efc2127 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -203,6 +203,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,