Prepare for the next release candidate

README.md

@@ -46,7 +46,7 @@ Apache Commons Collections
 [![Java CI](https://github.com/apache/commons-collections/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-collections/actions/workflows/maven.yml)
 [![Coverage Status](https://codecov.io/gh/apache/commons-collections/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-collections)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/?gav=true)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-collections4/4.5.0-M1.svg)](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.5.0-M1)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-collections4/4.5.0-M2.svg)](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.5.0-M2)
 [![CodeQL](https://github.com/apache/commons-collections/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-collections/actions/workflows/codeql-analysis.yml)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-collections/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-collections)
 
@@ -69,7 +69,7 @@ Alternatively, you can pull it from  the central Maven repositories:
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-collections4</artifactId>
-  <version>4.5.0-M1</version>
+  <version>4.5.0-M2</version>
 </dependency>
 ```
 
@@ -89,7 +89,9 @@ There are some guidelines which will make applying PRs easier for us:
 + No tabs! Please use spaces for indentation.
 + Respect the existing code style for each file.
 + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```.
++ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running `mvn`.
++ Before you pushing a PR, run `mvn` (by itself), this runs the default goal, which contains all build checks.
++ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false`
 
 If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas).
 You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md).

RELEASE-NOTES.txt

@@ -1,3 +1,63 @@
+Apache Commons Collections 4.5.0-M2 RELEASE NOTES
+-------------------------------------------------
+
+The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+
+This milestone release requires Java 8 and adds the package `org.apache.commons.collections4.bloomfilter`.
+
+Changes in this version
+-----------------------
+
+New features
+------------
+
+* COLLECTIONS-852:  Add layered Bloom filter clean method #476. Thanks to Claude Warren, Alex Herbert. 
+* COLLECTIONS-842:  Deprecate Lists incompatible with Java 21, add new variant of AbstractLinkedList #485. Thanks to Julian Reschke. 
+
+Fixed Bugs
+----------
+
+* Deprecate Closure in favor of java.util.function.Consumer. Thanks to Gary Gregory. 
+* Deprecate Factory in favor of java.util.function.Supplier. Thanks to Gary Gregory. 
+* Deprecate Predicate in favor of java.util.function.Predicate. Thanks to Gary Gregory. 
+* Deprecate Transformer in favor of java.util.function.Function. Thanks to Gary Gregory. 
+* COLLECTIONS-853:  Change LayerManager to use List and added generics to LayerdedBloomFilter #481. Thanks to Claude Warren, Alex Herbert, Gary Gregory. 
+* Fix PMD UselessOverridingMethod in PropertiesFactory.EmptyProperties. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in AbstractHashedMap. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in AbstractLinkedMap. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in CaseInsensitiveMap. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in CollectionUtils. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in DefaultEquator. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in IndexUtils. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in LinkIterator. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in MapUtils. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in PredicateUtils. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in ReferenceMapIterator. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in StringKeyAnalyzer. Thanks to PMD, Gary Gregory. 
+* Fix PMD UnnecessaryFullyQualifiedName in TransformerUtils. Thanks to PMD, Gary Gregory. 
+* COLLECTIONS-854:  Renaming bloomfilter components and methods as per ticket #492. Thanks to Claude Warren, Alex Herbert, Gary Gregory. 
+* Fix Java 22 builds through Easymock upgrade #502. Thanks to Gary Gregory. 
+* COLLECTIONS-855:  Fixed hashing calculation as per report #501. Thanks to Claude Warren, Alex Herbert, Gary Gregory. 
+
+Changes
+-------
+
+* Bump org.apache.commons:commons-parent from 67 to 71 #473, #503. Thanks to Dependabot, Gary Gregory. 
+* Bump tests commons-io:commons-io from 2.16.0 to 2.16.1 #475. Thanks to Dependabot. 
+* Bump optional commons-codec:commons-codec from 1.16.1 to 1.17.0. Thanks to Dependabot. 
+* Bump com.google.guava:guava-testlib from 33.1.0-jre to 33.2.1-jre #487, #500. Thanks to Dependabot. 
+* Bump org.easymock:easymock from 5.2.0 to 5.3.0 #502. Thanks to Dependabot. 
+
+
+For complete information on Apache Commons Collections, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Commons Collections website:
+
+https://commons.apache.org/proper/commons-collections/
+
+Download page: https://commons.apache.org/proper/commons-collections/download_collections.cgi
+
+-----------------------------------------------------------------------------
+
 Apache Commons Collections 4.5.0-M1 RELEASE NOTES
 -------------------------------------------------
 

pom.xml

@@ -23,7 +23,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-collections4</artifactId>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.5.0-M2-SNAPSHOT</version>
   <name>Apache Commons Collections</name>
 
   <inceptionYear>2001</inceptionYear>
@@ -123,8 +123,8 @@
     <commons.module.name>org.apache.commons.collections4</commons.module.name>
 
     <!-- Current 4.x release series -->
-    <commons.release.version>4.5.0-M1</commons.release.version>
-    <commons.release.next>4.5.0</commons.release.next>
+    <commons.release.version>4.5.0-M2</commons.release.version>
+    <commons.release.next>4.5.0-M3</commons.release.next>
     <commons.release.desc>(Requires Java 8 or above)</commons.release.desc>
 
     <!-- Previous 4.2 release on Java 7 -->

src/changes/changes.xml

@@ -22,7 +22,7 @@
     <title>Apache Commons Collections Release Notes</title>
   </properties>
   <body>
-  <release version="4.5.0" date="YYYY-MM-DD" description="This milestone release requires Java 8 and adds the package `org.apache.commons.collections4.bloomfilter`.">
+  <release version="4.5.0-M2" date="2024-06-15" description="This milestone release requires Java 8 and adds the package `org.apache.commons.collections4.bloomfilter`.">
      <!-- ADD -->
      <action issue="COLLECTIONS-852" type="add" dev="ggregory" due-to="Claude Warren, Alex Herbert">Add layered Bloom filter clean method #476.</action>
      <action issue="COLLECTIONS-842" type="add" dev="aherbert" due-to="Julian Reschke">Deprecate Lists incompatible with Java 21, add new variant of AbstractLinkedList #485.</action>

src/site/xdoc/download_collections.xml

@@ -113,32 +113,32 @@ limitations under the License.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Collections 4.5.0-M1 (Requires Java 8 or above)">
+    <section name="Apache Commons Collections 4.5.0-M2 (Requires Java 8 or above)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.tar.gz">commons-collections4-4.5.0-M1-bin.tar.gz</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.tar.gz">commons-collections4-4.5.0-M2-bin.tar.gz</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.zip">commons-collections4-4.5.0-M1-bin.zip</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M1-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.zip">commons-collections4-4.5.0-M2-bin.zip</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M2-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M1-src.tar.gz">commons-collections4-4.5.0-M1-src.tar.gz</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M1-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M1-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M2-src.tar.gz">commons-collections4-4.5.0-M2-src.tar.gz</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M2-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M2-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M1-src.zip">commons-collections4-4.5.0-M1-src.zip</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M1-src.zip.sha512">sha512</a></td>
-              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M1-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M2-src.zip">commons-collections4-4.5.0-M2-src.zip</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M2-src.zip.sha512">sha512</a></td>
+              <td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M2-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>