From 4c8ba81c10752245cea38bfaa27829b80d8ddfb9 Mon Sep 17 00:00:00 2001
From: Mike Jumper <mjumper@apache.org>
Date: Sun, 6 Nov 2022 18:33:59 -0800
Subject: [PATCH] GUACAMOLE-1594: Override transitive common-text for LDAP with
 latest release (1.10.0).

---
 .../NOTICE.txt                                     |  2 +-
 .../README                                         |  2 +-
 .../apache-commons-text-1.10.0/dep-coordinates.txt |  1 +
 .../apache-commons-text-1.9/dep-coordinates.txt    |  1 -
 extensions/guacamole-auth-ldap/pom.xml             | 14 ++++++++++++++
 5 files changed, 17 insertions(+), 3 deletions(-)
 rename doc/licenses/{apache-commons-text-1.9 => apache-commons-text-1.10.0}/NOTICE.txt (70%)
 rename doc/licenses/{apache-commons-text-1.9 => apache-commons-text-1.10.0}/README (92%)
 create mode 100644 doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-text-1.9/dep-coordinates.txt

diff --git a/doc/licenses/apache-commons-text-1.9/NOTICE.txt b/doc/licenses/apache-commons-text-1.10.0/NOTICE.txt
similarity index 70%
rename from doc/licenses/apache-commons-text-1.9/NOTICE.txt
rename to doc/licenses/apache-commons-text-1.10.0/NOTICE.txt
index 2731b6259..4e1f8dbb8 100644
--- a/doc/licenses/apache-commons-text-1.9/NOTICE.txt
+++ b/doc/licenses/apache-commons-text-1.10.0/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons Text
-Copyright 2014-2020 The Apache Software Foundation
+Copyright 2014-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-text-1.9/README b/doc/licenses/apache-commons-text-1.10.0/README
similarity index 92%
rename from doc/licenses/apache-commons-text-1.9/README
rename to doc/licenses/apache-commons-text-1.10.0/README
index 943d6202d..75ec334bd 100644
--- a/doc/licenses/apache-commons-text-1.9/README
+++ b/doc/licenses/apache-commons-text-1.10.0/README
@@ -1,7 +1,7 @@
 Apache Commons Text (https://commons.apache.org/proper/commons-text/)
 ---------------------------------------------------------------------
 
-    Version: 1.9
+    Version: 1.10.0
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
diff --git a/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt
new file mode 100644
index 000000000..221ed51bb
--- /dev/null
+++ b/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.commons:commons-text:jar:1.10.0
diff --git a/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt
deleted file mode 100644
index ab50b2f30..000000000
--- a/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons:commons-text:jar:1.9
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 2d2c0803d..e548d19c0 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -61,6 +61,12 @@
                     <artifactId>commons-lang3</artifactId>
                 </exclusion>
 
+                <!-- Use latest version of commons-text -->
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                </exclusion>
+
             </exclusions>
         </dependency>
 
@@ -72,6 +78,14 @@
             <version>3.12.0</version>
         </dependency>
 
+        <!-- Force latest version of commons-text (transitive dependency from
+        Apache Directory API -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+
         <!-- Guice -->
         <dependency>
             <groupId>com.google.inject</groupId>