From e6014b1c27b72e7071b27b57ec0f744d368bf928 Mon Sep 17 00:00:00 2001 From: datazuul Date: Sun, 1 Feb 2026 16:27:50 +0100 Subject: [PATCH 1/2] BUMP commons-beanutils to version 2.0.0-M2 --- .../src/test/resources/hsqldb/sample.properties | 6 +++--- empire-db-codegen/src/test/resources/hsqldb/sample.script | 2 +- empire-db-examples/pom.xml | 4 ++-- empire-db/pom.xml | 4 ++-- .../java/org/apache/empire/commons/BeanPropertyUtils.java | 6 +++--- .../main/java/org/apache/empire/commons/ClassUtils.java | 2 +- .../main/java/org/apache/empire/commons/ObjectUtils.java | 2 +- .../main/java/org/apache/empire/commons/ValueUtils.java | 2 +- .../src/main/java/org/apache/empire/data/DataType.java | 2 +- .../org/apache/empire/db/list/DBBeanListFactoryImpl.java | 2 +- .../main/java/org/apache/empire/xml/XMLConfiguration.java | 4 ++-- pom.xml | 8 ++++---- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/empire-db-codegen/src/test/resources/hsqldb/sample.properties b/empire-db-codegen/src/test/resources/hsqldb/sample.properties index 2ca8423d..63ec14ac 100644 --- a/empire-db-codegen/src/test/resources/hsqldb/sample.properties +++ b/empire-db-codegen/src/test/resources/hsqldb/sample.properties @@ -1,5 +1,5 @@ #HSQL Database Engine 2.7.2 -#Fri Jun 21 16:05:49 CEST 2024 -version=2.7.2 +#Sun Feb 01 15:38:46 CET 2026 modified=no -tx_timestamp=494 +tx_timestamp=641 +version=2.7.2 diff --git a/empire-db-codegen/src/test/resources/hsqldb/sample.script b/empire-db-codegen/src/test/resources/hsqldb/sample.script index 02815a5d..395063db 100644 --- a/empire-db-codegen/src/test/resources/hsqldb/sample.script +++ b/empire-db-codegen/src/test/resources/hsqldb/sample.script @@ -29,7 +29,7 @@ SET FILES NIO TRUE SET FILES NIO SIZE 256 SET FILES LOG TRUE SET FILES LOG SIZE 50 -SET FILES CHECK 494 +SET FILES CHECK 641 SET DATABASE COLLATION "SQL_TEXT" PAD SPACE CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e' ALTER USER SA SET LOCAL TRUE 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 From 795b94d70ac11fa843198e09de851a7967615f41 Mon Sep 17 00:00:00 2001 From: datazuul Date: Sun, 1 Feb 2026 18:30:47 +0100 Subject: [PATCH 2/2] rollback sample changes --- .../src/test/resources/hsqldb/sample.properties | 6 +++--- empire-db-codegen/src/test/resources/hsqldb/sample.script | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/empire-db-codegen/src/test/resources/hsqldb/sample.properties b/empire-db-codegen/src/test/resources/hsqldb/sample.properties index 63ec14ac..2ca8423d 100644 --- a/empire-db-codegen/src/test/resources/hsqldb/sample.properties +++ b/empire-db-codegen/src/test/resources/hsqldb/sample.properties @@ -1,5 +1,5 @@ #HSQL Database Engine 2.7.2 -#Sun Feb 01 15:38:46 CET 2026 -modified=no -tx_timestamp=641 +#Fri Jun 21 16:05:49 CEST 2024 version=2.7.2 +modified=no +tx_timestamp=494 diff --git a/empire-db-codegen/src/test/resources/hsqldb/sample.script b/empire-db-codegen/src/test/resources/hsqldb/sample.script index 395063db..02815a5d 100644 --- a/empire-db-codegen/src/test/resources/hsqldb/sample.script +++ b/empire-db-codegen/src/test/resources/hsqldb/sample.script @@ -29,7 +29,7 @@ SET FILES NIO TRUE SET FILES NIO SIZE 256 SET FILES LOG TRUE SET FILES LOG SIZE 50 -SET FILES CHECK 641 +SET FILES CHECK 494 SET DATABASE COLLATION "SQL_TEXT" PAD SPACE CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e' ALTER USER SA SET LOCAL TRUE