remove commons-lang

grails · Oct 13, 2024 · 5fbe185 · 5fbe185
1 parent d88550c
commit 5fbe185
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 asset-pipeline = '5.0.1'
-commons-lang = '2.6'
+commons-text = '1.1'
 ehcache = '3.10.8'
 geb = '7.0'
 gorm-hibernate5 = '9.0.0-SNAPSHOT'
@@ -25,7 +25,7 @@ spring-security = '6.3.3'
 tomcat = '10.1.29'
 
 [libraries]
-commons-lang = { module = 'commons-lang:commons-lang', version.ref = 'commons-lang' }
+commons-text = { module = 'org.apache.commons:commons-text', version.ref = 'commons-text' }
 ehcache = { module = 'org.ehcache:ehcache', version.ref = 'ehcache' }
 geb-core = { module = 'org.gebish:geb-core', version.ref = 'geb' }
 geb-spock = { module = 'org.gebish:geb-spock', version.ref = 'geb' }

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -9,12 +9,12 @@ plugins {
 
 group = 'org.grails.plugins'
 
-configurations {
-    all {
-        exclude group: 'javax.servlet'
-    }
-}
-
+configurations {
+    all {
+        exclude group: 'javax.servlet'
+    }
+}
+
 dependencies {
 
 	api libs.grails.core
@@ -32,7 +32,7 @@ dependencies {
 	api libs.spring.security.web
 	api libs.spring.web
 
-	implementation libs.commons.lang
+	implementation libs.commons.text
 	implementation libs.ehcache
 	implementation libs.grails.bootstrap
 	implementation libs.grails.converters

diff --git a/plugin/src/main/groovy/grails/plugin/springsecurity/SpringSecurityUtils.groovy b/plugin/src/main/groovy/grails/plugin/springsecurity/SpringSecurityUtils.groovy
@@ -21,7 +21,7 @@ import grails.util.Environment
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
-import org.apache.commons.lang.StringEscapeUtils
+import org.apache.commons.text.StringEscapeUtils
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.ApplicationContext
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy
@@ -617,7 +617,7 @@ final class SpringSecurityUtils {
 	static String getLastUsername(HttpSession session) {
 		String username = (String)session.getAttribute(SPRING_SECURITY_LAST_USERNAME_KEY)
 		if (username) {
-			username = StringEscapeUtils.unescapeHtml(username)
+			username = StringEscapeUtils.unescapeHtml4(username)
 		}
 		username
 	}