From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 5 Jul 2023 16:03:57 +0000 (+0200)
Subject: Convert netconf-api into a module
X-Git-Tag: v6.0.1~45
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2ca2da308faddd7e091b5be9217644e61f60c3f4;p=netconf.git

Convert netconf-api into a module

This is a simplistic module, convert it to JPMS. Also correct dependency
declarations to fix warnings.

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

diff --git a/protocol/netconf-api/pom.xml b/protocol/netconf-api/pom.xml
index 23e0f6a0bc..da7e445bf6 100644
--- a/protocol/netconf-api/pom.xml
+++ b/protocol/netconf-api/pom.xml
@@ -7,53 +7,57 @@
  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>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
-    <relativePath>../../parent</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-parent</artifactId>
+        <version>6.0.1-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
 
-  <artifactId>netconf-api</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>bundle</packaging>
+    <artifactId>netconf-api</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf.model</groupId>
-      <artifactId>rfc6241</artifactId>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf.model</groupId>
+            <artifactId>rfc6241</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>mockito-configuration</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.xmlunit</groupId>
-      <artifactId>xmlunit-core</artifactId>
-    </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/protocol/netconf-api/src/main/java/module-info.java b/protocol/netconf-api/src/main/java/module-info.java
new file mode 100644
index 0000000000..ead691aa60
--- /dev/null
+++ b/protocol/netconf-api/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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
+ */
+module org.opendaylight.netconf.api {
+    exports org.opendaylight.netconf.api;
+    exports org.opendaylight.netconf.api.messages;
+    exports org.opendaylight.netconf.api.xml;
+
+    requires transitive io.netty.transport;
+    requires transitive java.xml;
+    requires transitive org.opendaylight.yangtools.yang.common;
+    requires transitive org.opendaylight.yang.gen.ietf.netconf.rfc6241;
+    requires com.google.common;
+    requires org.opendaylight.yangtools.util;
+    requires org.opendaylight.yangtools.yang.binding;
+    requires org.slf4j;
+
+    // Annotation-only dependencies
+    requires static transitive org.eclipse.jdt.annotation;
+    requires static com.github.spotbugs.annotations;
+}