From 348bbbf53f0f3dbeb62a28dd8da343db5dc8170e Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 29 Nov 2016 21:05:10 -0800
Subject: [PATCH 1/2] GUACAMOLE-133: Remove unnecessary bundled SLF4J from JDBC
 auth.

---
 .../modules/guacamole-auth-jdbc-base/pom.xml               | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index aa2c45f3b..4241781fc 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -105,13 +105,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- SLF4J - logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-
         <!-- MyBatis -->
         <dependency>
             <groupId>org.mybatis</groupId>

From 621af69f87b8bc66f86321b48054177d2996f91b Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Fri, 2 Dec 2016 14:24:32 -0800
Subject: [PATCH 2/2] GUACAMOLE-133: Exclude StAX dependency, which is part of
 Java 6.

---
 guacamole/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 544bf7e0e..2af9a753b 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -480,6 +480,15 @@
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
             <version>1.17.1</version>
+
+            <!-- Exclude StAX API, which is part of Java 6 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+
         </dependency>
 
     </dependencies>