From 05426cdc01b04be0e2fa45bd038d33ae4d935c90 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 2 Dec 2024 12:10:45 +0100
Subject: [PATCH] Exclude commons-logging from generated features

commons-logging is provided by pax-logging in Karaf, hence it should not
be part of generated features.

JIRA: AAA-286
Change-Id: Ife1af98d1906888c8b82acd547355cc49c1cee4b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/odl-aaa-password-service/pom.xml            | 12 ++++++++++++
 features/odl-aaa-shiro/pom.xml                       |  6 ++++++
 features/odl-apache-shiro/pom.xml                    |  6 ++++++
 .../src/main/history/dependencies.xml                |  1 -
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index b558f1633..9ef3fc66f 100644
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -44,12 +44,24 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-password-service-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-password-service-impl</artifactId>
             <classifier>aaa-password-service-config</classifier>
             <type>xml</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 23fb9069f..343e20658 100644
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -94,6 +94,12 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-jetty-auth-log-filter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index d14fe632f..47dcdfc13 100644
--- a/features/odl-apache-shiro/pom.xml
+++ b/features/odl-apache-shiro/pom.xml
@@ -53,6 +53,12 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>repackaged-shiro</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-apache-shiro/src/main/history/dependencies.xml b/features/odl-apache-shiro/src/main/history/dependencies.xml
index 82e6f717e..b8f88cbc3 100644
--- a/features/odl-apache-shiro/src/main/history/dependencies.xml
+++ b/features/odl-apache-shiro/src/main/history/dependencies.xml
@@ -4,7 +4,6 @@
         <feature>odl-servlet-api</feature>
         <bundle>mvn:commons-beanutils/commons-beanutils/1.9.4</bundle>
         <bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
-        <bundle>mvn:commons-logging/commons-logging/1.3.1</bundle>
         <bundle>mvn:org.opendaylight.aaa/repackaged-shiro/${project.version}</bundle>
         <bundle>mvn:org.owasp.encoder/encoder/1.2.3</bundle>
     </feature>