Merge 1.4.0 changes back to master.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml

@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.6</version>
+            <version>3.5.9</version>
         </dependency>
         
         <!-- MyBatis Guice -->

extensions/guacamole-auth-json/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>5.4.5</version>
+            <version>5.6.1</version>
         </dependency>
 
     </dependencies>

extensions/guacamole-auth-ldap/pom.xml

@@ -51,7 +51,21 @@
         <dependency>
             <groupId>org.apache.directory.api</groupId>
             <artifactId>api-all</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.mina</groupId>
+                    <artifactId>mina-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Override version of Apache Mina specified by Apache Directory API
+            with latest compatible version -->
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>2.1.5</version>
         </dependency>
 
         <!-- Guice -->

extensions/guacamole-auth-radius/pom.xml

@@ -188,7 +188,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml

@@ -55,7 +55,17 @@
         <dependency>
             <groupId>org.jasig.cas.client</groupId>
             <artifactId>cas-client-core</artifactId>
-            <version>3.6.2</version>
+            <version>3.6.4</version>
+            <exclusions>
+
+                <!-- Resolve version conflict (see below - transitive
+                    dependencies of cas-client-core disagree on 2.3.0 vs. 2.3.1) -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+
+            </exclusions>
         </dependency>
         
         <!-- Guava - Utility Library -->
@@ -99,6 +109,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Force use of version 2.3.1 (transitive dependencies of
+            cas-client-core disagree on 2.3.0. vs. 2.3.1) -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
     </dependencies>
 
 </project>

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml

@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.bitbucket.b_c</groupId>
             <artifactId>jose4j</artifactId>
-            <version>0.7.6</version>
+            <version>0.7.9</version>
         </dependency>
 
         <!-- Guice -->

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>com.onelogin</groupId>
             <artifactId>java-saml</artifactId>
-            <version>2.6.0</version>
+            <version>2.8.0</version>
             <exclusions>
 
                 <!-- Force consistent version of commons-codec (see below) -->