Add odl-yanglib into experimental features

During reorganizing of netconf features we have lost odl-yanglib
feature.

Create features-netconf-experimental which installs odl-yanglib.

JIRA: NETCONF-1028
Change-Id: I8f9ecb9d498d04d7edbb2d8c75ddebbcbf6ab371
Signed-off-by: Šimon Ukuš <simon.ukus@pantheon.tech>
Signed-off-by: Yaroslav Lastivka <yaroslav.lastivka@pantheon.tech>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 44905edc7a3bc0183d5f5477161b14d58c98529e..f2b38edd7d00ddd8d17cecba0c2b66a526b2594e 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -515,15 +515,6 @@
                 <classifier>features</classifier>
             </dependency>
 
-            <!-- yanglib features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-yanglib</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
             <!-- RESTCONF -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -637,6 +628,22 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+
+            <!-- Experimental features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-netconf-experimental</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-yanglib</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/features-netconf-experimental/pom.xml b/features/features-netconf-experimental/pom.xml
new file mode 100644 (file)
index 0000000..cb81649
--- /dev/null
+++ b/features/features-netconf-experimental/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 PANTHEON.tech, s.r.o. 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.odlparent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>12.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>features-netconf-experimental</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features-netconf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-yanglib</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/pom.xml b/features/pom.xml
index 34d96918a48e3e0659822a9515575798ddbdbf6a..d3b3e7e2ef60e7478c96dca80179eb5b33c566e2 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,6 +29,7 @@
         <module>parent</module>
         <module>features-netconf</module>
         <module>features-netconf-testing</module>
+        <module>features-netconf-experimental</module>
 
         <module>odl-netconf-model-rfc5277</module>
         <module>odl-netconf-model-rfc6022</module>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b80d7060ce13cc62b5b73b564f8791d997964e30..ffa74e73b3e405c77acf5c2b9eb4510fe97731de 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -82,6 +82,13 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf-experimental</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <scm>