remove commons-lang

grails · Oct 13, 2024 · 8ea230e · 8ea230e
1 parent 0d6c63e
commit 8ea230e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/grails-plugin-gsp/build.gradle b/grails-plugin-gsp/build.gradle
@@ -18,7 +18,7 @@ dependencies {
  api project(":grails-web-gsp-taglib")
 
  runtimeOnly(project(":grails-web-jsp"))
- api "commons-lang:commons-lang:2.6"
+ api "org.apache.commons:commons-text:1.1"
  api "org.grails:grails-plugin-codecs:$grailsVersion"
  astImplementation "org.grails:grails-web:$grailsVersion"
  astImplementation "org.grails:grails-plugin-controllers:$grailsVersion"

diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy
@@ -19,7 +19,7 @@ import grails.artefact.TagLibrary
 import grails.gsp.TagLib
 import groovy.transform.CompileStatic
 import groovy.xml.MarkupBuilder
-import org.apache.commons.lang.StringEscapeUtils
+import org.apache.commons.text.StringEscapeUtils
 import org.grails.encoder.CodecLookup
 import org.grails.encoder.Encoder
 import org.grails.taglib.GroovyPageAttributes
@@ -265,7 +265,7 @@ class ValidationTagLib implements TagLibrary {
  error(object: it.objectName,
  field: it.field,
  message: message(error: it)?.toString(),
- 'rejected-value': StringEscapeUtils.escapeXml(it.rejectedValue))
+ 'rejected-value': StringEscapeUtils.escapeXml10(it.rejectedValue))
  })
  }
  }

diff --git a/grails-plugin-gsp/src/test/groovy/org/grails/web/taglib/SelectTagTests.groovy b/grails-plugin-gsp/src/test/groovy/org/grails/web/taglib/SelectTagTests.groovy
@@ -1,7 +1,7 @@
 package org.grails.web.taglib
 
 import groovy.xml.XmlSlurper
-import org.apache.commons.lang.WordUtils
+import org.apache.commons.text.WordUtils
 import org.junit.jupiter.api.Test
 import org.springframework.context.MessageSourceResolvable
 import org.springframework.web.servlet.support.RequestContextUtils as RCU