GUACAMOLE-773: Merge update all Java dependencies to latest available stable versions.

extensions/guacamole-auth-cas/pom.xml

@@ -51,13 +51,7 @@
         <dependency>
             <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>
+            <version>3.6.2</version>
         </dependency>
         
         <!-- Guava - Utility Library -->
@@ -71,10 +65,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>

extensions/guacamole-auth-duo/pom.xml

@@ -147,10 +147,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>

extensions/guacamole-auth-header/pom.xml

@@ -52,10 +52,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>

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.4.6</version>
+            <version>3.5.6</version>
         </dependency>
         
         <!-- MyBatis Guice -->
@@ -72,10 +72,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Guava - Utility Library -->
         <dependency>

extensions/guacamole-auth-json/pom.xml

@@ -52,10 +52,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Jackson for JSON support -->
         <dependency>
@@ -81,7 +77,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>5.4.1</version>
+            <version>5.4.5</version>
         </dependency>
 
     </dependencies>

extensions/guacamole-auth-ldap/pom.xml

@@ -51,13 +51,7 @@
         <dependency>
             <groupId>org.apache.directory.api</groupId>
             <artifactId>api-all</artifactId>
-            <version>2.0.0.AM4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.0.1</version>
         </dependency>
 
         <!-- Guice -->
@@ -65,10 +59,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
     </dependencies>
 

extensions/guacamole-auth-openid/pom.xml

@@ -102,13 +102,7 @@
         <dependency>
             <groupId>org.bitbucket.b_c</groupId>
             <artifactId>jose4j</artifactId>
-            <version>0.5.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>0.7.6</version>
         </dependency>
 
         <!-- Guice -->
@@ -116,10 +110,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>

extensions/guacamole-auth-quickconnect/pom.xml

@@ -107,10 +107,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Jersey - JAX-RS Implementation -->
         <dependency>
@@ -124,7 +120,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <scope>test</scope>
         </dependency>
 

extensions/guacamole-auth-radius/pom.xml

@@ -130,10 +130,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>
@@ -150,14 +146,15 @@
             <version>1.1.5</version>
             <exclusions>
 
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
+                <!-- Force consistent versions of Apache Commons libraries (see below) -->
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
 
                 <!-- Rely on Guacamole's existing use of logback rather than log4j -->
                 <exclusion>
@@ -186,13 +183,18 @@
             <version>1.1.5</version>
         </dependency>
 
-        <!-- Force single, specific version commons-logging (multiple
-            dependencies reference multiple versions of this). -->
+        <!-- Force single, specific versions of Apache Commons libraries
+            (multiple dependencies reference multiple versions of these). -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2</version>
+        </dependency>
 
     </dependencies>
 

extensions/guacamole-auth-saml/pom.xml

@@ -52,10 +52,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>
@@ -77,15 +73,26 @@
         <dependency>
             <groupId>com.onelogin</groupId>
             <artifactId>java-saml</artifactId>
-            <version>2.5.0</version>
+            <version>2.6.0</version>
             <exclusions>
+
+                <!-- Force consistent version of commons-codec (see below) -->
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
                 </exclusion>
+
             </exclusions>
         </dependency>
 
+        <!-- Force single, specific version of commons-codec (multiple
+            dependencies reference multiple versions of this). -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+
     </dependencies>
 
 </project>

extensions/guacamole-auth-totp/pom.xml

@@ -142,10 +142,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
 
         <!-- Java servlet API -->
         <dependency>
@@ -159,7 +155,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
 
@@ -167,12 +162,12 @@
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.3.1</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.3.1</version>
+            <version>3.4.1</version>
         </dependency>
 
         <!-- Guacamole depends on an implementation of JAX-WS -->

extensions/pom.xml

@@ -89,9 +89,45 @@
                 </executions>
             </plugin>
 
+            <!-- Verify that SLF4J is *NEVER* bundled within extensions (it
+                will conflict with the version bundled with the webapp) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>never-bundle-slf4j</id>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>org.slf4j:*:*:*:compile</exclude>
+                                        <exclude>org.slf4j:*:*:*:runtime</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
+    <dependencies>
+
+        <!-- SLF4J is always available via the webapp -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+    </dependencies>
+
     <profiles>
 
         <!-- Build extensions with LGPL-licensed dependencies only if explicitly requested -->