From 68806bf91d781e1ab920c0051e986534b4e3d801 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 2 May 2023 10:20:18 +0200
Subject: [PATCH] Separate out model packaging

Add separate features for standard IETF models. Also clean up other
dependencies, minimizing duplicate packaging of artifacts.

JIRA: NETCONF-1005
Change-Id: Id076ac8a1fdc2c3ee3521f31ec8f5a6af3e5cb69
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 63 +++++++++++++++++++
 features/features-netconf/pom.xml             | 18 ++++++
 features/odl-netconf-api/pom.xml              | 30 +++++----
 .../src/main/feature/feature.xml              |  1 -
 features/odl-netconf-connector/pom.xml        | 23 ++++---
 features/odl-netconf-impl/pom.xml             |  7 +++
 features/odl-netconf-model-rfc5277/pom.xml    | 36 +++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc6022/pom.xml    | 36 +++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc6241/pom.xml    | 36 +++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc6243/pom.xml    | 36 +++++++++++
 features/odl-netconf-model-rfc6470/pom.xml    | 36 +++++++++++
 features/odl-netconf-model-rfc8040/pom.xml    | 36 +++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc8341/pom.xml    | 36 +++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc8526/pom.xml    | 42 +++++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/odl-netconf-model-rfc8639/pom.xml    | 60 ++++++++++++++++++
 .../src/main/feature/feature.xml              | 16 +++++
 features/odl-netconf-util/pom.xml             |  7 +++
 features/odl-restconf-common/pom.xml          |  8 ++-
 features/pom.xml                              | 10 +++
 25 files changed, 591 insertions(+), 24 deletions(-)
 create mode 100644 features/odl-netconf-model-rfc5277/pom.xml
 create mode 100644 features/odl-netconf-model-rfc5277/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc6022/pom.xml
 create mode 100644 features/odl-netconf-model-rfc6022/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc6241/pom.xml
 create mode 100644 features/odl-netconf-model-rfc6241/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc6243/pom.xml
 create mode 100644 features/odl-netconf-model-rfc6470/pom.xml
 create mode 100644 features/odl-netconf-model-rfc8040/pom.xml
 create mode 100644 features/odl-netconf-model-rfc8040/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc8341/pom.xml
 create mode 100644 features/odl-netconf-model-rfc8341/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc8526/pom.xml
 create mode 100644 features/odl-netconf-model-rfc8526/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-model-rfc8639/pom.xml
 create mode 100644 features/odl-netconf-model-rfc8639/src/main/feature/feature.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 73c1ee0742..0bf8260024 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -366,6 +366,69 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc5277</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc6022</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc6241</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc6243</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc6470</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc8040</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc8341</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc8526</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-model-rfc8639</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-monitoring</artifactId>
diff --git a/features/features-netconf/pom.xml b/features/features-netconf/pom.xml
index f69d8de3e3..880c1a4416 100644
--- a/features/features-netconf/pom.xml
+++ b/features/features-netconf/pom.xml
@@ -70,6 +70,24 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc5277</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6022</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6241</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-netty-util</artifactId>
diff --git a/features/odl-netconf-api/pom.xml b/features/odl-netconf-api/pom.xml
index 9cfef994b8..32135a201f 100644
--- a/features/odl-netconf-api/pom.xml
+++ b/features/odl-netconf-api/pom.xml
@@ -35,36 +35,42 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc8342</artifactId>
+            <artifactId>odl-mdsal-model-rfc8525</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc8525</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc5277</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-api</artifactId>
+            <artifactId>odl-netconf-model-rfc6241</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-auth</artifactId>
+            <artifactId>odl-netconf-model-rfc6470</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf.model</groupId>
-            <artifactId>rfc5277</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc8526</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+
         <dependency>
-            <groupId>org.opendaylight.netconf.model</groupId>
-            <artifactId>rfc6470</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf.model</groupId>
-            <artifactId>rfc8526</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-auth</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-netconf-api/src/main/feature/feature.xml b/features/odl-netconf-api/src/main/feature/feature.xml
index fc18f6bfeb..f7118c19bc 100644
--- a/features/odl-netconf-api/src/main/feature/feature.xml
+++ b/features/odl-netconf-api/src/main/feature/feature.xml
@@ -11,6 +11,5 @@
         <feature version="[12,13)">odl-netty-4</feature>
         <feature version="[10,11)">odl-yangtools-parser-api</feature>
         <feature version="[11,12)">odl-mdsal-model-rfc8525</feature>
-        <feature version="[11,12)">odl-mdsal-model-rfc8342</feature>
     </feature>
 </features>
diff --git a/features/odl-netconf-connector/pom.xml b/features/odl-netconf-connector/pom.xml
index 49f8a5b1a3..a2c6d26fee 100644
--- a/features/odl-netconf-connector/pom.xml
+++ b/features/odl-netconf-connector/pom.xml
@@ -22,12 +22,24 @@
     <name>OpenDaylight :: Netconf Connector :: Netconf Connector</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>odl-aaa-encryption-service</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-client</artifactId>
@@ -35,11 +47,12 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6022</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -48,11 +61,5 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>odl-aaa-encryption-service</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-netconf-impl/pom.xml b/features/odl-netconf-impl/pom.xml
index 9f836ebbc6..833dc06fad 100644
--- a/features/odl-netconf-impl/pom.xml
+++ b/features/odl-netconf-impl/pom.xml
@@ -45,6 +45,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6022</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-server</artifactId>
diff --git a/features/odl-netconf-model-rfc5277/pom.xml b/features/odl-netconf-model-rfc5277/pom.xml
new file mode 100644
index 0000000000..ee5e1a86bc
--- /dev/null
+++ b/features/odl-netconf-model-rfc5277/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc5277</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC5277 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc5277</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc5277/src/main/feature/feature.xml b/features/odl-netconf-model-rfc5277/src/main/feature/feature.xml
new file mode 100644
index 0000000000..c505caf865
--- /dev/null
+++ b/features/odl-netconf-model-rfc5277/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc5277" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc6022/pom.xml b/features/odl-netconf-model-rfc6022/pom.xml
new file mode 100644
index 0000000000..5450600678
--- /dev/null
+++ b/features/odl-netconf-model-rfc6022/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc6022</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC6022 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6022</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc6022/src/main/feature/feature.xml b/features/odl-netconf-model-rfc6022/src/main/feature/feature.xml
new file mode 100644
index 0000000000..64f21e5c96
--- /dev/null
+++ b/features/odl-netconf-model-rfc6022/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc6022" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc6241/pom.xml b/features/odl-netconf-model-rfc6241/pom.xml
new file mode 100644
index 0000000000..674be1e83d
--- /dev/null
+++ b/features/odl-netconf-model-rfc6241/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc6241</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC6241 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6241</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc6241/src/main/feature/feature.xml b/features/odl-netconf-model-rfc6241/src/main/feature/feature.xml
new file mode 100644
index 0000000000..5eb64b969e
--- /dev/null
+++ b/features/odl-netconf-model-rfc6241/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc6241" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc6243/pom.xml b/features/odl-netconf-model-rfc6243/pom.xml
new file mode 100644
index 0000000000..43bceb8f15
--- /dev/null
+++ b/features/odl-netconf-model-rfc6243/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc6243</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC6243 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6241</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6243</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc6470/pom.xml b/features/odl-netconf-model-rfc6470/pom.xml
new file mode 100644
index 0000000000..cd022ab6bf
--- /dev/null
+++ b/features/odl-netconf-model-rfc6470/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc6470</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC6470 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6241</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6470</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc8040/pom.xml b/features/odl-netconf-model-rfc8040/pom.xml
new file mode 100644
index 0000000000..31f559f004
--- /dev/null
+++ b/features/odl-netconf-model-rfc8040/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc8040</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC8040 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc8040/src/main/feature/feature.xml b/features/odl-netconf-model-rfc8040/src/main/feature/feature.xml
new file mode 100644
index 0000000000..652c8e3779
--- /dev/null
+++ b/features/odl-netconf-model-rfc8040/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc8040" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc8341/pom.xml b/features/odl-netconf-model-rfc8341/pom.xml
new file mode 100644
index 0000000000..bb739def87
--- /dev/null
+++ b/features/odl-netconf-model-rfc8341/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc8341</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC8341 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8341</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc8341/src/main/feature/feature.xml b/features/odl-netconf-model-rfc8341/src/main/feature/feature.xml
new file mode 100644
index 0000000000..58604263a7
--- /dev/null
+++ b/features/odl-netconf-model-rfc8341/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc8341" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc8526/pom.xml b/features/odl-netconf-model-rfc8526/pom.xml
new file mode 100644
index 0000000000..e50c3dee52
--- /dev/null
+++ b/features/odl-netconf-model-rfc8526/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc8526</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC8526 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc6243</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8342</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8526</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc8526/src/main/feature/feature.xml b/features/odl-netconf-model-rfc8526/src/main/feature/feature.xml
new file mode 100644
index 0000000000..e3686dac4e
--- /dev/null
+++ b/features/odl-netconf-model-rfc8526/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc8526" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc8342</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-model-rfc8639/pom.xml b/features/odl-netconf-model-rfc8639/pom.xml
new file mode 100644
index 0000000000..3a58c5f379
--- /dev/null
+++ b/features/odl-netconf-model-rfc8639/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 PANTHEON.tech, 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.netconf</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+
+    <artifactId>odl-netconf-model-rfc8639</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: RFC8639 Models</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8040</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8343</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8528</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc8529</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc8341</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc8639</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-model-rfc8639/src/main/feature/feature.xml b/features/odl-netconf-model-rfc8639/src/main/feature/feature.xml
new file mode 100644
index 0000000000..2b38f01ea4
--- /dev/null
+++ b/features/odl-netconf-model-rfc8639/src/main/feature/feature.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2023 PANTHEON.tech, 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
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-netconf-${project.version}">
+    <feature name="odl-netconf-model-rfc8639" version="${project.version}">
+        <feature version="[11,12)">odl-mdsal-model-rfc8040</feature>
+        <feature version="[11,12)">odl-mdsal-model-rfc8343</feature>
+        <feature version="[11,12)">odl-mdsal-model-rfc8528</feature>
+        <feature version="[11,12)">odl-mdsal-model-rfc8529</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-util/pom.xml b/features/odl-netconf-util/pom.xml
index 1310d9325b..c06e015541 100644
--- a/features/odl-netconf-util/pom.xml
+++ b/features/odl-netconf-util/pom.xml
@@ -26,6 +26,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-common-mdsal</artifactId>
diff --git a/features/odl-restconf-common/pom.xml b/features/odl-restconf-common/pom.xml
index 6e87d63acd..5ea6f339c5 100644
--- a/features/odl-restconf-common/pom.xml
+++ b/features/odl-restconf-common/pom.xml
@@ -57,11 +57,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.opendaylight.netconf.model</groupId>
-            <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc8040</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-common-models</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index 950f1235fe..3257de36ed 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -30,6 +30,16 @@
         <module>features-netconf</module>
         <module>features-netconf-testing</module>
 
+        <module>odl-netconf-model-rfc5277</module>
+        <module>odl-netconf-model-rfc6022</module>
+        <module>odl-netconf-model-rfc6241</module>
+        <module>odl-netconf-model-rfc6243</module>
+        <module>odl-netconf-model-rfc6470</module>
+        <module>odl-netconf-model-rfc8040</module>
+        <module>odl-netconf-model-rfc8341</module>
+        <module>odl-netconf-model-rfc8526</module>
+        <module>odl-netconf-model-rfc8639</module>
+
         <module>odl-aaa-netconf-plugin</module>
         <module>odl-mdsal-apidocs</module>
         <module>odl-netconf-all</module>
-- 
2.36.6