From 1c2796d87b187b94b5125f8c768032562116fd2f Mon Sep 17 00:00:00 2001 From: Marcus Warm Date: Thu, 25 Jul 2024 17:26:20 +0200 Subject: [PATCH] issue 326: commons-beanutils:1.9.4 -> commons-beanutils2:2.0.0 --- .../java/org/jxls/templatebasedtests/DynaBeanTest.java | 8 ++++---- jxls-site/docs/changes.md | 1 + jxls/build.gradle | 2 +- jxls/pom.xml | 6 +++--- jxls/src/main/java/org/jxls/command/GridCommand.java | 2 +- .../main/java/org/jxls/common/ObjectPropertyAccess.java | 2 +- jxls/src/main/java/org/jxls/functions/GroupSum.java | 2 +- .../java/org/jxls/common/ObjectPropertyAccessTest.java | 8 ++++---- 8 files changed, 16 insertions(+), 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 index 74574caf..6211b641 100644 --- 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 index 230b44fa..59f14421 100644 --- 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 index e79e370a..ea774aa7 100644 --- 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 index e5402d4e..9b3687a1 100644 --- a/jxls/pom.xml +++ b/jxls/pom.xml @@ -27,9 +27,9 @@ - commons-beanutils - commons-beanutils - 1.9.4 + com.melloware + commons-beanutils2 + 2.0.0 commons-logging diff --git a/jxls/src/main/java/org/jxls/command/GridCommand.java b/jxls/src/main/java/org/jxls/command/GridCommand.java index 8d704e77..9c52cfe7 100644 --- 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 index 00a283cc..e9a41db7 100644 --- 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 index b94ba22e..6a20aae2 100644 --- 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 index 3ea6a4d0..acc8afcc 100644 --- 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;