From 96e797412922f35e7712ad3650b1737b376b4963 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 26 Jun 2023 13:48:45 +0200 Subject: [PATCH] Do not require spotbugs transitively Clean up dependencies, eliminating unused declared dependencies on spotbugs-annotations. Also clean up dependency confusion between mdsal-binding-dom-adapter and mdsal-binding-test-utils. Change-Id: Iaa6681c3e53ca8b9bd9e63abecf199b316fa9b4d Signed-off-by: Robert Varga --- .../src/main/java/module-info.java | 2 +- binding/mdsal-binding-dom-adapter/pom.xml | 83 ++++++++++++++++--- binding/mdsal-binding-dom-codec-osgi/pom.xml | 9 +- binding/mdsal-binding-dom-codec-spi/pom.xml | 5 -- binding/mdsal-binding-loader/pom.xml | 5 -- binding/mdsal-binding-model-ri/pom.xml | 5 -- binding/mdsal-binding-runtime-api/pom.xml | 5 -- binding/mdsal-binding-runtime-osgi/pom.xml | 5 -- .../src/main/java/module-info.java | 1 - binding/mdsal-binding-runtime-spi/pom.xml | 5 -- binding/mdsal-binding-spec-util/pom.xml | 5 -- binding/mdsal-binding-spi/pom.xml | 5 -- binding/mdsal-binding-test-utils/pom.xml | 4 + .../src/main/java/module-info.java | 4 +- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 1 + dom/mdsal-dom-schema-osgi/pom.xml | 5 -- .../src/main/java/module-info.java | 1 + entityownership/mdsal-eos-binding-api/pom.xml | 5 -- entityownership/mdsal-eos-dom-simple/pom.xml | 5 -- .../src/main/java/module-info.java | 1 - yanglib/mdsal-yanglib-rfc8525/pom.xml | 5 -- .../src/main/java/module-info.java | 1 - 23 files changed, 85 insertions(+), 84 deletions(-) diff --git a/binding/mdsal-binding-api/src/main/java/module-info.java b/binding/mdsal-binding-api/src/main/java/module-info.java index 26ccc9e7f0..1fe683f4aa 100644 --- a/binding/mdsal-binding-api/src/main/java/module-info.java +++ b/binding/mdsal-binding-api/src/main/java/module-info.java @@ -16,5 +16,5 @@ module org.opendaylight.mdsal.binding.api { // Annotations requires static transitive org.eclipse.jdt.annotation; - requires static transitive com.github.spotbugs.annotations; + requires static com.github.spotbugs.annotations; } diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml index cac4a185b5..3a41d3dae3 100644 --- a/binding/mdsal-binding-dom-adapter/pom.xml +++ b/binding/mdsal-binding-dom-adapter/pom.xml @@ -29,39 +29,95 @@ com.google.guava guava + + com.guicedee.services + javax.inject + true + + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.gaul modernizer-maven-annotations + + org.kohsuke.metainf-services + metainf-services + true + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-data-tree-api + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-util + org.opendaylight.mdsal mdsal-binding-api org.opendaylight.mdsal - mdsal-dom-api + mdsal-binding-dom-codec-api org.opendaylight.mdsal - mdsal-dom-spi + mdsal-binding-dom-codec-spi org.opendaylight.mdsal - mdsal-binding-dom-codec + mdsal-binding-model-api - org.opendaylight.yangtools - yang-data-impl + org.opendaylight.mdsal + mdsal-binding-runtime-api - org.kohsuke.metainf-services - metainf-services - true + org.opendaylight.mdsal + mdsal-binding-spec-util - com.guicedee.services - javax.inject - true + org.opendaylight.mdsal + mdsal-common-api + + + org.opendaylight.mdsal + mdsal-dom-api + + + org.opendaylight.mdsal + mdsal-dom-spi + + + org.opendaylight.mdsal + yang-binding org.osgi @@ -84,6 +140,11 @@ org.osgi.util.tracker + + org.opendaylight.mdsal + mdsal-binding-dom-codec + test + org.opendaylight.mdsal mdsal-binding-generator diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml index 48db4839f7..4730bc0f79 100644 --- a/binding/mdsal-binding-dom-codec-osgi/pom.xml +++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml @@ -20,15 +20,14 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava + + org.eclipse.jdt + org.eclipse.jdt.annotation + org.opendaylight.yangtools yang-data-api diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml index 7d80cee66d..eb4b89d3d6 100644 --- a/binding/mdsal-binding-dom-codec-spi/pom.xml +++ b/binding/mdsal-binding-dom-codec-spi/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml index 6a189037a7..e647174fdb 100644 --- a/binding/mdsal-binding-loader/pom.xml +++ b/binding/mdsal-binding-loader/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml index a95d1f847d..514dd8a7be 100644 --- a/binding/mdsal-binding-model-ri/pom.xml +++ b/binding/mdsal-binding-model-ri/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml index 958984211e..4863aed08b 100644 --- a/binding/mdsal-binding-runtime-api/pom.xml +++ b/binding/mdsal-binding-runtime-api/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml index c2dad73aa3..d7b1a7be6d 100644 --- a/binding/mdsal-binding-runtime-osgi/pom.xml +++ b/binding/mdsal-binding-runtime-osgi/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java b/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java index fd6aba72bc..f8b8a221b1 100644 --- a/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java +++ b/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java @@ -18,7 +18,6 @@ module org.opendaylight.mdsal.binding.runtime.osgi { requires org.slf4j; // Annotations - requires static com.github.spotbugs.annotations; requires static org.checkerframework.checker.qual; requires static org.eclipse.jdt.annotation; requires static org.osgi.service.component.annotations; diff --git a/binding/mdsal-binding-runtime-spi/pom.xml b/binding/mdsal-binding-runtime-spi/pom.xml index adc8d5bd07..d3bc99ebf4 100644 --- a/binding/mdsal-binding-runtime-spi/pom.xml +++ b/binding/mdsal-binding-runtime-spi/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml index 19483415ad..3300c59571 100644 --- a/binding/mdsal-binding-spec-util/pom.xml +++ b/binding/mdsal-binding-spec-util/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml index c7a96b1548..97e1439b0a 100644 --- a/binding/mdsal-binding-spi/pom.xml +++ b/binding/mdsal-binding-spi/pom.xml @@ -21,11 +21,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml index 738cbdf7ba..f6df05cd56 100644 --- a/binding/mdsal-binding-test-utils/pom.xml +++ b/binding/mdsal-binding-test-utils/pom.xml @@ -74,6 +74,10 @@ + + org.opendaylight.mdsal + mdsal-binding-dom-codec + org.opendaylight.mdsal mdsal-dom-broker diff --git a/binding/yang-binding/src/main/java/module-info.java b/binding/yang-binding/src/main/java/module-info.java index c4015e8eae..2aba738bf7 100644 --- a/binding/yang-binding/src/main/java/module-info.java +++ b/binding/yang-binding/src/main/java/module-info.java @@ -16,8 +16,6 @@ module org.opendaylight.yangtools.yang.binding { // Annotations requires static transitive org.eclipse.jdt.annotation; - // FIXME: yeah, because ... we use this in public classes, so tools need - // to resolve it. Why exactly?! - requires static transitive com.github.spotbugs.annotations; + requires static com.github.spotbugs.annotations; requires static org.checkerframework.checker.qual; } diff --git a/dom/mdsal-dom-api/src/main/java/module-info.java b/dom/mdsal-dom-api/src/main/java/module-info.java index de37454ad8..96c88e0be4 100644 --- a/dom/mdsal-dom-api/src/main/java/module-info.java +++ b/dom/mdsal-dom-api/src/main/java/module-info.java @@ -21,7 +21,7 @@ module org.opendaylight.mdsal.dom.api { requires org.opendaylight.yangtools.util; // Annotations - requires static transitive com.github.spotbugs.annotations; + requires static com.github.spotbugs.annotations; requires static transitive org.checkerframework.checker.qual; requires static transitive org.eclipse.jdt.annotation; } diff --git a/dom/mdsal-dom-broker/src/main/java/module-info.java b/dom/mdsal-dom-broker/src/main/java/module-info.java index df0dbb282e..fbb06d8fb3 100644 --- a/dom/mdsal-dom-broker/src/main/java/module-info.java +++ b/dom/mdsal-dom-broker/src/main/java/module-info.java @@ -22,6 +22,7 @@ module org.opendaylight.mdsal.dom.broker { // Annotations requires static transitive java.annotation; requires static transitive javax.inject; + requires static com.github.spotbugs.annotations; requires static org.kohsuke.metainf_services; requires static org.osgi.service.component.annotations; requires static org.osgi.service.metatype.annotations; diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml index e0756287b9..05704197bb 100644 --- a/dom/mdsal-dom-schema-osgi/pom.xml +++ b/dom/mdsal-dom-schema-osgi/pom.xml @@ -20,11 +20,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - org.opendaylight.mdsal mdsal-dom-spi diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java index 31e1edf8fc..e8a4421589 100644 --- a/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java +++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java @@ -15,6 +15,7 @@ module org.opendaylight.mdsal.eos.binding.dom.adapter { requires org.slf4j; // Annotations + requires static com.github.spotbugs.annotations; requires static javax.inject; requires static org.osgi.service.component.annotations; } diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml index 30a035aa03..2b8c50e1ab 100644 --- a/entityownership/mdsal-eos-binding-api/pom.xml +++ b/entityownership/mdsal-eos-binding-api/pom.xml @@ -19,11 +19,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml index 305f4a8030..fe2eae57f9 100644 --- a/entityownership/mdsal-eos-dom-simple/pom.xml +++ b/entityownership/mdsal-eos-dom-simple/pom.xml @@ -19,11 +19,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - com.google.guava guava diff --git a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java index ab70eee986..08410399d9 100644 --- a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java +++ b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java @@ -18,7 +18,6 @@ module org.opendaylight.mdsal.eos.dom.simple { provides DOMEntityOwnershipService with SimpleDOMEntityOwnershipService; // Annotations - requires static com.github.spotbugs.annotations; requires static javax.inject; requires static org.eclipse.jdt.annotation; requires static org.checkerframework.checker.qual; diff --git a/yanglib/mdsal-yanglib-rfc8525/pom.xml b/yanglib/mdsal-yanglib-rfc8525/pom.xml index 304db1f856..518b283b1a 100644 --- a/yanglib/mdsal-yanglib-rfc8525/pom.xml +++ b/yanglib/mdsal-yanglib-rfc8525/pom.xml @@ -22,11 +22,6 @@ bundle - - com.github.spotbugs - spotbugs-annotations - true - org.opendaylight.mdsal mdsal-yanglib-api diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java index 7503121b6e..5ba1f1d37f 100644 --- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java +++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java @@ -37,7 +37,6 @@ module org.opendaylight.mdsal.yanglib.rfc8525 { requires org.slf4j; // Annotations - requires static com.github.spotbugs.annotations; requires static javax.inject; requires static org.kohsuke.metainf_services; requires static org.osgi.service.component.annotations; -- 2.36.6