From ebf786df046140353fd3ecf559fbf3e2553875a0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 11 Apr 2021 12:27:18 +0200 Subject: [PATCH] Update dependenciy declarations Dependency checking is finding a large number of consistency problems, fix some of them up. Change-Id: I99e1deabb0c324dd07767fed9ef8181a52aa8793 Signed-off-by: Robert Varga --- yang/odlext-parser-support/pom.xml | 4 ++ yang/openconfig-parser-support/pom.xml | 4 ++ yang/rfc7952-data-util/pom.xml | 12 ++-- yang/rfc7952-parser-support/pom.xml | 33 +++++++++- yang/rfc8040-model-api/pom.xml | 4 ++ yang/rfc8040-parser-support/pom.xml | 31 ++++++++- yang/rfc8528-data-util/pom.xml | 18 +++++- .../src/main/java/module-info.java | 2 - yang/rfc8528-model-api/pom.xml | 4 ++ yang/rfc8528-parser-support/pom.xml | 31 ++++++++- yang/yang-common-netty/pom.xml | 4 ++ yang/yang-data-util/pom.xml | 34 +++++++++- yang/yang-model-util/pom.xml | 16 +++++ yang/yang-parser-impl/pom.xml | 63 +++++++++---------- yang/yang-test-util/pom.xml | 38 +++++++++++ 15 files changed, 248 insertions(+), 50 deletions(-) diff --git a/yang/odlext-parser-support/pom.xml b/yang/odlext-parser-support/pom.xml index 1bba770bf4..73a5e7e179 100644 --- a/yang/odlext-parser-support/pom.xml +++ b/yang/odlext-parser-support/pom.xml @@ -38,6 +38,10 @@ org.opendaylight.yangtools yang-model-spi + + org.opendaylight.yangtools + yang-parser-api + org.opendaylight.yangtools yang-parser-spi diff --git a/yang/openconfig-parser-support/pom.xml b/yang/openconfig-parser-support/pom.xml index 05ed015213..47c5c89690 100644 --- a/yang/openconfig-parser-support/pom.xml +++ b/yang/openconfig-parser-support/pom.xml @@ -42,6 +42,10 @@ org.opendaylight.yangtools yang-model-spi + + org.opendaylight.yangtools + yang-parser-api + org.opendaylight.yangtools yang-parser-spi diff --git a/yang/rfc7952-data-util/pom.xml b/yang/rfc7952-data-util/pom.xml index 4eb8cbb10e..3af9cc8592 100644 --- a/yang/rfc7952-data-util/pom.xml +++ b/yang/rfc7952-data-util/pom.xml @@ -22,6 +22,10 @@ RFC7952 data model utilities + + com.google.guava + guava + org.opendaylight.yangtools concepts @@ -32,19 +36,19 @@ org.opendaylight.yangtools - yang-data-api + yang-model-api org.opendaylight.yangtools - yang-data-util + yang-data-api org.opendaylight.yangtools - rfc7952-data-api + yang-data-util org.opendaylight.yangtools - rfc7952-model-api + rfc7952-data-api diff --git a/yang/rfc7952-parser-support/pom.xml b/yang/rfc7952-parser-support/pom.xml index 752e47fbd6..5d6e024b90 100644 --- a/yang/rfc7952-parser-support/pom.xml +++ b/yang/rfc7952-parser-support/pom.xml @@ -23,8 +23,8 @@ - org.opendaylight.yangtools - concepts + com.google.guava + guava org.opendaylight.yangtools @@ -32,17 +32,44 @@ org.opendaylight.yangtools - rfc7952-model-api + yang-model-api org.opendaylight.yangtools yang-model-ri + + org.opendaylight.yangtools + yang-model-spi + + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + yang-parser-spi + + + org.opendaylight.yangtools + rfc7952-model-api + + org.opendaylight.yangtools yang-parser-rfc7950 + + org.opendaylight.yangtools + yang-parser-reactor + test + + + org.opendaylight.yangtools + yang-repo-api + test + org.opendaylight.yangtools yang-xpath-impl diff --git a/yang/rfc8040-model-api/pom.xml b/yang/rfc8040-model-api/pom.xml index 0d63189fc3..d345d8b0ad 100644 --- a/yang/rfc8040-model-api/pom.xml +++ b/yang/rfc8040-model-api/pom.xml @@ -22,6 +22,10 @@ RFC8040 model API + + com.google.guava + guava + org.opendaylight.yangtools concepts diff --git a/yang/rfc8040-parser-support/pom.xml b/yang/rfc8040-parser-support/pom.xml index 402fd4e29b..180f01abfc 100644 --- a/yang/rfc8040-parser-support/pom.xml +++ b/yang/rfc8040-parser-support/pom.xml @@ -23,22 +23,49 @@ - org.opendaylight.yangtools - concepts + com.google.guava + guava org.opendaylight.yangtools yang-common + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-spi + + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + yang-parser-spi + org.opendaylight.yangtools rfc8040-model-api + org.opendaylight.yangtools yang-parser-rfc7950 + + org.opendaylight.yangtools + yang-parser-reactor + test + + + org.opendaylight.yangtools + yang-repo-api + test + org.opendaylight.yangtools yang-xpath-impl diff --git a/yang/rfc8528-data-util/pom.xml b/yang/rfc8528-data-util/pom.xml index 70257dfa9c..4a0a5d193f 100644 --- a/yang/rfc8528-data-util/pom.xml +++ b/yang/rfc8528-data-util/pom.xml @@ -22,6 +22,10 @@ RFC8528 data model utilities + + com.google.guava + guava + org.opendaylight.yangtools concepts @@ -32,7 +36,19 @@ org.opendaylight.yangtools - yang-data-util + yang-data-api + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-spi + + + org.opendaylight.yangtools + yang-parser-api org.opendaylight.yangtools diff --git a/yang/rfc8528-data-util/src/main/java/module-info.java b/yang/rfc8528-data-util/src/main/java/module-info.java index 55e642adbc..38d6d6c405 100644 --- a/yang/rfc8528-data-util/src/main/java/module-info.java +++ b/yang/rfc8528-data-util/src/main/java/module-info.java @@ -20,8 +20,6 @@ module org.opendaylight.yangtools.rfc8528.data.util { requires org.opendaylight.yangtools.rfc8528.model.api; requires org.opendaylight.yangtools.yang.common; - requires org.opendaylight.yangtools.yang.data.util; - requires org.opendaylight.yangtools.yang.model.util; requires org.slf4j; // Annotations diff --git a/yang/rfc8528-model-api/pom.xml b/yang/rfc8528-model-api/pom.xml index 814515022e..331bd45cac 100644 --- a/yang/rfc8528-model-api/pom.xml +++ b/yang/rfc8528-model-api/pom.xml @@ -22,6 +22,10 @@ RFC8528 model API + + com.google.guava + guava + org.opendaylight.yangtools concepts diff --git a/yang/rfc8528-parser-support/pom.xml b/yang/rfc8528-parser-support/pom.xml index 71e9075b95..84d0427852 100644 --- a/yang/rfc8528-parser-support/pom.xml +++ b/yang/rfc8528-parser-support/pom.xml @@ -23,22 +23,49 @@ - org.opendaylight.yangtools - concepts + com.google.guava + guava org.opendaylight.yangtools yang-common + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-spi + + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + yang-parser-spi + org.opendaylight.yangtools rfc8528-model-api + org.opendaylight.yangtools yang-parser-rfc7950 + + org.opendaylight.yangtools + yang-parser-reactor + test + + + org.opendaylight.yangtools + yang-repo-api + test + org.opendaylight.yangtools yang-xpath-impl diff --git a/yang/yang-common-netty/pom.xml b/yang/yang-common-netty/pom.xml index 6f2322bf78..2c27b401a9 100644 --- a/yang/yang-common-netty/pom.xml +++ b/yang/yang-common-netty/pom.xml @@ -22,6 +22,10 @@ Netty utilities for Common YANG definitions + + com.google.guava + guava + org.opendaylight.yangtools yang-common diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index fde881e55a..9e0858c18f 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -22,26 +22,54 @@ ${project.artifactId} + + com.google.guava + guava + org.opendaylight.yangtools - yang-data-api + concepts org.opendaylight.yangtools - rfc7952-data-api + util org.opendaylight.yangtools - rfc8528-data-api + yang-common + + + org.opendaylight.yangtools + yang-data-api org.opendaylight.yangtools yang-model-api + + org.opendaylight.yangtools + yang-model-spi + org.opendaylight.yangtools yang-model-util + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + yang-xpath-api + + + org.opendaylight.yangtools + rfc7952-data-api + + + org.opendaylight.yangtools + rfc8528-data-api + diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index a1a2ec0112..a2f5edc9d6 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -22,6 +22,18 @@ ${project.artifactId} + + com.google.guava + guava + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-common + org.opendaylight.yangtools yang-model-api @@ -30,6 +42,10 @@ org.opendaylight.yangtools yang-model-spi + + org.opendaylight.yangtools + yang-repo-api + org.opendaylight.yangtools yang-xpath-api diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index c440698454..887c3a6e15 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -22,21 +22,25 @@ YANG parser + + com.google.guava + guava + org.opendaylight.yangtools concepts org.opendaylight.yangtools - yang-common + util org.opendaylight.yangtools - yang-model-api + yang-common org.opendaylight.yangtools - yang-model-spi + yang-model-api org.opendaylight.yangtools @@ -50,74 +54,54 @@ org.opendaylight.yangtools yang-parser-reactor - - org.opendaylight.yangtools - yang-parser-rfc7950 + yang-repo-api - - org.opendaylight.yangtools - odlext-model-api + yang-repo-spi org.opendaylight.yangtools - odlext-parser-support + yang-xpath-api + + org.opendaylight.yangtools - openconfig-model-api + yang-parser-rfc7950 + + org.opendaylight.yangtools - openconfig-parser-support + odlext-parser-support org.opendaylight.yangtools - rfc6241-model-api + openconfig-parser-support org.opendaylight.yangtools rfc6241-parser-support - - org.opendaylight.yangtools - rfc6536-model-api - org.opendaylight.yangtools rfc6536-parser-support - - org.opendaylight.yangtools - rfc6643-model-api - org.opendaylight.yangtools rfc6643-parser-support - - org.opendaylight.yangtools - rfc7952-model-api - org.opendaylight.yangtools rfc7952-parser-support - - org.opendaylight.yangtools - rfc8040-model-api - org.opendaylight.yangtools rfc8040-parser-support - - org.opendaylight.yangtools - rfc8528-model-api - org.opendaylight.yangtools rfc8528-parser-support @@ -156,6 +140,19 @@ + + maven-dependency-plugin + + + analyze-declarations + + + org.opendaylight.yangtools:yang-xpath-impl + + + + + diff --git a/yang/yang-test-util/pom.xml b/yang/yang-test-util/pom.xml index 44649c6355..6437383505 100644 --- a/yang/yang-test-util/pom.xml +++ b/yang/yang-test-util/pom.xml @@ -22,10 +22,48 @@ ${project.artifactId} + + com.google.guava + guava + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + yang-repo-api + + org.opendaylight.yangtools yang-parser-impl + + + + maven-dependency-plugin + + + analyze-declarations + + + org.opendaylight.yangtools:yang-parser-impl + + + + + + + -- 2.36.6