Bump versions by x.(y+1).z for next dev cycle

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

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index d2b49cd8c6882509b246784963cf3fdd77861ed6..6bdf4e4803f03f9104624e535d4e8ad5b72c26e3 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -1,30 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2018 Intel Corporation and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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.11.0-SNAPSHOT</version>
+    <version>0.12.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>northbound-api</artifactId>
-  <version>0.11.0-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <!-- <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>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-artifacts</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
@@ -44,68 +59,29 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+     <groupId>org.ops4j.pax.cdi</groupId>
+     <artifactId>pax-cdi-api</artifactId>
+     <optional>true</optional>
+   </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa.web</groupId>
+      <artifactId>web-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa.web</groupId>
+      <artifactId>servlet-api</artifactId>
     </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              com.sun.jersey.spi.container.servlet,
-              org.eclipse.jetty.servlets,
-              org.opendaylight.aaa.shiro.filters,
-              org.opendaylight.aaa.shiro.realm,
-              org.opendaylight.aaa.shiro.web.env,
-              org.apache.shiro.web.env,
-              !org.codehaus.enunciate.jaxrs,
-
-              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>
+       <groupId>org.apache.aries.blueprint</groupId>
+       <artifactId>blueprint-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>