From 73744d22f955b7b1522a2152ccb2cd01cb86837e Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Sun, 2 Dec 2018 15:43:12 -0500
Subject: [PATCH 1/2] GUACAMOLE-670: Add slf4j logging to modules to avoid
 pulling in conflicting versions.

---
 extensions/guacamole-auth-cas/pom.xml    | 7 +++++++
 extensions/guacamole-auth-radius/pom.xml | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index be07c6482..323b66735 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -249,6 +249,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- slf4j Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.7</version>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index 151875cf1..af838d8a6 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -230,6 +230,14 @@
             <artifactId>jradius-extended</artifactId>
             <version>1.1.5</version>
         </dependency>
+        
+        <!-- slf4j Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.7</version>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

From 95dfb5e7657a5685500f18497230ffcb8916b538 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Mon, 3 Dec 2018 07:35:22 -0500
Subject: [PATCH 2/2] GUACAMOLE-670: Use exclusion to block loading of
 duplicate slf4j.

---
 extensions/guacamole-auth-cas/pom.xml    | 14 ++++++--------
 extensions/guacamole-auth-radius/pom.xml | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index 323b66735..ae8bd6739 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -227,6 +227,12 @@
             <groupId>org.jasig.cas.client</groupId>
             <artifactId>cas-client-core</artifactId>
             <version>3.4.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Guice -->
@@ -249,14 +255,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- slf4j Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index af838d8a6..d07a60a87 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -215,6 +215,12 @@
             <groupId>net.jradius</groupId>
             <artifactId>jradius-core</artifactId>
             <version>1.1.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- JRadius Dictionary, for accessing packet attributes -->
@@ -230,14 +236,6 @@
             <artifactId>jradius-extended</artifactId>
             <version>1.1.5</version>
         </dependency>
-        
-        <!-- slf4j Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
-            <scope>provided</scope>
-        </dependency>
 
     </dependencies>