module-info.java audit, part one

Add explicit requires on upstream dependencies, not relying on their
transitive requires (although they are obvious from functionality
break down perspective).

Change-Id: I70b8c4e4edf7e9f9955922bc6ba5b1c1171be260
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit bd014b23b55d73933945a7c5b19fad030d606843)

diff --git a/yang/rfc7952-data-api/src/main/java/module-info.java b/yang/rfc7952-data-api/src/main/java/module-info.java
index aad391f97677049ad86535a283f00151c8a17374..cb05543d5e66164970d36e8abd6cfa02fb43eef9 100644 (file)
--- a/yang/rfc7952-data-api/src/main/java/module-info.java
+++ b/yang/rfc7952-data-api/src/main/java/module-info.java
@@ -11,4 +11,6 @@ module org.opendaylight.yangtools.rfc7952.data.api {
     exports org.opendaylight.yangtools.rfc7952.data.api;
 
     requires transitive org.opendaylight.yangtools.yang.data.api;
+    requires org.opendaylight.yangtools.concepts;
+    requires org.opendaylight.yangtools.yang.common;
 }

diff --git a/yang/yang-data-api/src/main/java/module-info.java b/yang/yang-data-api/src/main/java/module-info.java
index c13d04f6af944dffe99943bf0e056e9d0d7e77dc..03b919b440cc4ea684fc0c755fc42b8c90212b19 100644 (file)
--- a/yang/yang-data-api/src/main/java/module-info.java
+++ b/yang/yang-data-api/src/main/java/module-info.java
@@ -15,7 +15,7 @@ module org.opendaylight.yangtools.yang.data.api {
 
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-
+    requires org.opendaylight.yangtools.concepts;
     requires org.opendaylight.yangtools.util;
     requires org.slf4j;
 

diff --git a/yang/yang-model-api/src/main/java/module-info.java b/yang/yang-model-api/src/main/java/module-info.java
index 68710656df138d46ff82f988d3098e5f2985ec2a..9c987acab12bbf5348808aed4ad1b321d4aa8d3d 100644 (file)
--- a/yang/yang-model-api/src/main/java/module-info.java
+++ b/yang/yang-model-api/src/main/java/module-info.java
@@ -15,8 +15,9 @@ module org.opendaylight.yangtools.yang.model.api {
     exports org.opendaylight.yangtools.yang.model.repo.spi;
 
     requires transitive org.opendaylight.yangtools.yang.xpath.api;
-
+    requires org.opendaylight.yangtools.concepts;
     requires org.opendaylight.yangtools.util;
+    requires org.opendaylight.yangtools.yang.common;
     requires org.slf4j;
 
     // Annotations

diff --git a/yang/yang-parser-api/src/main/java/module-info.java b/yang/yang-parser-api/src/main/java/module-info.java
index 55ab5b2d8d344fc430b1b7ca62e8c90b93ec36a4..cda1d0c2e324557e68b398fe9a6e434b7d94bf22 100644 (file)
--- a/yang/yang-parser-api/src/main/java/module-info.java
+++ b/yang/yang-parser-api/src/main/java/module-info.java
@@ -9,4 +9,5 @@ module org.opendaylight.yangtools.yang.parser.api {
     exports org.opendaylight.yangtools.yang.model.parser.api;
 
     requires transitive org.opendaylight.yangtools.yang.model.api;
+    requires org.opendaylight.yangtools.yang.common;
 }

diff --git a/yang/yang-xpath-api/src/main/java/module-info.java b/yang/yang-xpath-api/src/main/java/module-info.java
index 4cc2f8c0c3eccc93ed653ba253e481007005c79a..c913f00f3eda23c556ad6c26f1742f22a1902757 100644 (file)
--- a/yang/yang-xpath-api/src/main/java/module-info.java
+++ b/yang/yang-xpath-api/src/main/java/module-info.java
@@ -11,7 +11,7 @@ module 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.opendaylight.yangtools.concepts;
     requires org.slf4j;
 
     // Annotations