issue 326: commons-beanutils:1.9.4 -> commons-beanutils2:2.0.0

jxlsteam · Jul 25, 2024 · 1c2796d · 1c2796d
1 parent db6ef04
commit 1c2796d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/jxls-poi/src/test/java/org/jxls/templatebasedtests/DynaBeanTest.java b/jxls-poi/src/test/java/org/jxls/templatebasedtests/DynaBeanTest.java
@@ -5,10 +5,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.beanutils.BasicDynaClass;
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.BasicDynaClass;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
 import org.junit.Test;
 import org.jxls.JxlsTester;
 import org.jxls.TestWorkbook;

diff --git a/jxls-site/docs/changes.md b/jxls-site/docs/changes.md
@@ -1,6 +1,7 @@
 # Release Notes
 
 ## v3.1.0
+- [#326 commons-beanutils2:2.0.0](https://github.com/jxlsteam/jxls/issues/326)
 - [#315 Pass data map to SimpleExporter](https://github.com/jxlsteam/jxls/issues/315)
 - [#240 Table syntax support for AbstractFormulaProcessor.getFormulaCellRefs()](https://github.com/jxlsteam/jxls/issues/240)
 

diff --git a/jxls/build.gradle b/jxls/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api('org.apache.commons:commons-jexl3:3.3') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    api('commons-beanutils:commons-beanutils:1.9.4') {
+    api('com.melloware:commons-beanutils2:2.0.0') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
 }
diff --git a/jxls/pom.xml b/jxls/pom.xml
@@ -27,9 +27,9 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.4</version>
+			<groupId>com.melloware</groupId>
+			<artifactId>commons-beanutils2</artifactId>
+			<version>2.0.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>

diff --git a/jxls/src/main/java/org/jxls/command/GridCommand.java b/jxls/src/main/java/org/jxls/command/GridCommand.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils2.PropertyUtils;
 import org.jxls.area.Area;
 import org.jxls.common.CellRef;
 import org.jxls.common.Context;

diff --git a/jxls/src/main/java/org/jxls/common/ObjectPropertyAccess.java b/jxls/src/main/java/org/jxls/common/ObjectPropertyAccess.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils2.PropertyUtils;
 import org.jxls.logging.JxlsLogger;
 
 public class ObjectPropertyAccess {

diff --git a/jxls/src/main/java/org/jxls/functions/GroupSum.java b/jxls/src/main/java/org/jxls/functions/GroupSum.java
@@ -3,7 +3,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils2.PropertyUtils;
 import org.jxls.command.RunVar;
 import org.jxls.common.JxlsException;
 import org.jxls.common.NeedsPublicContext;

diff --git a/jxls/src/test/java/org/jxls/common/ObjectPropertyAccessTest.java b/jxls/src/test/java/org/jxls/common/ObjectPropertyAccessTest.java
@@ -6,10 +6,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.BasicDynaClass;
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.DynaProperty;
+import org.apache.commons.beanutils2.BasicDynaClass;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
 import org.junit.Test;
 import org.jxls.command.Person;
 import org.jxls.expression.Dummy;