Upgradle to Commons Lang3 3.13.0

Migrate Commons Lang 2.6 to Commons Lang3 3.13.0 Closes gh-33
graceframework · Dec 18, 2024 · 44ea8f9 · 44ea8f9
1 parent 526da06
commit 44ea8f9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy b/app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy
@@ -19,7 +19,7 @@ package grails.plugin.formfields
 import grails.core.GrailsApplication
 import groovy.transform.CompileStatic
 import groovy.xml.MarkupBuilder
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 import org.grails.buffer.FastStringWriter
 import org.grails.datastore.mapping.model.MappingContext
 import org.grails.datastore.mapping.model.PersistentEntity

diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 	api "org.graceframework:grace-datastore-core:$gormVersion"
 	api "org.graceframework:grace-datastore-gorm:$gormVersion"
 	api "org.graceframework:grace-scaffolding-core:$scaffoldingVersion"
-	api "commons-lang:commons-lang:2.6"
+	api "org.apache.commons:commons-lang3:3.13.0"
 	compileOnly "org.graceframework:grace-boot"
 	compileOnly "jakarta.servlet:jakarta.servlet-api"
 

diff --git a/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy b/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy
@@ -22,7 +22,7 @@ import grails.util.GrailsNameUtils
 import grails.web.databinding.WebDataBinding
 import groovy.transform.Canonical
 import groovy.transform.CompileStatic
-import org.apache.commons.lang.ClassUtils
+import org.apache.commons.lang3.ClassUtils
 import grails.core.*
 import grails.plugins.VersionComparator
 import org.grails.datastore.gorm.GormEntity
@@ -125,7 +125,7 @@ class BeanPropertyAccessorImpl implements BeanPropertyAccessor {
 	@CompileStatic
 	private List<Class> getSuperclassesAndInterfaces(Class type) {
 		List<Class> superclasses = new ArrayList<>()
-		superclasses.addAll((List<Class>) ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type)))
+		superclasses.addAll(ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type)))
 		for(Object it in ClassUtils.getAllInterfaces(type)) {
 			Class interfaceCls = (Class)it
 			String name = interfaceCls.name

diff --git a/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy b/src/main/groovy/grails/plugin/formfields/DelegatingBeanPropertyAccessorImpl.groovy
@@ -7,7 +7,7 @@ import grails.validation.Validateable
 import grails.web.databinding.WebDataBinding
 import groovy.transform.Canonical
 import groovy.transform.CompileStatic
-import org.apache.commons.lang.ClassUtils
+import org.apache.commons.lang3.ClassUtils
 import org.grails.datastore.gorm.GormEntity
 import org.grails.datastore.gorm.GormValidateable
 import org.grails.datastore.mapping.dirty.checking.DirtyCheckable
@@ -143,7 +143,7 @@ class DelegatingBeanPropertyAccessorImpl implements BeanPropertyAccessor {
 
 	private List<Class> getSuperclassesAndInterfaces(Class type) {
 		List<Class> superclasses = new ArrayList<>()
-		superclasses.addAll((List<Class>) ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type)))
+		superclasses.addAll(ClassUtils.getAllSuperclasses(ClassUtils.primitiveToWrapper(type)))
 		for (Object it in ClassUtils.getAllInterfaces(type)) {
 			Class interfaceCls = (Class) it
 			String name = interfaceCls.name

diff --git a/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy b/src/main/groovy/grails/plugin/formfields/PropertyPathAccessor.groovy
@@ -15,7 +15,7 @@ import org.springframework.context.support.StaticMessageSource
 import org.springframework.validation.FieldError
 import static grails.plugin.formfields.BeanPropertyAccessorFactory.stripIndex
 import static java.util.Collections.EMPTY_LIST
-import static org.apache.commons.lang.StringUtils.substringAfterLast
+import static org.apache.commons.lang3.StringUtils.substringAfterLast
 import grails.core.*
 
 @CompileStatic