Convert yang-data-transform into an explicit module

We do not rely on anything complex, just perform the straightforward
transformation, adjusting dependencies in the process.

JIRA: YANGTOOLS-1286
Change-Id: I3e385958268937a11f04a693a9a145caba3422d7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-transform/pom.xml b/data/yang-data-transform/pom.xml
index 0bbbb781369579e460ddc9f99622ea1b87b673d5..8863ff0a53a3943d4bb66eff03d59d804cd34edd 100644 (file)
--- a/data/yang-data-transform/pom.xml
+++ b/data/yang-data-transform/pom.xml
@@ -22,6 +22,14 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
@@ -31,19 +39,4 @@
             <artifactId>yang-data-impl</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.data.transform</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

diff --git a/data/yang-data-transform/src/main/java/module-info.java b/data/yang-data-transform/src/main/java/module-info.java
new file mode 100644 (file)
index 0000000..581d78c
--- /dev/null
+++ b/data/yang-data-transform/src/main/java/module-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 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.data.transform {
+    // FIXME: 8.0.0: rename this to yangtools.yang.data.transform
+    exports org.opendaylight.yangtools.transform;
+
+    requires transitive com.google.common;
+    requires transitive org.opendaylight.yangtools.yang.common;
+    requires transitive org.opendaylight.yangtools.yang.data.api;
+    requires org.opendaylight.yangtools.yang.data.impl;
+
+    // Annotations
+    requires static transitive org.eclipse.jdt.annotation;
+}