From 8aa0b50bba0c149a282c1d9f5c8c736a9867977f Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 18 Oct 2020 18:29:43 +0200
Subject: [PATCH] Convert rfc8528-data-api to JPMS

This is a simplistic module, convert it. While converting it, an
unneeded dependency on rfc8528-model-api is also eliminated,
which crops up in rfc8528-data-util.

JIRA: YANGTOOLS-934
Change-Id: Iaf9cb15e61eb1b035762843b4a59ea10a87d7233
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/rfc8528-data-api/pom.xml                 | 19 -------------------
 .../src/main/java/module-info.java            | 17 +++++++++++++++++
 yang/rfc8528-data-util/pom.xml                |  4 ++++
 3 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 yang/rfc8528-data-api/src/main/java/module-info.java

diff --git a/yang/rfc8528-data-api/pom.xml b/yang/rfc8528-data-api/pom.xml
index 04d7c9ab54..68d086a35d 100644
--- a/yang/rfc8528-data-api/pom.xml
+++ b/yang/rfc8528-data-api/pom.xml
@@ -38,24 +38,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>rfc8528-model-api</artifactId>
-        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc8528.data.api</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/yang/rfc8528-data-api/src/main/java/module-info.java b/yang/rfc8528-data-api/src/main/java/module-info.java
new file mode 100644
index 0000000000..7124deb4e6
--- /dev/null
+++ b/yang/rfc8528-data-api/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2020 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
+ */
+// 'rfc8528' in the name ends with a digit
+@SuppressWarnings("module")
+module org.opendaylight.yangtools.rfc8528.data.api {
+    exports org.opendaylight.yangtools.rfc8528.data.api;
+
+    requires transitive org.opendaylight.yangtools.yang.data.api;
+    requires transitive org.opendaylight.yangtools.yang.parser.api;
+
+    requires org.opendaylight.yangtools.util;
+}
diff --git a/yang/rfc8528-data-util/pom.xml b/yang/rfc8528-data-util/pom.xml
index 42fbed942b..e015f4f065 100644
--- a/yang/rfc8528-data-util/pom.xml
+++ b/yang/rfc8528-data-util/pom.xml
@@ -38,6 +38,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc8528-data-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>rfc8528-model-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
-- 
2.36.6