From 3d577aa505a22bbe545920123b887ff2b0b03cfe Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 18 Oct 2020 17:15:42 +0200
Subject: [PATCH] Turn yang-xpath-api into an explicit JPMS module

This is a simple API module, convert it to an explicit module.

JIRA: YANGTOOLS-934
Change-Id: I7e6ac24051df9971a6e224c27ebeee6753cac01c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-xpath-api/pom.xml                   | 14 --------------
 .../src/main/java/module-info.java            | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 yang/yang-xpath-api/src/main/java/module-info.java

diff --git a/yang/yang-xpath-api/pom.xml b/yang/yang-xpath-api/pom.xml
index 9683306fae..a0eac7d826 100644
--- a/yang/yang-xpath-api/pom.xml
+++ b/yang/yang-xpath-api/pom.xml
@@ -36,18 +36,4 @@
             <artifactId>yang-common</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.xpath.api</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/yang/yang-xpath-api/src/main/java/module-info.java b/yang/yang-xpath-api/src/main/java/module-info.java
new file mode 100644
index 0000000000..4cc2f8c0c3
--- /dev/null
+++ b/yang/yang-xpath-api/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+/*
+ * 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.xpath.api {
+    exports org.opendaylight.yangtools.yang.xpath.api;
+
+    // FIXME: it would be nice if we could live without java.xml here
+    requires transitive java.xml;
+    requires transitive org.opendaylight.yangtools.yang.common;
+
+    requires org.slf4j;
+
+    // Annotations
+    requires static org.eclipse.jdt.annotation;
+}
-- 
2.36.6