Separate out odl-restconf-nb-bierman02-noauth

odl-restconf-noauth is the top-level, default feature, which
we want to use to install both northbounds.

Separate out bierman02 into its own feature and make sure
odl-restconf-noauth depends on it.

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

diff --git a/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml b/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml
new file mode 100644 (file)
index 0000000..96a308b
--- /dev/null
+++ b/features/restconf/odl-restconf-nb-bierman02-noauth/pom.xml
@@ -0,0 +1,52 @@
+<?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-noauth</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Restconf :: NB :: bierman02 :: no-auth</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>1.9.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <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-noauth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

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

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