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-collections.git


The following commit(s) were added to refs/heads/master by this push:
     new a4b0e7c79 Remove deprecation annotation of 
org.apache.commons.collections4.Factory; this will be deprecated in 5.0 in 
favor of java.util.function.Supplier
     new c6305c497 Merge branch 'master' of 
https://github.com/apache/commons-collections.git
a4b0e7c79 is described below

commit a4b0e7c799b86dc791705c0879872b752a324d46
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat May 10 09:12:15 2025 -0400

    Remove deprecation annotation of
    org.apache.commons.collections4.Factory; this will be deprecated in 5.0
    in favor of java.util.function.Supplier
    
    - Remove deprecation annotation of
    org.apache.commons.collections4.Predicate; this will be deprecated in
    5.0 in favor of java.util.function.Predicate
    - Remove deprecation annotation of
    org.apache.commons.collections4.Transformer; this will be deprecated in
    5.0 in favor of java.util.function.Function
---
 src/changes/changes.xml                                        | 3 +++
 src/main/java/org/apache/commons/collections4/Factory.java     | 4 ++--
 src/main/java/org/apache/commons/collections4/Predicate.java   | 4 ++--
 src/main/java/org/apache/commons/collections4/Transformer.java | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9b469daee..d1318968a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,6 +25,9 @@
   <release version="4.5.1" date="YYYY-MM-DD" description="This is a feature 
and maintenance release. Java 8 or later is required.">
     <!-- FIX -->
     <action type="fix" dev="ggregory" due-to="Gary 
Gregory">org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceEntry.toReference(ReferenceStrength,
 T, int) now throws IllegalArgumentException instead of Error</action>
+    <action type="fix" dev="ggregory" due-to="Eric Hubert, Gary 
Gregory">Remove deprecation annotation of 
org.apache.commons.collections4.Factory; this will be deprecated in 5.0 in 
favor of java.util.function.Supplier.</action>
+    <action type="fix" dev="ggregory" due-to="Eric Hubert, Gary 
Gregory">Remove deprecation annotation of 
org.apache.commons.collections4.Predicate; this will be deprecated in 5.0 in 
favor of java.util.function.Predicate.</action>
+    <action type="fix" dev="ggregory" due-to="Eric Hubert, Gary 
Gregory">Remove deprecation annotation of 
org.apache.commons.collections4.Transformer; this will be deprecated in 5.0 in 
favor of java.util.function.Function.</action>
     <!-- ADD -->
     <!-- UPDATE -->
     <action type="update" dev="ggregory" due-to="Gary Gregory, 
Dependabot">Bump org.apache.commons:commons-parent from 81 to 83 #612.</action>
diff --git a/src/main/java/org/apache/commons/collections4/Factory.java 
b/src/main/java/org/apache/commons/collections4/Factory.java
index 56fd5d5f6..cf8c77b2b 100644
--- a/src/main/java/org/apache/commons/collections4/Factory.java
+++ b/src/main/java/org/apache/commons/collections4/Factory.java
@@ -32,9 +32,9 @@ import java.util.function.Supplier;
  *
  * @param <T> the type of results supplied by this supplier.
  * @since 2.1
- * @deprecated Use {@link Supplier}.
+ * This will be deprecated in 5.0 in favor of {@link Supplier}.
  */
-@Deprecated
+//@Deprecated
 public interface Factory<T> extends Supplier<T> {
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/Predicate.java 
b/src/main/java/org/apache/commons/collections4/Predicate.java
index e6d700813..a2595f61a 100644
--- a/src/main/java/org/apache/commons/collections4/Predicate.java
+++ b/src/main/java/org/apache/commons/collections4/Predicate.java
@@ -32,9 +32,9 @@ package org.apache.commons.collections4;
  *
  * @param <T> the type of the input to the predicate.
  * @since 1.0
- * @deprecated Use {@link java.util.function.Predicate}.
+ * This will be deprecated in 5.0 in favor of {@link 
java.util.function.Predicate}.
  */
-@Deprecated
+//@Deprecated
 public interface Predicate<T> extends java.util.function.Predicate<T> {
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/Transformer.java 
b/src/main/java/org/apache/commons/collections4/Transformer.java
index 864152b10..6bef4a74f 100644
--- a/src/main/java/org/apache/commons/collections4/Transformer.java
+++ b/src/main/java/org/apache/commons/collections4/Transformer.java
@@ -36,9 +36,9 @@ import java.util.function.Function;
  * @param <T> the type of the input to the function.
  * @param <R> the type of the result of the function.
  * @since 1.0
- * @deprecated Use {@link Function}.
+ * This will be deprecated in 5.0 in favor of  {@link Function}.
  */
-@Deprecated
+//@Deprecated
 @FunctionalInterface
 public interface Transformer<T, R> extends Function<T, R> {
 

Reply via email to