Install both restconf northbounds with odl-restconf

Now that we have separate packaging for both northbounds, make
sure we pull them into odl-restconf.

This eliminates the need for odl-restconf-nb-rfc8040-all, as that
is a subset of odl-restconf-all.

Change-Id: Iafda7f00aeb635414db6230410f055a857db032d
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 2d5e153e123bcbcf4cc5affff903dc26df696dd7..8e05f6adbd1976c375d19a65b5aa28394f141701 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -64,12 +64,5 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-restconf-nb-rfc8040-all</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
   </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml
deleted file mode 100644 (file)
index a80e88b..0000000
--- a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 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-rfc8040-all</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Restconf NB - RFC8040:: All</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-restconf-nb-rfc8040</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-apidocs</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 53ffe24dba0ef948b283451c1b53c078f84a7996..ce9ab1af4f3af868b5848b5b56960d89fdffbaac 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -31,5 +31,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-restconf-nb-rfc8040</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index c669a0dbb4f14164dfe15d6601b664d210eef424..8507a412add0cead00e0249277f2af9d436bf415 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -36,7 +36,6 @@
         <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>
 
     <scm>