diff --git a/empire-db-examples/pom.xml b/empire-db-examples/pom.xml
index b9f24769..e03edff5 100644
--- a/empire-db-examples/pom.xml
+++ b/empire-db-examples/pom.xml
@@ -27,8 +27,8 @@
Apache Empire-db Examples
- commons-beanutils
- commons-beanutils
+ org.apache.commons
+ commons-beanutils2
diff --git a/empire-db/pom.xml b/empire-db/pom.xml
index 956dd772..4606b83f 100644
--- a/empire-db/pom.xml
+++ b/empire-db/pom.xml
@@ -27,8 +27,8 @@
Apache Empire-db Core
- commons-beanutils
- commons-beanutils
+ org.apache.commons
+ commons-beanutils2
org.slf4j
diff --git a/empire-db/src/main/java/org/apache/empire/commons/BeanPropertyUtils.java b/empire-db/src/main/java/org/apache/empire/commons/BeanPropertyUtils.java
index 307679f1..4e3cbad4 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/BeanPropertyUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/BeanPropertyUtils.java
@@ -22,9 +22,9 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.apache.commons.beanutils.ConvertUtilsBean;
-import org.apache.commons.beanutils.PropertyUtilsBean;
+import org.apache.commons.beanutils2.BeanUtilsBean;
+import org.apache.commons.beanutils2.ConvertUtilsBean;
+import org.apache.commons.beanutils2.PropertyUtilsBean;
import org.apache.empire.exceptions.BeanPropertyGetException;
import org.apache.empire.exceptions.BeanPropertySetException;
import org.apache.empire.exceptions.InvalidArgumentException;
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ClassUtils.java b/empire-db/src/main/java/org/apache/empire/commons/ClassUtils.java
index c2e49f54..d9189e5f 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ClassUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ClassUtils.java
@@ -33,7 +33,7 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.commons.beanutils.ConstructorUtils;
+import org.apache.commons.beanutils2.ConstructorUtils;
import org.apache.empire.exceptions.BeanInstantiationException;
import org.apache.empire.exceptions.BeanMethodInvokeException;
import org.apache.empire.exceptions.InternalException;
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java b/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
index 47212005..31f00ae9 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
@@ -33,7 +33,7 @@
import java.util.List;
import java.util.Locale;
-import org.apache.commons.beanutils.MethodUtils;
+import org.apache.commons.beanutils2.MethodUtils;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
import org.apache.empire.exceptions.InvalidArgumentException;
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ValueUtils.java b/empire-db/src/main/java/org/apache/empire/commons/ValueUtils.java
index a61b62c8..b78a17cd 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ValueUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ValueUtils.java
@@ -31,7 +31,7 @@
import java.util.Date;
import java.util.Locale;
-import org.apache.commons.beanutils.MethodUtils;
+import org.apache.commons.beanutils2.MethodUtils;
import org.apache.empire.data.Column;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.data.DataType;
diff --git a/empire-db/src/main/java/org/apache/empire/data/DataType.java b/empire-db/src/main/java/org/apache/empire/data/DataType.java
index 0d56a5d6..76176bcd 100644
--- a/empire-db/src/main/java/org/apache/empire/data/DataType.java
+++ b/empire-db/src/main/java/org/apache/empire/data/DataType.java
@@ -23,7 +23,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import org.apache.commons.beanutils.MethodUtils;
+import org.apache.commons.beanutils2.MethodUtils;
/**
* DataType is an enumeration of data types that are supported
diff --git a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
index daa07953..4346f0b1 100644
--- a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
+++ b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.beanutils.MethodUtils;
+import org.apache.commons.beanutils2.MethodUtils;
import org.apache.empire.commons.ClassUtils;
import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.commons.StringUtils;
diff --git a/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java b/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
index 6ba23c3b..565bffb3 100644
--- a/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
+++ b/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
@@ -33,8 +33,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils2.BeanUtils;
+import org.apache.commons.beanutils2.PropertyUtils;
import org.apache.empire.commons.ObjectUtils;
import org.apache.empire.commons.StringUtils;
import org.apache.empire.exceptions.EmpireException;
diff --git a/pom.xml b/pom.xml
index 616640f4..f1e30f57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,11 +291,11 @@
1.2.19
-->
-
+
- commons-beanutils
- commons-beanutils
- 1.9.4
+ org.apache.commons
+ commons-beanutils2
+ 2.0.0-M2
commons-io