From e6279a6388825f2e16d80ee96aac06333bcbfe17 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 14 Nov 2021 11:27:43 +0100
Subject: [PATCH] Clean up IMDS dependencies

Fix dependency declarations and make sure we do not need error-prone.

Change-Id: Ie015e508cf352fc0f28c03bb9b99879773fd0aba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 dom/mdsal-dom-inmemory-datastore/pom.xml                    | 4 ++--
 .../inmemory/InMemoryDOMDataStoreConfigProperties.java      | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index 63064805de..ab639b7fdd 100644
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -59,8 +59,8 @@
             <artifactId>yang-data-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java
index ba701d4684..3365d4045d 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import javax.annotation.processing.Generated;
 import org.eclipse.jdt.annotation.NonNull;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Style.ImplementationVisibility;
@@ -19,7 +21,9 @@ import org.immutables.value.Value.Style.ImplementationVisibility;
  * @see InMemoryDOMDataStoreFactory
  */
 @Value.Immutable
-@Value.Style(visibility = ImplementationVisibility.PRIVATE)
+@Value.Style(visibility = ImplementationVisibility.PRIVATE, allowedClasspathAnnotations = {
+    SuppressWarnings.class, Generated.class, SuppressFBWarnings.class,
+})
 public abstract class InMemoryDOMDataStoreConfigProperties {
 
     public static final int DEFAULT_MAX_DATA_CHANGE_EXECUTOR_QUEUE_SIZE = 1000;
-- 
2.36.6