Merge "increase ITNeutronE2E Pax Exam time-out from default 3' to 15'"

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

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index f8a9912e9d29e7ff3f76ac2d11a85ea446d246a4..d2b49cd8c6882509b246784963cf3fdd77861ed6 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>northbound-api</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <properties>
-    <checkstyle.location>${project.parent.basedir}/src/main/resources</checkstyle.location>
-  </properties>
+  <!-- <name> formatting is used by autorelease to parse and notify projects on
+       build failure. Please do not modify this unless you have a good reason. -->
+  <name>ODL :: neutron :: ${project.artifactId}</name>
+
   <dependencies>
     <dependency>
       <groupId>com.sun.jersey</groupId>
@@ -24,10 +26,6 @@
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
@@ -66,25 +64,47 @@
               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>
-          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <compilerArgs>
-            <arg>-Xlint:unchecked</arg>
-            <arg>-Xlint:deprecation</arg>
-          </compilerArgs>
         </configuration>
       </plugin>
     </plugins>
@@ -95,21 +115,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/NeutronNorthBound:Main</url>
   </scm>
-
-  <distributionManagement>
-    <!-- Site deployment -->
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
 </project>