CONFIGURATION-776: Upgrade to BeanUtils2

Author: melloware

pom.xml

@@ -48,7 +48,7 @@
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration</commons.scmPubUrl>
     <!-- Explicitly declare optional dependencies for the OSGi manifest. -->
     <commons.osgi.import>
-      org.apache.commons.beanutils.*;resolution:=optional,
+      org.apache.commons.beanutils2.*;resolution:=optional,
       org.apache.commons.codec.*;resolution:=optional,
       org.apache.commons.jxpath.*;resolution:=optional,
       org.apache.xml.resolver.*;resolution:=optional,
@@ -136,9 +136,9 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.10.0</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-beanutils2</artifactId>
+      <version>2.0.0-M1</version>
       <optional>true</optional>
     </dependency>
 

src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java

@@ -27,13 +27,13 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.apache.commons.beanutils.ConvertUtilsBean;
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
-import org.apache.commons.beanutils.PropertyUtilsBean;
-import org.apache.commons.beanutils.WrapDynaBean;
-import org.apache.commons.beanutils.WrapDynaClass;
+import org.apache.commons.beanutils2.BeanUtilsBean;
+import org.apache.commons.beanutils2.ConvertUtilsBean;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.FluentPropertyBeanIntrospector;
+import org.apache.commons.beanutils2.PropertyUtilsBean;
+import org.apache.commons.beanutils2.WrapDynaBean;
+import org.apache.commons.beanutils2.WrapDynaClass;
 import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.lang3.ClassUtils;
 

src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java

@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.ConfigurationMap;
 import org.apache.commons.configuration2.SubsetConfiguration;

src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java

@@ -21,9 +21,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java

@@ -21,9 +21,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
 import org.apache.commons.configuration2.beanutils.BeanHelper;
 
 /**

src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java

@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
 
 /**
  * <p>

src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java

@@ -64,7 +64,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
 import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;

src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java

@@ -31,8 +31,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.LazyDynaBean;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.LazyDynaBean;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java

@@ -29,7 +29,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.DynaProperty;
 import org.apache.commons.configuration2.BaseConfiguration;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.MapConfiguration;

src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java

@@ -26,9 +26,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.LazyDynaBean;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.LazyDynaBean;
+import org.apache.commons.beanutils2.PropertyUtils;
 import org.apache.commons.configuration2.builder.BasicBuilderParameters;
 import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
 import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;