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>
opendaylight · Dec 2, 2024 · 05426cd · 05426cd
1 parent 7f362c9
commit 05426cd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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>