Fix javax.annotation missing package from rest

Change-Id: I56d43c158c14dcb925eafa18b997465f9baa2fe0
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/opendaylight/restconf/sal-rest-connector/pom.xml b/opendaylight/restconf/sal-rest-connector/pom.xml
index 3f60223d56ee1bf4aae60f50f62b8c241aa471af..619f779605c5b261e30df30081ea543a8b81a8d9 100644 (file)
--- a/opendaylight/restconf/sal-rest-connector/pom.xml
+++ b/opendaylight/restconf/sal-rest-connector/pom.xml
@@ -152,8 +152,13 @@
               org.opendaylight.netconf.md.sal.rest.common.*,
               org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.rest.connector.rev140724.*,
             </Private-Package>
-            <Import-Package>*,
-            com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
+            <Import-Package>
+              com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets,
+              <!-- Set the javax packages version to 0. Relying on "*" includes versions from jsr305 dependency whic are
+              incompatible with karaf provided packages -->
+              javax.*;version="0.0",
+              *,
+            </Import-Package>
             <Embed-Dependency>stax-utils</Embed-Dependency>
             <Web-ContextPath>/restconf</Web-ContextPath>
           </instructions>