From c32b985658c9c3b743c527be058fcbe9d1501f82 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 30 Mar 2021 12:57:40 -0700
Subject: [PATCH] GUACAMOLE-1298: Correct Maven dependency version conflicts
 within RADIUS support.

---
 extensions/guacamole-auth-radius/pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index 8447d5796..047f6d557 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -219,10 +219,26 @@
             <artifactId>jradius-core</artifactId>
             <version>1.1.5</version>
             <exclusions>
+
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+
+                <!-- Rely on Guacamole's existing use of logback rather than log4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+
             </exclusions>
         </dependency>
 
@@ -240,6 +256,14 @@
             <version>1.1.5</version>
         </dependency>
 
+        <!-- Force single, specific version commons-logging (multiple
+            dependencies reference multiple versions of this). -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
     </dependencies>
 
 </project>