From 1bff62219d52f06e6f957e27b17386b194b95f51 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Sat, 12 Oct 2024 23:00:32 -0500 Subject: [PATCH] update to commons-lang3 --- grails-plugin-gsp/build.gradle | 3 ++- .../org/grails/plugins/web/taglib/ValidationTagLib.groovy | 4 ++-- .../test/groovy/org/grails/web/taglib/SelectTagTests.groovy | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/grails-plugin-gsp/build.gradle b/grails-plugin-gsp/build.gradle index 723e5df6a4..c7f2608254 100644 --- a/grails-plugin-gsp/build.gradle +++ b/grails-plugin-gsp/build.gradle @@ -18,7 +18,8 @@ dependencies { api project(":grails-web-gsp-taglib") runtimeOnly(project(":grails-web-jsp")) - api "commons-lang:commons-lang:2.6" + api "org.apache.commons:commons-lang3:3.17.0" + 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 index b36082b118..e0d9b8b9c4 100644 --- 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 index f4ebd88092..de6799d4e4 100644 --- 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.lang3.text.WordUtils import org.junit.jupiter.api.Test import org.springframework.context.MessageSourceResolvable import org.springframework.web.servlet.support.RequestContextUtils as RCU