From c71020f92c95d29c3e558a0b92d3736333b6ea58 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 23 Jun 2021 23:02:37 +0200
Subject: [PATCH] Cleanup aaa-shiro-api dependencies

We do not require aaa-authn-api, do not pull it in.

Change-Id: I3349b1261c6adc6f2463a771aef2a2ca4696d8ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 aaa-shiro/api/pom.xml  | 30 ++++++++++--------------------
 aaa-shiro/impl/pom.xml |  6 +++++-
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/aaa-shiro/api/pom.xml b/aaa-shiro/api/pom.xml
index b96b0605a..9f9fc4503 100644
--- a/aaa-shiro/api/pom.xml
+++ b/aaa-shiro/api/pom.xml
@@ -24,26 +24,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-authn-api</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              !javax.annotation,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index f7e506a35..1328fe7e6 100644
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -25,7 +25,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authn-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro-api</artifactId>
         </dependency>
 
-- 
2.36.6