diff --git a/pom.xml b/pom.xml index 9ea0996819..4aab596c28 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-configuration - 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 @@ - commons-beanutils - commons-beanutils - 1.10.0 + org.apache.commons + commons-beanutils2 + 2.0.0-M1 true diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java index 58678637e2..fe221bddaf 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java +++ b/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; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java index 87eb383909..2fe8ecd64f 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java +++ b/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; diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java index 25d1ba47a2..261564128a 100644 --- a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java +++ b/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; diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java index e995b8480b..c99d83b01c 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java +++ b/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; /** diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java b/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java index a8d750ce88..05d1c0ef6a 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java +++ b/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; /** *

diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java index 42ade0b73d..7c61f36a29 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java +++ b/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; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java index f4d993e792..5ef126f0dc 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java +++ b/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; diff --git a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java b/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java index 7f579abd3e..ca83528058 100644 --- a/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java +++ b/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; diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java index 4fe253e502..8cb00541d6 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java +++ b/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;