From 11c397fc1ea97e319b03abf1f940a55fce16e2d0 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 18 Oct 2020 18:54:44 +0200
Subject: [PATCH] Convert yang-model-util to JPMS

This is one of our core dependencies, convert it so that we can
proceed further. Note that UTs require a block of pom.xml magic
to work.

JIRA: YANGTOOLS-934
Change-Id: Ifdd94495717d19138a1cf2580cde1dd0e9418e10
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-model-util/pom.xml                    | 11 ++++++-----
 .../src/main/java/module-info.java              | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 yang/yang-model-util/src/main/java/module-info.java

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index fc713012f5..c229dd4297 100644
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -46,12 +46,13 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.model.util</Automatic-Module-Name>
-                    </instructions>
+                    <argLine>@{argLine}
+                        --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.util=ALL-UNNAMED
+                        --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.util.type=ALL-UNNAMED
+                        --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.repo.util=ALL-UNNAMED
+                    </argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/yang/yang-model-util/src/main/java/module-info.java b/yang/yang-model-util/src/main/java/module-info.java
new file mode 100644
index 0000000000..77c5563a2b
--- /dev/null
+++ b/yang/yang-model-util/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
+ */
+module org.opendaylight.yangtools.yang.model.util {
+    exports org.opendaylight.yangtools.yang.model.util;
+    exports org.opendaylight.yangtools.yang.model.util.type;
+    exports org.opendaylight.yangtools.yang.model.repo.util;
+
+    requires transitive org.opendaylight.yangtools.rfc7952.model.api;
+
+    requires org.opendaylight.yangtools.util;
+    requires org.slf4j;
+}
-- 
2.36.6