From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 7 May 2021 11:07:59 +0000 (+0200)
Subject: Convert yang-data-codec-binfmt to an explict module
X-Git-Tag: v7.0.1~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F96019%2F1;p=yangtools.git

Convert yang-data-codec-binfmt to an explict module

This is a simple component and conversion is straightforward. Switch
from being an automatic module to being an explicit module.

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

diff --git a/codec/yang-data-codec-binfmt/pom.xml b/codec/yang-data-codec-binfmt/pom.xml
index 1cc6696a18..4d04e7c5e8 100644
--- a/codec/yang-data-codec-binfmt/pom.xml
+++ b/codec/yang-data-codec-binfmt/pom.xml
@@ -22,22 +22,37 @@
     <description>DataInput/Output for NormalizedNodes</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-api</artifactId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
         </dependency>
-        <!-- FIXME: add RFC7952 (metadata) support
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>rfc7952-data-api</artifactId>
-        </dependency-->
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-util</artifactId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>rfc8528-model-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -45,20 +60,5 @@
             <scope>test</scope>
         </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.codec.binfmt</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
 
diff --git a/codec/yang-data-codec-binfmt/src/main/java/module-info.java b/codec/yang-data-codec-binfmt/src/main/java/module-info.java
new file mode 100644
index 0000000000..f920247f4f
--- /dev/null
+++ b/codec/yang-data-codec-binfmt/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.codec.binfmt {
+    exports org.opendaylight.yangtools.yang.data.codec.binfmt;
+
+    requires transitive com.google.common;
+    requires transitive org.opendaylight.yangtools.yang.common;
+    requires transitive org.opendaylight.yangtools.yang.model.api;
+    requires transitive org.opendaylight.yangtools.yang.data.api;
+    requires java.xml;
+    requires org.opendaylight.yangtools.yang.data.impl;
+    requires org.opendaylight.yangtools.rfc8528.data.api;
+    requires org.slf4j;
+
+    // Annotations
+    requires static com.github.spotbugs.annotations;
+    requires static org.eclipse.jdt.annotation;
+}