diff --git a/core/pom-common.xml b/core/pom-common.xml index c7907d496f..6b1dc4f6bf 100644 --- a/core/pom-common.xml +++ b/core/pom-common.xml @@ -181,8 +181,8 @@ false - commons-beanutils - commons-beanutils + org.apache.commons + commons-beanutils2 ${commons-beanutils.version} compile false diff --git a/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractBeanDataSource.java b/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractBeanDataSource.java index 6429336fc1..06a77682df 100644 --- a/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractBeanDataSource.java +++ b/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractBeanDataSource.java @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.beanutils.NestedNullException; -import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.beanutils2.NestedNullException; +import org.apache.commons.beanutils2.PropertyUtils; import net.sf.jasperreports.annotations.properties.Property; import net.sf.jasperreports.annotations.properties.PropertyScope; diff --git a/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractTextDataSource.java b/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractTextDataSource.java index 5c5883d5ed..9b4525c495 100644 --- a/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractTextDataSource.java +++ b/core/src/main/java/net/sf/jasperreports/engine/data/JRAbstractTextDataSource.java @@ -29,7 +29,7 @@ import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.beanutils.locale.LocaleConvertUtilsBean; +import org.apache.commons.beanutils2.locale.LocaleConvertUtilsBean; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; diff --git a/core/src/main/java/net/sf/jasperreports/engine/util/JRDateLocaleConverter.java b/core/src/main/java/net/sf/jasperreports/engine/util/JRDateLocaleConverter.java index c493778055..037e0fc44d 100644 --- a/core/src/main/java/net/sf/jasperreports/engine/util/JRDateLocaleConverter.java +++ b/core/src/main/java/net/sf/jasperreports/engine/util/JRDateLocaleConverter.java @@ -26,10 +26,11 @@ import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.beanutils.locale.converters.DateLocaleConverter; +import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +47,7 @@ * @author szaharia */ -public class JRDateLocaleConverter extends DateLocaleConverter +public class JRDateLocaleConverter extends DateLocaleConverter { private static Log log = LogFactory.getLog(DateLocaleConverter.class); @@ -60,18 +61,18 @@ public class JRDateLocaleConverter extends DateLocaleConverter */ public JRDateLocaleConverter(TimeZone timeZone) { - super(); + super(null, null, null, false, true, true); this.timeZone = timeZone; } @Override - protected Object parse(Object value, String pattern) throws ParseException + protected Date parse(Object value, String pattern) throws ParseException { SimpleDateFormat formatter = getFormatter(pattern, locale); if (pattern != null) { - if (locPattern) { + if (localizedPattern) { formatter.applyLocalizedPattern(pattern); } else { @@ -87,7 +88,7 @@ protected Object parse(Object value, String pattern) throws ParseException private SimpleDateFormat getFormatter(String pattern, Locale locale) { if(pattern == null) { - pattern = locPattern ? + pattern = localizedPattern ? new SimpleDateFormat().toLocalizedPattern() : new SimpleDateFormat().toPattern(); log.warn("Null pattern was provided, defaulting to: " + pattern); } diff --git a/ext/hibernate-j2ee/pom.xml b/ext/hibernate-j2ee/pom.xml index 321cad5cdf..3b3be4c013 100644 --- a/ext/hibernate-j2ee/pom.xml +++ b/ext/hibernate-j2ee/pom.xml @@ -25,13 +25,6 @@ compile false - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - compile - false - net.sf.jasperreports jasperreports-data-adapters diff --git a/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/JRHibernateAbstractDataSource.java b/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/JRHibernateAbstractDataSource.java index 6dd42c2ec7..527097bc30 100644 --- a/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/JRHibernateAbstractDataSource.java +++ b/ext/hibernate-j2ee/src/main/java/net/sf/jasperreports/j2ee/hibernate/JRHibernateAbstractDataSource.java @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.beanutils.PropertyUtils; import org.hibernate.type.Type; import net.sf.jasperreports.engine.JRDataSource; @@ -159,7 +158,7 @@ protected FieldReader getFieldReaderSingleReturn(Map aliasesMap, else { @SuppressWarnings("deprecation") - int firstNestedIdx = fieldMapping.indexOf(PropertyUtils.NESTED_DELIM); + int firstNestedIdx = fieldMapping.indexOf("."); if (firstNestedIdx >= 0 && aliasesMap.containsKey(fieldMapping.substring(0, firstNestedIdx))) { @@ -188,7 +187,7 @@ protected FieldReader getFieldReader(Type[] returnTypes, Map ali if (fieldIdx == null) { @SuppressWarnings("deprecation") - int firstNestedIdx = fieldMapping.indexOf(PropertyUtils.NESTED_DELIM); + int firstNestedIdx = fieldMapping.indexOf("."); if (firstNestedIdx < 0) { diff --git a/ext/hibernate/pom.xml b/ext/hibernate/pom.xml index a371659bd8..46c72bd55a 100644 --- a/ext/hibernate/pom.xml +++ b/ext/hibernate/pom.xml @@ -25,13 +25,6 @@ compile false - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - compile - false - net.sf.jasperreports jasperreports-data-adapters diff --git a/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/JRHibernateAbstractDataSource.java b/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/JRHibernateAbstractDataSource.java index f7c1c3f4d7..f6e6a3fd4b 100644 --- a/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/JRHibernateAbstractDataSource.java +++ b/ext/hibernate/src/main/java/net/sf/jasperreports/hibernate/JRHibernateAbstractDataSource.java @@ -28,8 +28,6 @@ import java.util.ListIterator; import java.util.Map; -import org.apache.commons.beanutils.PropertyUtils; - import jakarta.persistence.Tuple; import jakarta.persistence.TupleElement; import net.sf.jasperreports.engine.JRDataSource; @@ -157,7 +155,7 @@ protected FieldReader getFieldReaderSingleReturn(Map aliasesMap, else { @SuppressWarnings("deprecation") - int firstNestedIdx = fieldMapping.indexOf(PropertyUtils.NESTED_DELIM); + int firstNestedIdx = fieldMapping.indexOf("."); if (firstNestedIdx >= 0 && aliasesMap.containsKey(fieldMapping.substring(0, firstNestedIdx))) { @@ -179,7 +177,7 @@ protected FieldReader getFieldReader(List> elements, Map2.7.7 1.17 1.4.1 - 1.9.4 - 4.4 + 2.0.0-M1 + 4.5.0-M3 1.3.0 2.7.2 2.17.1