From 9b1abcb977a24a54b698486f5596656ea4081895 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 Jan 2021 00:43:16 +0100 Subject: [PATCH] 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 (cherry picked from commit bd014b23b55d73933945a7c5b19fad030d606843) --- yang/rfc7952-data-api/src/main/java/module-info.java | 2 ++ yang/yang-data-api/src/main/java/module-info.java | 2 +- yang/yang-model-api/src/main/java/module-info.java | 3 ++- yang/yang-parser-api/src/main/java/module-info.java | 1 + yang/yang-xpath-api/src/main/java/module-info.java | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) 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 aad391f976..cb05543d5e 100644 --- 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 c13d04f6af..03b919b440 100644 --- 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 68710656df..9c987acab1 100644 --- 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 55ab5b2d8d..cda1d0c2e3 100644 --- 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 4cc2f8c0c3..c913f00f3e 100644 --- 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 -- 2.36.6