Separate out odl-restconf-nb-bierman02

odl-restconf is our user-installable feature which we want to use
to install both northbounds. Separate out odl-restconf-nb-bierman02,
which is authenticated version of bierman02 and pull it in.

Change-Id: Idf8db9d41629824b881ad77145ec4d10c7b057e6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index b2b9cc94a70c5142ac80902cbdc959b2e47cfd0f..2d5e153e123bcbcf4cc5affff903dc26df696dd7 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -50,6 +50,13 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-restconf-nb-bierman02</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-restconf-nb-rfc8040</artifactId>

diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml
new file mode 100644 (file)
index 0000000..817a26a
--- /dev/null
+++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2019 Pantheon Technologies, s.r.o. and others.
+
+ 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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>4.0.7</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>odl-restconf-nb-bierman02</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Restconf :: NB :: bierman02</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf-nb-bierman02-base</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>restconf-nb-bierman02-auth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index dbf08b4a8369f14fffda86fa2609af923d468bf9..53ffe24dba0ef948b283451c1b53c078f84a7996 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -26,15 +26,10 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-bierman02-base</artifactId>
+            <artifactId>odl-restconf-nb-bierman02</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-bierman02-auth</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 0f0de2b1b9e897402e53ca35c34fb2c454f4cd85..c669a0dbb4f14164dfe15d6601b664d210eef424 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -32,6 +32,7 @@
         <module>odl-restconf</module>
         <module>odl-restconf-noauth</module>
         <module>odl-restconf-common</module>
+        <module>odl-restconf-nb-bierman02</module>
         <module>odl-restconf-nb-bierman02-base</module>
         <module>odl-restconf-nb-bierman02-noauth</module>
         <module>odl-restconf-nb-rfc8040</module>