From 7c78c4cbe4799915305bc6710ea465c715dd8e88 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 21 Nov 2024 21:24:42 +0100
Subject: [PATCH] Clean up odl-aaa-shiro dependencies

Do not use project.version, picking the declarations from artifacts.

Change-Id: Ie6e2f0bd8a5b269e9f7403686d93b48e230b6103
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6ef12ddbbd5bd07b686b42a5c717a5d82725998d)
---
 artifacts/pom.xml              | 31 ++++++++++++++++++++++++++-----
 features/odl-aaa-shiro/pom.xml |  7 -------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e9188a0e7..9ec96ec6d 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -88,22 +88,36 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro</artifactId>
+                <artifactId>aaa-shiro-api</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>aaa-app-config</classifier>
             </dependency>
-
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-shiro-api</artifactId>
+                <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-shiro</artifactId>
+                <version>${project.version}</version>
+                <type>py</type>
+                <classifier>idmtool</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>aaa-app-config</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>aaa-shiro</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>aaa-datastore-config</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-tokenauthrealm</artifactId>
@@ -199,6 +213,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.aaa</groupId>
+                <artifactId>odl-aaa-password-service</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-aaa-shiro</artifactId>
diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index f6824f328..3eefc0f77 100644
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-password-service</artifactId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -70,7 +69,6 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-encryption-service</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -81,28 +79,24 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-api</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-cert</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>aaa-app-config</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>aaa-datastore-config</classifier>
         </dependency>
@@ -125,7 +119,6 @@
             <!-- finalname="bin/idmtool" -->
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
-            <version>${project.version}</version>
             <type>py</type>
             <classifier>idmtool</classifier>
         </dependency>