From 21b31de0a1c69c2a86e8707e0fbe22371ffb2d05 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 20 Jun 2023 14:42:53 +0200 Subject: [PATCH] Clean up dependencies We have a ton of warnings, reign some of them in. Change-Id: I4aa0b3871f9416c09fb17fe5f9325015231ac40a Signed-off-by: Robert Varga --- binding/mdsal-binding-dom-codec-api/pom.xml | 24 ++++++++++++++++++ binding/mdsal-binding-dom-codec-spi/pom.xml | 12 ++++++--- binding/mdsal-binding-generator/pom.xml | 4 +++ .../src/main/java/module-info.java | 1 - .../mdsal-binding-java-api-generator/pom.xml | 4 +++ binding/mdsal-binding-loader/pom.xml | 4 +++ binding/mdsal-binding-model-ri/pom.xml | 25 ++++++++++++++----- .../src/main/java/module-info.java | 3 --- binding/mdsal-binding-runtime-api/pom.xml | 4 +++ .../src/main/java/module-info.java | 1 - .../src/main/java/module-info.java | 1 - binding/mdsal-binding-spec-util/pom.xml | 12 +++++++++ binding/yang-binding/pom.xml | 4 +++ common/mdsal-common-api/pom.xml | 5 ---- .../src/main/java/module-info.java | 1 - dom/mdsal-dom-api/pom.xml | 25 +++++++++++++++++++ entityownership/mdsal-eos-common-api/pom.xml | 4 +++ entityownership/mdsal-eos-common-spi/pom.xml | 5 ++++ entityownership/mdsal-eos-dom-api/pom.xml | 8 ++++++ model/ietf/rfc7952/pom.xml | 15 +++++++++++ model/ietf/rfc8040/pom.xml | 15 +++++++++++ model/l2-types/pom.xml | 15 +++++++++++ .../mdsal-singleton-common-api/pom.xml | 4 +++ .../mdsal-singleton-dom-impl/pom.xml | 4 +++ yanglib/mdsal-yanglib-api/pom.xml | 24 ++++++++++++++++++ 25 files changed, 202 insertions(+), 22 deletions(-) diff --git a/binding/mdsal-binding-dom-codec-api/pom.xml b/binding/mdsal-binding-dom-codec-api/pom.xml index 53ef25e040..85576fa012 100644 --- a/binding/mdsal-binding-dom-codec-api/pom.xml +++ b/binding/mdsal-binding-dom-codec-api/pom.xml @@ -25,10 +25,30 @@ spotbugs-annotations true + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-common + org.opendaylight.yangtools yang-data-api + + org.opendaylight.yangtools + yang-model-api + org.opendaylight.mdsal mdsal-binding-spec-util @@ -37,6 +57,10 @@ org.opendaylight.mdsal mdsal-binding-runtime-api + + org.opendaylight.mdsal + yang-binding + org.opendaylight.yangtools diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml index 0f3a976cdc..7d80cee66d 100644 --- a/binding/mdsal-binding-dom-codec-spi/pom.xml +++ b/binding/mdsal-binding-dom-codec-spi/pom.xml @@ -34,10 +34,18 @@ checker-qual provided + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts + + org.opendaylight.yangtools + yang-common + org.opendaylight.yangtools yang-data-api @@ -54,10 +62,6 @@ org.opendaylight.mdsal mdsal-binding-runtime-api - - org.opendaylight.mdsal - mdsal-binding-spec-util - org.opendaylight.mdsal yang-binding diff --git a/binding/mdsal-binding-generator/pom.xml b/binding/mdsal-binding-generator/pom.xml index 70206ee6f9..9f7928a300 100644 --- a/binding/mdsal-binding-generator/pom.xml +++ b/binding/mdsal-binding-generator/pom.xml @@ -29,6 +29,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/binding/mdsal-binding-generator/src/main/java/module-info.java b/binding/mdsal-binding-generator/src/main/java/module-info.java index b3c7d56a99..88dd6f8bd1 100644 --- a/binding/mdsal-binding-generator/src/main/java/module-info.java +++ b/binding/mdsal-binding-generator/src/main/java/module-info.java @@ -21,7 +21,6 @@ module org.opendaylight.mdsal.binding.generator { requires transitive org.opendaylight.mdsal.binding.model.ri; requires transitive org.opendaylight.mdsal.binding.runtime.api; requires com.google.common; - requires org.opendaylight.mdsal.binding.spec.util; requires org.opendaylight.yangtools.concepts; requires org.opendaylight.yangtools.yang.binding; requires org.opendaylight.yangtools.yang.common; diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml index 577165ec68..9927c57b9a 100644 --- a/binding/mdsal-binding-java-api-generator/pom.xml +++ b/binding/mdsal-binding-java-api-generator/pom.xml @@ -29,6 +29,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.gaul modernizer-maven-annotations diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml index e7962ca28d..6a189037a7 100644 --- a/binding/mdsal-binding-loader/pom.xml +++ b/binding/mdsal-binding-loader/pom.xml @@ -33,6 +33,10 @@ net.bytebuddy byte-buddy + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.mdsal yang-binding diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml index d492a74b0f..a95d1f847d 100644 --- a/binding/mdsal-binding-model-ri/pom.xml +++ b/binding/mdsal-binding-model-ri/pom.xml @@ -25,25 +25,33 @@ spotbugs-annotations true + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools - yang-model-api + util org.opendaylight.yangtools - yang-model-ri + yang-common - org.opendaylight.mdsal - mdsal-binding-model-api + org.opendaylight.yangtools + yang-model-api org.opendaylight.mdsal - yang-binding + mdsal-binding-model-api org.opendaylight.mdsal - mdsal-binding-spec-util + yang-binding @@ -54,6 +62,11 @@ org.opendaylight.yangtools yang-test-util + + org.opendaylight.yangtools + yang-model-ri + test + org.opendaylight.yangtools yang-model-util diff --git a/binding/mdsal-binding-model-ri/src/main/java/module-info.java b/binding/mdsal-binding-model-ri/src/main/java/module-info.java index 5f2f0444d8..818b8d964b 100644 --- a/binding/mdsal-binding-model-ri/src/main/java/module-info.java +++ b/binding/mdsal-binding-model-ri/src/main/java/module-info.java @@ -10,14 +10,11 @@ module org.opendaylight.mdsal.binding.model.ri { exports org.opendaylight.mdsal.binding.model.ri.generated.type.builder; requires transitive org.opendaylight.mdsal.binding.model.api; - requires org.opendaylight.mdsal.binding.spec.util; requires org.opendaylight.yangtools.util; requires org.opendaylight.yangtools.yang.binding; requires org.opendaylight.yangtools.yang.common; requires org.opendaylight.yangtools.yang.model.api; - requires org.opendaylight.yangtools.yang.model.ri; // Annotations requires static transitive org.eclipse.jdt.annotation; - requires static com.github.spotbugs.annotations; } diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml index ac663144fc..958984211e 100644 --- a/binding/mdsal-binding-runtime-api/pom.xml +++ b/binding/mdsal-binding-runtime-api/pom.xml @@ -29,6 +29,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/binding/mdsal-binding-runtime-api/src/main/java/module-info.java b/binding/mdsal-binding-runtime-api/src/main/java/module-info.java index 5a12f0f3d2..8d9ab777f9 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/module-info.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/module-info.java @@ -20,5 +20,4 @@ module org.opendaylight.mdsal.binding.runtime.api { // Annotations requires static transitive org.eclipse.jdt.annotation; - requires static com.github.spotbugs.annotations; } diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/module-info.java b/binding/mdsal-binding-runtime-spi/src/main/java/module-info.java index 73b77f818b..ec3c2e23ce 100644 --- a/binding/mdsal-binding-runtime-spi/src/main/java/module-info.java +++ b/binding/mdsal-binding-runtime-spi/src/main/java/module-info.java @@ -24,6 +24,5 @@ module org.opendaylight.mdsal.binding.runtime.spi { // Annotations requires static transitive org.eclipse.jdt.annotation; - requires static com.github.spotbugs.annotations; requires static org.checkerframework.checker.qual; } diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml index 5978478d37..7a172f92fe 100644 --- a/binding/mdsal-binding-spec-util/pom.xml +++ b/binding/mdsal-binding-spec-util/pom.xml @@ -29,6 +29,18 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + yang-common + org.opendaylight.mdsal yang-binding diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml index 505bc65dcc..6693002dfb 100644 --- a/binding/yang-binding/pom.xml +++ b/binding/yang-binding/pom.xml @@ -31,6 +31,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml index ca58e8e0d2..8e90c9a3ca 100644 --- a/common/mdsal-common-api/pom.xml +++ b/common/mdsal-common-api/pom.xml @@ -21,11 +21,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/common/mdsal-common-api/src/main/java/module-info.java b/common/mdsal-common-api/src/main/java/module-info.java index 8babdbea3f..5b4d7f2708 100644 --- a/common/mdsal-common-api/src/main/java/module-info.java +++ b/common/mdsal-common-api/src/main/java/module-info.java @@ -13,5 +13,4 @@ module org.opendaylight.mdsal.common.api { // Annotations requires static transitive org.eclipse.jdt.annotation; - requires static com.github.spotbugs.annotations; } diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml index 0fcf967f66..fd8505f2fd 100644 --- a/dom/mdsal-dom-api/pom.xml +++ b/dom/mdsal-dom-api/pom.xml @@ -26,6 +26,19 @@ spotbugs-annotations true + + com.google.guava + guava + + + org.checkerframework + checker-qual + true + + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.gaul modernizer-maven-annotations @@ -34,6 +47,18 @@ org.opendaylight.mdsal mdsal-common-api + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + yang-common + org.opendaylight.yangtools yang-data-api diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml index 3a3c0d5d0c..c9789b5886 100644 --- a/entityownership/mdsal-eos-common-api/pom.xml +++ b/entityownership/mdsal-eos-common-api/pom.xml @@ -23,6 +23,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/entityownership/mdsal-eos-common-spi/pom.xml b/entityownership/mdsal-eos-common-spi/pom.xml index 8f47b6b67d..e0fea2c5f2 100644 --- a/entityownership/mdsal-eos-common-spi/pom.xml +++ b/entityownership/mdsal-eos-common-spi/pom.xml @@ -19,6 +19,10 @@ bundle + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.mdsal mdsal-eos-common-api @@ -27,6 +31,7 @@ org.opendaylight.yangtools concepts + org.opendaylight.yangtools mockito-configuration diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml index 046415e0e0..b1ad78024e 100644 --- a/entityownership/mdsal-eos-dom-api/pom.xml +++ b/entityownership/mdsal-eos-dom-api/pom.xml @@ -23,10 +23,18 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.mdsal mdsal-eos-common-api + + org.opendaylight.yangtools + concepts + org.opendaylight.yangtools yang-common diff --git a/model/ietf/rfc7952/pom.xml b/model/ietf/rfc7952/pom.xml index 47bb84c481..6309e3efbb 100644 --- a/model/ietf/rfc7952/pom.xml +++ b/model/ietf/rfc7952/pom.xml @@ -26,6 +26,21 @@ ${project.artifactId} RFC7952 YANG Metadata + + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + yang-common + + + diff --git a/model/ietf/rfc8040/pom.xml b/model/ietf/rfc8040/pom.xml index 73dcf1633f..563a66fc98 100644 --- a/model/ietf/rfc8040/pom.xml +++ b/model/ietf/rfc8040/pom.xml @@ -24,6 +24,21 @@ ${project.artifactId} RFC8040 RESTCONF Protocol + + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + yang-common + + + diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index 76c784e44b..d896ed2618 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -22,6 +22,21 @@ 2013.08.27.24.0-SNAPSHOT bundle + + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + yang-common + + + diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml index 641b776dfb..6ade0ad085 100644 --- a/singleton-service/mdsal-singleton-common-api/pom.xml +++ b/singleton-service/mdsal-singleton-common-api/pom.xml @@ -24,6 +24,10 @@ com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml index 6068436c2c..828c0d34d4 100644 --- a/singleton-service/mdsal-singleton-dom-impl/pom.xml +++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml @@ -34,6 +34,10 @@ checker-qual true + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools concepts diff --git a/yanglib/mdsal-yanglib-api/pom.xml b/yanglib/mdsal-yanglib-api/pom.xml index ded882d954..ab7674477a 100644 --- a/yanglib/mdsal-yanglib-api/pom.xml +++ b/yanglib/mdsal-yanglib-api/pom.xml @@ -22,14 +22,38 @@ bundle + + com.google.guava + guava + + + org.eclipse.jdt + org.eclipse.jdt.annotation + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-common + org.opendaylight.yangtools yang-data-api + + org.opendaylight.yangtools + yang-model-api + org.opendaylight.yangtools yang-parser-api + + org.opendaylight.yangtools + yang-repo-api + -- 2.36.6