Bump to yangtools-2.0.0 and odlparent-3.0.2

[neutron.git] / northbound-api / pom.xml

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index 1f595c446675d56bb0a239bd83e1eaf1a1dc5a0b..ee1ff1155e2428c3a766c7ff0ddeeffde202e991 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -81,12 +81,46 @@
               org.opendaylight.aaa.shiro.web.env,
               org.apache.shiro.web.env,
               !org.codehaus.enunciate.jaxrs,
-              javax.validation,
-              javax.ws.rs.ext,
-              javax.xml.bind,
+
+              com.sun.xml.bind;resolution:=optional,
+              com.sun.xml.bind.annotation;resolution:=optional,
+              com.sun.xml.bind.api;resolution:=optional,
+              com.sun.xml.bind.api.impl;resolution:=optional,
+              com.sun.codemodel;resolution:=optional,
+              com.sun.xml.xsom;resolution:=optional,
+              com.sun.xml.xsom.impl;resolution:=optional,
+              com.sun.xml.xsom.impl.parser;resolution:=optional,
+              com.sun.tools.xjc;resolution:=optional,
+              com.sun.tools.xjc.model;resolution:=optional,
+              com.sun.tools.xjc.outline;resolution:=optional,
+              javax.activation;resolution:=optional,
+              javax.json;resolution:=optional,
+              javax.json.stream;resolution:=optional,
+              javax.naming;resolution:=optional,
+              javax.validation;resolution:=optional,
+              javax.validation.constraints;resolution:=optional;
+              javax.validation.groups;resolution:=optional;
+              javax.ws.rs;resolution:=optional,
+              javax.ws.rs.core;resolution:=optional,
+              javax.ws.rs.ext;resolution:=optional,
+              javax.xml.namespace;resolution:=optional,
+              javax.xml.parsers;resolution:=optional,
+              javax.xml.stream;resolution:=optional,
+              javax.xml.transform;resolution:=optional,
+              javax.xml.transform.dom;resolution:=optional,
+              javax.xml.transform.sax;resolution:=optional,
+              javax.xml.transform.stax;resolution:=optional,
+              javax.xml.transform.stream;resolution:=optional,
+              javax.xml.validation;resolution:=optional,
+              org.eclipse.persistence.internal.libraries.asm;resolution:=optional,
               *
             </Import-Package>
+
             <Web-ContextPath>/controller/nb/v2/neutron</Web-ContextPath>
+
+            <!-- Workaround for javax.ws.rs version mismatch with jackson/jersey/moxy -->
+            <Embed-Transitive>true</Embed-Transitive>
+            <Embed-Dependency>org.eclipse.persistence.moxy;inline</Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>