(commons-beanutils) branch master updated: Updates for the next release

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
 new c6bb32e1 Updates for the next release
c6bb32e1 is described below

commit c6bb32e1744994ac5cd3e818064a91dfdccbd8de
Author: Gary D. Gregory 
AuthorDate: Wed May 28 12:18:02 2025 +

Updates for the next release
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bf35f17..f69a0c50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,11 +36,11 @@
 beanutils
 org.apache.commons.beanutils2
 
-2.0.0-M2
+2.0.0-M3
 RC1
 master
 release
-2.0.0-M3
+2.0.0-M4
 (Java 8 or above)
 
 1.9.4
@@ -55,7 +55,7 @@
 -Xmx256M 
-Djava.locale.providers=COMPAT
 utf-8
 
-2.0.0-M1
+2.0.0-M2
 true
 
 
2025-05-27T23:29:33Z



(commons-beanutils) branch 1.X updated: Fix team name

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
 new 28f95547 Fix team name
28f95547 is described below

commit 28f955476d46723e20fbc7e3e468f46b05e4c57f
Author: Gary D. Gregory 
AuthorDate: Wed May 28 08:19:36 2025 -0400

Fix team name
---
 RELEASE-NOTES.txt| 2 +-
 src/changes/release-notes.vm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e9f5f9f6..9b9fb4bd 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -36,7 +36,7 @@ https://commons.apache.org/proper/commons-beanutils
 Download it from 
https://commons.apache.org/proper/commons-beanutils/download_beanutils.cgi
 
 Have fun!
--Apache Commons BCEL team
+-Apache Commons Team
 
 Feedback
 
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index f856df0c..a093835b 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -124,7 +124,7 @@ ${project.url}
 Download it from ${project.url}/download_beanutils.cgi
 
 Have fun!
--Apache Commons BCEL team
+-Apache Commons BCEL Team
 
 Feedback
 



(commons-parent) branch master updated: Bump org.codehaus.mojo:exec-maven-plugin from 3.5.0 to 3.5.1

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-parent.git


The following commit(s) were added to refs/heads/master by this push:
 new 7509dae  Bump org.codehaus.mojo:exec-maven-plugin from 3.5.0 to 3.5.1
7509dae is described below

commit 7509daee332c7ad57d2013e17bcbe1772ddb7faa
Author: Gary D. Gregory 
AuthorDate: Wed May 28 08:29:30 2025 -0400

Bump org.codehaus.mojo:exec-maven-plugin from 3.5.0 to 3.5.1
---
 pom.xml | 2 +-
 src/changes/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 80468c8..fbd0fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -814,7 +814,7 @@
 
   org.codehaus.mojo
   exec-maven-plugin
-  3.5.0
+  3.5.1
 
 
   org.codehaus.mojo
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a80f8df..bf9ba71 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,6 +62,7 @@ The  type attribute can be add,update,fix,remove.
 
 
 Bump 
com.puppycrawl.tools:checkstyle from 10.23.1 to 10.24.0 on Java 11 and 
up.
+Bump 
org.codehaus.mojo:exec-maven-plugin from 3.5.0 to 3.5.1.
   
   
 



(commons-email) branch master updated: Let Checkstyle failures fail the build

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git


The following commit(s) were added to refs/heads/master by this push:
 new d1b2cea6 Let Checkstyle failures fail the build
d1b2cea6 is described below

commit d1b2cea603651d65a274a6904d83cf1322a3e19a
Author: Gary D. Gregory 
AuthorDate: Wed May 28 08:39:31 2025 -0400

Let Checkstyle failures fail the build
---
 src/conf/checkstyle.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index b2c3cab1..307040f8 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -21,7 +21,6 @@
 
 
   
-  
 
   
   



(commons-jelly) branch dependabot/maven/commons-beanutils-commons-beanutils-1.9.4 deleted (was 7b0dce87)

2025-05-28 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/commons-beanutils-commons-beanutils-1.9.4
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


 was 7b0dce87 Bump commons-beanutils from 1.6 to 1.9.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(commons-jelly) branch dependabot/maven/jelly-tags/util/commons-beanutils-commons-beanutils-1.9.4 deleted (was dccabb2a)

2025-05-28 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/jelly-tags/util/commons-beanutils-commons-beanutils-1.9.4
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


 was dccabb2a Bump commons-beanutils from 1.7.0 to 1.9.4 in /jelly-tags/util

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(commons-lang) branch master updated: Add tests related to [LANG-1771]

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


The following commit(s) were added to refs/heads/master by this push:
 new 5a15ccb62 Add tests related to [LANG-1771]
5a15ccb62 is described below

commit 5a15ccb62eb88ffa41e6b62ac944066fb121afe8
Author: Gary Gregory 
AuthorDate: Wed May 28 13:36:47 2025 -0400

Add tests related to [LANG-1771]
---
 src/test/java/org/apache/commons/lang3/ClassUtilsTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java 
b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index b2173beb7..9f3b3490b 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -581,6 +581,9 @@ public void test_getShortCanonicalName_String() {
 }.getClass().getName());
 assertNull(new org.apache.commons.lang3.ClassUtilsTest() {
 }.getClass().getCanonicalName());
+assertEquals("String[]", 
ClassUtils.getShortCanonicalName(String[].class.getName()));
+assertEquals("String[]", 
ClassUtils.getShortCanonicalName(String[].class.getCanonicalName()));
+assertEquals("String[]", ClassUtils.getShortCanonicalName("String[]"));
 }
 
 @Test



(commons-jelly) branch dependabot/maven/core/commons-beanutils-commons-beanutils-1.9.4 deleted (was 1d9d56e6)

2025-05-28 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/core/commons-beanutils-commons-beanutils-1.9.4
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


 was 1d9d56e6 Bump commons-beanutils from 1.6 to 1.9.4 in /core

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(commons-jelly) branch dependabot/maven/jelly-tags/util/commons-beanutils-commons-beanutils-1.11.0 created (now 74cb0c32)

2025-05-28 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/jelly-tags/util/commons-beanutils-commons-beanutils-1.11.0
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


  at 74cb0c32 Bump commons-beanutils:commons-beanutils in /jelly-tags/util

No new revisions were added by this update.



(commons-fileupload) branch 1.x updated: Fix formatting and obvious typo

2025-05-28 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git


The following commit(s) were added to refs/heads/1.x by this push:
 new f7657a50 Fix formatting and obvious typo
f7657a50 is described below

commit f7657a505190d6bfb87b81d7483f5b6edabb53c7
Author: Mark Thomas 
AuthorDate: Wed May 28 16:01:58 2025 +0100

Fix formatting and obvious typo
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6294b1dc..189b9c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,9 @@
 0.81
 0.71
 0.77
-.079
-0.66  

+0.79
+0.66
+  
   
 
   org.junit.vintage



(commons-beanutils) branch master updated: Document release of CVE-2025-48734

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
 new d4ab75f9 Document release of CVE-2025-48734
d4ab75f9 is described below

commit d4ab75f9f1e81d7658052d23e580539233fae4fd
Author: Gary Gregory 
AuthorDate: Wed May 28 10:00:48 2025 -0400

Document release of CVE-2025-48734

CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734)
---
 src/changes/changes.xml|  1 +
 src/site/xdoc/security.xml | 22 --
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6469580f..aa77fda4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -34,6 +34,7 @@
 
 
   
+  CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734).
   Javadoc is 
missing its Overview page.
   Remove -nouses 
directive from maven-bundle-plugin. OSGi package imports now state 'uses' 
definitions for package imports, this doesn't affect JPMS (from 
org.apache.commons:commons-parent:80).
   The class 
org.apache.commons.beanutils2.PropertyUtils is now final (the class only 
contains static methods).
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 2d7cef19..abad0012 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -49,9 +49,7 @@
 level property access by default, thus protecting against
 CVE-2014-0114.
   
-
   Mitigation: 1.X users should migrate to 1.9.4.
-
   Credit: This was discovered by Melloware 
(https://melloware.com/).
 
 
@@ -95,6 +93,26 @@ public void testAllowAccessToClassProperty() throws 
Exception {
   http://commons.apache.org/proper/commons-beanutils/
 
   
+  
+
+  https://www.cve.org/CVERecord?id=CVE-2025-48734";>CVE-2025-48734: 
Apache Commons BeanUtils: PropertyUtilsBean does not suppresses an enum's 
declaredClass property by default
+  Severity: important
+  Affected versions: 1.x 1.0 before 1.11.0
+  Affected versions: 2.x 2.0.0-M1 before 2.0.0-M2
+  Description: Improper Access Control vulnerability in Apache 
Commons.
+  A special BeanIntrospector class was added in version 1.9.2. 
This can be used to stop attackers from using the declared class property of 
Java enum objects to get access to the classloader. However this protection was 
not enabled by default. PropertyUtilsBean (and consequently BeanUtilsBean) now 
disallows declared class level property access by default.
+  Releases 1.11.0 and 2.0.0-M2 address a potential security issue 
when accessing enum properties in an uncontrolled way. If an application using 
Commons BeanUtils passes property paths from an external source directly to the 
getProperty() method of PropertyUtilsBean, an attacker can access the enum’s 
class loader via the “declaredClass” property available on all Java “enum” 
objects. Accessing the enum’s “declaredClass” allows remote attackers to access 
the ClassLoader and exe [...]
+  Starting in versions 1.11.0 and 2.0.0-M2 a special 
BeanIntrospector suppresses the “declaredClass” property. Note that this new 
BeanIntrospector is enabled by default, but you can disable it to regain the 
old behavior; see section 2.5 of the user's guide and the unit tests.
+  This issue affects Apache Commons BeanUtils 1.x before 1.11.0, 
and 2.x before 2.0.0-M2.
+  
+  Mitigation: Users of the artifact 
commons-beanutils:commons-beanutils 1.x are recommended to upgrade to version 
1.11.0, which fixes the issue.
+  Mitigation: Users of the artifact 
org.apache.commons:commons-beanutils2 2.x are recommended to upgrade to version 
2.0.0-M2, which fixes the issue.
+  Credit: Raj (mailto:denesh@zohocorp.com) (reporter)
+  Credit: Muthukumar Marikani 
(mailto:muthukumar.marik...@zohocorp.com) (finder)
+  Reference: https://commons.apache.org/
+  Reference: https://www.cve.org/CVERecord?id=CVE-2025-48734";>CVE-2025-48734
+
+  
 
   
 



(commons-beanutils) branch master updated: Document release of CVE-2025-48734

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
 new 7634d8a3 Document release of CVE-2025-48734
7634d8a3 is described below

commit 7634d8a359f18f3b9ae311c685fe7639d4446f34
Author: Gary Gregory 
AuthorDate: Wed May 28 10:01:42 2025 -0400

Document release of CVE-2025-48734

CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734)
---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index aa77fda4..b0586c0f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -267,6 +267,7 @@
 
 
   
+  CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734).
   BeanComparator.compare(T, T) now throws IllegalArgumentException 
instead of RuntimeException to wrap all cases of 
ReflectiveOperationException.
   MappedMethodReference.get() now throws IllegalStateException instead 
of RuntimeException to wrap cases of NoSuchMethodException.
   ResultSetIterator.get(String) now throws IllegalArgumentException 
instead of RuntimeException to wrap cases of SQLException.



(commons-beanutils) branch 1.X updated: Document release of CVE-2025-48734

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
 new f799bbeb Document release of CVE-2025-48734
f799bbeb is described below

commit f799bbeb42f1b3f6ce603c86f42740e78b6fbcf5
Author: Gary Gregory 
AuthorDate: Wed May 28 10:04:05 2025 -0400

Document release of CVE-2025-48734

CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734)
---
 src/changes/changes.xml|   1 +
 src/site/xdoc/security.xml | 125 ++---
 2 files changed, 97 insertions(+), 29 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e0f1e8b8..b271c829 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,6 +35,7 @@
 
 
   
+  CVE-2025-48734: Apache Commons BeanUtils: PropertyUtilsBean does not 
suppresses an enum's declaredClass property by default 
(https://www.cve.org/CVERecord?id=CVE-2025-48734).
   BeanComparator.compare(T, T) now throws IllegalArgumentException 
instead of RuntimeException to wrap all cases of 
ReflectiveOperationException.
   MappedMethodReference.get() now throws IllegalStateException instead 
of RuntimeException to wrap cases of NoSuchMethodException.
   ResultSetIterator.get(String) now throws IllegalArgumentException 
instead of RuntimeException to wrap cases of SQLException.
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 34b02c75..abad0012 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -1,25 +1,11 @@
 
-
-http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+
+http://maven.apache.org/XDOC/2.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
   
 Apache Commons Security Reports
 Apache Commons Team
@@ -28,24 +14,105 @@
 
   
 For information about reporting or asking questions about security, 
please see
-https://commons.apache.org/security.html";>Apache Commons 
Security.
+https://commons.apache.org/security.html";>Apache Commons 
Security
+.
   
-  This page lists all security vulnerabilities fixed in released 
versions of this component. 
+  This page lists all security vulnerabilities fixed in released 
versions of this component.
   
   Please note that binary patches are never provided. If you need to 
apply a source code patch, use the building instructions for the component 
version
-that you are using. 
+that you are using.
   
   
 If you need help on building this component or other help on following 
the instructions to mitigate the known vulnerabilities listed here, please send
-your questions to the public
-user mailing list.
+your questions to the
+public
+user mailing list
+.
   
   If you have encountered an unlisted security vulnerability or other 
unexpected behavior that has security impact, or if the descriptions here are
-incomplete, please report them privately to the Apache Security Team. 
Thank you. 
+incomplete, please report
+them privately to the Apache Security Team. Thank you.
   
 
 
-  None.
+  
+
+  CVE-2019-10086: Apache Commons Beanutils does not suppresses the 
class property in PropertyUtilsBean by default.
+  Severity: Medium
+  Vendor: The Apache Software Foundation
+  Versions Affected: commons-beanutils-1.9.3 and earlier
+  Description: A special BeanIntrospector class was added in 
version 1.9.2.
+This can be used to stop attackers from using the class property of
+Java objects to get access to the classloader.
+However this protection was not enabled by default.
+PropertyUtilsBean (and consequently BeanUtilsBean) now disallows 
class
+level property access by default, thus protecting against
+CVE-2014-0114.
+  
+  Mitigation: 1.X users should migrate to 1.9.4.
+  Credit: This was discovered by Melloware 
(https://melloware.com/).
+
+
+  Example:
+
+
+/**
+ * Example displaying the new default behavior such that
+ * it is not possible to access class level properties utilizing the
+ * BeanUtilsBean, which in turn utilizes the PropertyUtilsBean.
+ */
+public void testSuppressClassPropertyByDefault() throws Exception {
+final BeanUtilsBean bub = new Bea

(commons-lang) branch master updated: Add ObjectUtils.getIfNull(Object, Object) and deprecate defaultIfNull(Object, Object)

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


The following commit(s) were added to refs/heads/master by this push:
 new 177911e47 Add ObjectUtils.getIfNull(Object, Object) and deprecate 
defaultIfNull(Object, Object)
177911e47 is described below

commit 177911e47146db0df2e35839d6bd03ad1315916c
Author: Gary D. Gregory 
AuthorDate: Wed May 28 16:19:39 2025 -0400

Add ObjectUtils.getIfNull(Object, Object) and deprecate
defaultIfNull(Object, Object)

A adaptation of PR #1355 by Pankraz76
---
 src/changes/changes.xml|  1 +
 .../java/org/apache/commons/lang3/ObjectUtils.java | 30 --
 .../org/apache/commons/lang3/builder/Diff.java |  2 +-
 .../apache/commons/lang3/reflect/TypeUtils.java|  4 +--
 .../commons/lang3/text/FormattableUtils.java   |  2 +-
 .../apache/commons/lang3/time/DurationUtils.java   |  2 +-
 .../org/apache/commons/lang3/ObjectUtilsTest.java  | 29 +
 .../org/apache/commons/lang3/function/Objects.java |  2 +-
 8 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fccb38669..e4918f047 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -123,6 +123,7 @@ The  type attribute can be add,update,fix,remove.
 Add SystemProperties.JAVA_SECURITY_KERBEROS_KDC.
 Add SystemProperties.JAVA_SECURITY_KERBEROS_REAL.
 Add ArrayFill.fill(boolean[], boolean) 
#1386.
+Add ObjectUtils.getIfNull(Object, Object) and deprecate 
defaultIfNull(Object, Object).
 
 Bump org.apache.commons:commons-parent from 73 to 84 
#1267, #1277, #1283, #1288, #1302, #1377.
 [site] Bump org.codehaus.mojo:taglist-maven-plugin from 
3.1.0 to 3.2.1 #1300.
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java 
b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index 6fb6d40c6..bdd84ef5c 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -580,10 +580,13 @@ public static short CONST_SHORT(final int v) {
  * @param object  the {@link Object} to test, may be {@code null}
  * @param defaultValue  the default value to return, may be {@code null}
  * @return {@code object} if it is not {@code null}, defaultValue otherwise
- * TODO Rename to getIfNull in 4.0
+ * @see #getIfNull(Object, Object)
+ * @see #getIfNull(Object, Supplier)
+ * @deprecated Use {@link #getIfNull(Object, Object)}.
  */
+@Deprecated
 public static  T defaultIfNull(final T object, final T defaultValue) {
-return object != null ? object : defaultValue;
+return getIfNull(object, defaultValue);
 }
 
 // Null-safe equals/hashCode
@@ -703,12 +706,35 @@ public static  T getFirstNonNull(final Supplier... 
suppliers) {
  * @param object the {@link Object} to test, may be {@code null}
  * @param defaultSupplier the default value to return, may be {@code null}
  * @return {@code object} if it is not {@code null}, {@code 
defaultValueSupplier.get()} otherwise
+ * @see #getIfNull(Object, Object)
  * @since 3.10
  */
 public static  T getIfNull(final T object, final Supplier 
defaultSupplier) {
 return object != null ? object : Suppliers.get(defaultSupplier);
 }
 
+/**
+ * Returns a default value if the object passed is {@code null}.
+ *
+ * 
+ * ObjectUtils.getIfNull(null, null)  = null
+ * ObjectUtils.getIfNull(null, "")= ""
+ * ObjectUtils.getIfNull(null, "zz")  = "zz"
+ * ObjectUtils.getIfNull("abc", *)= "abc"
+ * ObjectUtils.getIfNull(Boolean.TRUE, *) = Boolean.TRUE
+ * 
+ *
+ * @param  the type of the object
+ * @param object  the {@link Object} to test, may be {@code null}
+ * @param defaultValue  the default value to return, may be {@code null}
+ * @return {@code object} if it is not {@code null}, defaultValue otherwise
+ * @see #getIfNull(Object, Supplier)
+ * @since 3.18.0
+ */
+public static  T getIfNull(final T object, final T defaultValue) {
+return object != null ? object : defaultValue;
+}
+
 /**
  * Gets the hash code of an object returning zero when the
  * object is {@code null}.
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diff.java 
b/src/main/java/org/apache/commons/lang3/builder/Diff.java
index 4fb67c7ca..ac2c662ea 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diff.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diff.java
@@ -56,7 +56,7 @@ public abstract class Diff extends Pair {
  */
 protected Diff(final String fieldName) {
 this.fieldName = Objects.requireNonNull(fieldName);
-this.type = 
ObjectUtils.defaultIfNull(TypeUtils.getTypeArguments(

(commons-lang) branch master updated: Javadoc

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


The following commit(s) were added to refs/heads/master by this push:
 new 733d5758b Javadoc
733d5758b is described below

commit 733d5758be82e5ee2ad210b36186ff19f760374b
Author: Gary Gregory 
AuthorDate: Wed May 28 13:14:48 2025 -0400

Javadoc
---
 src/main/java/org/apache/commons/lang3/ClassUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java 
b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 5270bee27..621ff820f 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -872,7 +872,7 @@ public static String getShortCanonicalName(final Object 
object, final String val
  * 
  * 
  * {@code ""}
- * {@code (String)null}
+ * {@code (String) null}
  * 
  * 
  * {@code "Map.Entry"}



(commons-beanutils) branch master updated: Update download page for 1.11.0 release

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
 new b305fdfb Update download page for 1.11.0 release
b305fdfb is described below

commit b305fdfb528bdee2d1ae627b7841ab7fb5da8bad
Author: Gary Gregory 
AuthorDate: Wed May 28 10:23:16 2025 -0400

Update download page for 1.11.0 release
---
 pom.xml  |  4 ++--
 src/site/xdoc/download_beanutils.xml | 26 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index f69a0c50..207f2707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
 2.0.0-M4
 (Java 8 or above)
 
-1.9.4
-(Java 6 or above)
+1.11.0
+(Java 8 or above)
 
 
commons-beanutils-${commons.release.2.version}
 BEANUTILS
diff --git a/src/site/xdoc/download_beanutils.xml 
b/src/site/xdoc/download_beanutils.xml
index 8c6d55f9..0da42fe1 100644
--- a/src/site/xdoc/download_beanutils.xml
+++ b/src/site/xdoc/download_beanutils.xml
@@ -145,32 +145,32 @@ limitations under the License.
 
   
 
-
+
   
 
   
-  commons-beanutils-1.9.4-bin.tar.gz
-  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.9.4-bin.tar.gz.sha512";>sha512
-  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.9.4-bin.tar.gz.asc";>pgp
+  commons-beanutils-1.11.0-bin.tar.gz
+  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.11.0-bin.tar.gz.sha512";>sha512
+  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.11.0-bin.tar.gz.asc";>pgp
   
   
-  commons-beanutils-1.9.4-bin.zip
-  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.9.4-bin.zip.sha512";>sha512
-  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.9.4-bin.zip.asc";>pgp
+  commons-beanutils-1.11.0-bin.zip
+  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.11.0-bin.zip.sha512";>sha512
+  https://downloads.apache.org/commons/beanutils/binaries/commons-beanutils-1.11.0-bin.zip.asc";>pgp
   
 
   
   
 
   
-  commons-beanutils-1.9.4-src.tar.gz
-  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz.sha512";>sha512
-  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz.asc";>pgp
+  commons-beanutils-1.11.0-src.tar.gz
+  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.11.0-src.tar.gz.sha512";>sha512
+  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.11.0-src.tar.gz.asc";>pgp
   
   
-  commons-beanutils-1.9.4-src.zip
-  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.zip.sha512";>sha512
-  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.zip.asc";>pgp
+  commons-beanutils-1.11.0-src.zip
+  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.11.0-src.zip.sha512";>sha512
+  https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.11.0-src.zip.asc";>pgp
   
 
   



(commons-codec) branch master updated: Javadoc typo in Base16.java (#380)

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/master by this push:
 new 1f3b9fe7 Javadoc typo in Base16.java (#380)
1f3b9fe7 is described below

commit 1f3b9fe70eff7dbf645a83bc2e949090807b0198
Author: Sebastian Baunsgaard 
AuthorDate: Wed May 28 23:55:20 2025 +0200

Javadoc typo in Base16.java (#380)

* Javadoc typo in Base16.java

* Javadoc Base16OutputStream

* Javadoc Package Info
---
 src/main/java/org/apache/commons/codec/binary/Base16.java|  2 +-
 .../org/apache/commons/codec/binary/Base16OutputStream.java  | 12 ++--
 .../java/org/apache/commons/codec/binary/package-info.java   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/binary/Base16.java 
b/src/main/java/org/apache/commons/codec/binary/Base16.java
index f2379081..1cf1590b 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 import org.apache.commons.codec.CodecPolicy;
 
 /**
- * Provides Base32 encoding and decoding as defined by https://tools.ietf.org/html/rfc4648#section-8";>RFC 4648 - 8. Base 16 
Encoding.
+ * Provides Base16 encoding and decoding as defined by https://tools.ietf.org/html/rfc4648#section-8";>RFC 4648 - 8. Base 16 
Encoding.
  *
  * 
  * This class is thread-safe.
diff --git 
a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java 
b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
index 2fceb9f4..b05d2261 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
@@ -22,9 +22,9 @@ import java.io.OutputStream;
 import org.apache.commons.codec.CodecPolicy;
 
 /**
- * Provides Hex encoding in a streaming fashion (unlimited size).
+ * Provides Base16 encoding in a streaming fashion (unlimited size).
  * 
- * The default behavior of the HexOutputStream is to ENCODE, whereas the 
default behavior of the
+ * The default behavior of the Base16OutputStream is to ENCODE, whereas the 
default behavior of the
  * {@link Base16InputStream} is to DECODE. But this behavior can be overridden 
by using a different constructor.
  * 
  *
@@ -33,7 +33,7 @@ import org.apache.commons.codec.CodecPolicy;
 public class Base16OutputStream extends BaseNCodecOutputStream {
 
 /**
- * Constructs a Base16OutputStream such that all data written is 
Hex-encoded to the original provided OutputStream.
+ * Constructs a Base16OutputStream such that all data written is 
Base16-encoded to the original provided OutputStream.
  *
  * @param outputStream OutputStream to wrap.
  */
@@ -42,7 +42,7 @@ public class Base16OutputStream extends 
BaseNCodecOutputStream {
 }
 
 /**
- * Constructs a Base16OutputStream such that all data written is either 
Hex-encoded or Hex-decoded to the
+ * Constructs a Base16OutputStream such that all data written is either 
Base16-encoded or Base16-decoded to the
  * original provided OutputStream.
  *
  * @param outputStream OutputStream to wrap.
@@ -53,7 +53,7 @@ public class Base16OutputStream extends 
BaseNCodecOutputStream {
 }
 
 /**
- * Constructs a Base16OutputStream such that all data written is either 
Hex-encoded or Hex-decoded to the
+ * Constructs a Base16OutputStream such that all data written is either 
Base16-encoded or Base16-decoded to the
  * original provided OutputStream.
  *
  * @param outputStream OutputStream to wrap.
@@ -65,7 +65,7 @@ public class Base16OutputStream extends 
BaseNCodecOutputStream {
 }
 
 /**
- * Constructs a Base16OutputStream such that all data written is either 
Hex-encoded or Hex-decoded to the
+ * Constructs a Base16OutputStream such that all data written is either 
Base16-encoded or Base16-decoded to the
  * original provided OutputStream.
  *
  * @param outputStream OutputStream to wrap.
diff --git a/src/main/java/org/apache/commons/codec/binary/package-info.java 
b/src/main/java/org/apache/commons/codec/binary/package-info.java
index d35cf8c0..087f59e6 100644
--- a/src/main/java/org/apache/commons/codec/binary/package-info.java
+++ b/src/main/java/org/apache/commons/codec/binary/package-info.java
@@ -16,6 +16,6 @@
  */
 
 /**
- * Base64, Base32, Binary, and Hexadecimal String encoding and decoding.
+ * Base64, Base32, Base16, BaseN, Binary, and Hexadecimal String encoding and 
decoding.
  */
 package org.apache.commons.codec.binary;



(commons-lang) branch master updated: Add assertions to org.apache.commons.lang3.ClassUtilsTest.test_getShortCanonicalName_String()

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


The following commit(s) were added to refs/heads/master by this push:
 new 13aebc396 Add assertions to 
org.apache.commons.lang3.ClassUtilsTest.test_getShortCanonicalName_String()
13aebc396 is described below

commit 13aebc396de9233b8f913afa4b02f62f9d11f819
Author: Gary D. Gregory 
AuthorDate: Wed May 28 18:12:57 2025 -0400

Add assertions to
org.apache.commons.lang3.ClassUtilsTest.test_getShortCanonicalName_String()
---
 src/test/java/org/apache/commons/lang3/ClassUtilsTest.java | 9 +
 1 file changed, 9 insertions(+)

diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java 
b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index 9f3b3490b..beda999ae 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -584,6 +584,15 @@ public void test_getShortCanonicalName_String() {
 assertEquals("String[]", 
ClassUtils.getShortCanonicalName(String[].class.getName()));
 assertEquals("String[]", 
ClassUtils.getShortCanonicalName(String[].class.getCanonicalName()));
 assertEquals("String[]", ClassUtils.getShortCanonicalName("String[]"));
+// Note that we throw RuntimeException (but not which one) for the 
following bad inputs:
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName(""));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("["));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("[]"));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("[;"));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("[];"));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName(" "));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("[$"));
+assertThrows(RuntimeException.class, () -> 
ClassUtils.getShortCanonicalName("[$a"));
 }
 
 @Test



(commons-codec) branch master updated: Javadoc typo in Base16.java #380

2025-05-28 Thread ggregory
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git


The following commit(s) were added to refs/heads/master by this push:
 new 71090a17 Javadoc typo in Base16.java #380
71090a17 is described below

commit 71090a179ffa96e371a72c55fa0ae2fa2b6d851b
Author: Gary Gregory 
AuthorDate: Wed May 28 17:56:31 2025 -0400

Javadoc typo in Base16.java #380
---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0d011262..49acc148 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -54,6 +54,7 @@ The  type attribute can be add,update,fix,remove.
   Precompile 
regular expressions in PhoneticEngine.encode(String, LanguageSet).
   Precompile 
regular expressions in 
org.apache.commons.codec.language.bm.Rule.parse*(*).
   Remove redundant 
checks for whitespace in DaitchMokotoffSoundex.soundex(String, 
boolean).
+  Javadoc 
typo in Base16.java #380.
   
   Add 
HmacUtils.hmac(Path).  
   Add 
HmacUtils.hmacHex(Path).