From: Jakub Morvay <jmorvay@frinx.io>
Date: Tue, 10 Apr 2018 16:40:46 +0000 (+0200)
Subject: Specify explicit javax.ws.rs version in yanglib
X-Git-Tag: release/fluorine~99
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=add23d419fe285a090051a218dd09bf560a9a643;p=netconf.git

Specify explicit javax.ws.rs version in yanglib

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>
---

diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml
index 58eb8bb640..1bcc7b371c 100644
--- a/netconf/yanglib/pom.xml
+++ b/netconf/yanglib/pom.xml
@@ -31,8 +31,13 @@
                 <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>