Merge "Remove Metering ConcurrentHashMaps"

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

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index 6f2428a435d5c4b676935c91554126975a8f0b4a..7555e2a275ef3d6874cefb21744f3786763215f0 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -2,15 +2,19 @@
 <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.controller</groupId>
-    <artifactId>enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../controller/opendaylight/commons/enunciate-parent</relativePath>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>northbound-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
+  <properties>
+    <checkstyle.location>${project.parent.basedir}/src/main/resources</checkstyle.location>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.sun.jersey</groupId>
@@ -21,8 +25,8 @@
       <artifactId>jersey-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
@@ -35,7 +39,7 @@
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>neutron-spi</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -51,17 +55,18 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>org.opendaylight.neutron,
-                            org.eclipse.persistence.jaxb.rs,
-                            com.sun.jersey.spi.container.servlet,
-                            javax.ws.rs,
-                            javax.ws.rs.ext,
-                            javax.ws.rs.core,
-                            javax.xml.bind.annotation,
-                            javax.xml.bind,
-                            org.slf4j,
-                            org.osgi.framework,
-                            !org.codehaus.enunciate.jaxrs</Import-Package>
+            <Import-Package>
+              org.eclipse.jetty.servlets,
+              org.eclipse.persistence.jaxb.rs,
+              com.sun.jersey.spi.container.servlet,
+              javax.ws.rs,
+              javax.ws.rs.ext,
+              javax.ws.rs.core,
+              javax.xml.bind.annotation,
+              javax.xml.bind,
+              org.slf4j,
+              org.osgi.framework,
+              !org.codehaus.enunciate.jaxrs,*</Import-Package>
             <Web-ContextPath>/controller/nb/v2/neutron</Web-ContextPath>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
@@ -70,10 +75,10 @@
     </plugins>
   </build>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
     <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+    <url>https://wiki.opendaylight.org/view/NeutronNorthBound:Main</url>
   </scm>
 
   <distributionManagement>