Specify explicit javax.ws.rs version in yanglib 25/70725/3
authorJakub Morvay <jmorvay@frinx.io>
Tue, 10 Apr 2018 16:40:46 +0000 (18:40 +0200)
committerJakub Morvay <jakub.morvay@gmail.com>
Tue, 10 Apr 2018 16:56:05 +0000 (16:56 +0000)
This is a follow-up patch to
https://git.opendaylight.org/gerrit/#/c/68255/. We should specify
explicit javax.ws.rs version also in netconf yanglib.

Change-Id: I4c255c5ba6ef3728226d264f755a62019e5e56ef
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
netconf/yanglib/pom.xml

index 58eb8bb640a750a9d3576033e9bfca87f4938d36..1bcc7b371c627217a14c1895dbbc50019242988a 100644 (file)
                 <configuration>
                     <instructions>
                         <Bundle-Name>YangLib</Bundle-Name>
-                        <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,
+                            !javax.annotation,
+                            javax.ws.rs.*;version="[1.1.0,2.0.0)",
+                            *
+                        </Import-Package>
                         <Web-ContextPath>/yanglib</Web-ContextPath>
                     </instructions>
                 </configuration>