From 86be5d1c648c2bcb08d21949222bb636aac8ab6c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 30 Apr 2023 22:58:20 +0200
Subject: [PATCH] Package keystore/truststore/transport-api

We have an incoming implementation of proper transport layer, add
features to support them. Note this does not separate
keystore/truststore APIs.

JIRA: NETCONF-590
Change-Id: I65b061c34c77fc0d55d893fec9d329cab95c05b0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 23 ++++++++++
 features/features-netconf/pom.xml             | 18 ++++++++
 features/odl-netconf-keystore/pom.xml         | 40 ++++++++++++++++++
 features/odl-netconf-transport-api/pom.xml    | 42 +++++++++++++++++++
 .../src/main/feature/feature.xml              | 14 +++++++
 features/odl-netconf-truststore/pom.xml       | 40 ++++++++++++++++++
 features/pom.xml                              |  3 ++
 7 files changed, 180 insertions(+)
 create mode 100644 features/odl-netconf-keystore/pom.xml
 create mode 100644 features/odl-netconf-transport-api/pom.xml
 create mode 100644 features/odl-netconf-transport-api/src/main/feature/feature.xml
 create mode 100644 features/odl-netconf-truststore/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0bf8260024..73b7cf519b 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -134,6 +134,15 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- NETCONF Transport features -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-transport-api</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
             <!-- YANG models -->
             <!-- RFC5277 NETCONF Event Notifications -->
             <dependency>
@@ -217,6 +226,13 @@
                 <artifactId>keystore-none</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-keystore</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
 
             <!-- Truststore API and implementations. This is a manifestation of draft-ietf-netconf-truststore. -->
             <dependency>
@@ -229,6 +245,13 @@
                 <artifactId>truststore-none</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-truststore</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
diff --git a/features/features-netconf/pom.xml b/features/features-netconf/pom.xml
index 880c1a4416..9985b8a248 100644
--- a/features/features-netconf/pom.xml
+++ b/features/features-netconf/pom.xml
@@ -154,5 +154,23 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-transport-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-keystore</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-truststore</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-netconf-keystore/pom.xml b/features/odl-netconf-keystore/pom.xml
new file mode 100644
index 0000000000..fe61ae5302
--- /dev/null
+++ b/features/odl-netconf-keystore/pom.xml
@@ -0,0 +1,40 @@
+<?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-keystore</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: Key Store</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc8341</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>keystore-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>keystore-none</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-transport-api/pom.xml b/features/odl-netconf-transport-api/pom.xml
new file mode 100644
index 0000000000..07f3193bf1
--- /dev/null
+++ b/features/odl-netconf-transport-api/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-transport-api</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: Transport API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-netty-4</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>transport-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-netconf-transport-api/src/main/feature/feature.xml b/features/odl-netconf-transport-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..1e592d5307
--- /dev/null
+++ b/features/odl-netconf-transport-api/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?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-transport-api" version="${project.version}">
+        <feature version="[12,13)">odl-netty-4</feature>
+        <feature version="[10,11)">odl-yangtools-common</feature>
+    </feature>
+</features>
diff --git a/features/odl-netconf-truststore/pom.xml b/features/odl-netconf-truststore/pom.xml
new file mode 100644
index 0000000000..e8275ee47d
--- /dev/null
+++ b/features/odl-netconf-truststore/pom.xml
@@ -0,0 +1,40 @@
+<?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-truststore</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: Netconf :: Trust Store</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-model-rfc8341</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>truststore-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>truststore-none</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index 3257de36ed..4597256517 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -51,11 +51,14 @@
         <module>odl-netconf-connector</module>
         <module>odl-netconf-console</module>
         <module>odl-netconf-impl</module>
+        <module>odl-netconf-keystore</module>
         <module>odl-netconf-mdsal</module>
         <module>odl-netconf-netty-util</module>
         <module>odl-netconf-ssh</module>
         <module>odl-netconf-test-tools</module>
         <module>odl-netconf-topology</module>
+        <module>odl-netconf-transport-api</module>
+        <module>odl-netconf-truststore</module>
         <module>odl-netconf-util</module>
         <module>odl-restconf-all</module>
         <module>odl-restconf-common</module>
-- 
2.36.6