Skip to content

Commit cf1e3df

Browse files
committed
Prepare for the next release candidate
1 parent e32afac commit cf1e3df

File tree

6 files changed

+63
-23
lines changed

6 files changed

+63
-23
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ Making Changes
6161

6262
+ Create a _topic branch_ for your isolated work.
6363
* Usually you should base your branch from the `master` branch.
64-
* A good topic branch name can be the JIRA bug ID plus a keyword, for example, `COLLECTIONS-123-InputStream`.
64+
* A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `COLLECTIONS-123-InputStream`.
6565
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
6666
+ Make commits of logical units.
6767
* Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
68-
* For example, `[COLLECTIONS-123] Close input stream earlier`
68+
* For example, `[COLLECTIONS-123] Close input stream sooner`
6969
+ Respect the original code style:
7070
+ Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing.
7171
+ 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 first.

NOTICE.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@ Copyright 2001-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).
6-
7-
The Java source file src/main/java/org/apache/commons/collections4/map/ConcurrentReferenceHashMap.java
8-
is from https://github.com/hazelcast/hazelcast and the following notice applies:
9-
Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(the "License"); you may not use this file except in compliance with
77
the License. You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
https://www.apache.org/licenses/LICENSE-2.0
1010
1111
Unless required by applicable law or agreed to in writing, software
1212
distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,7 +45,7 @@ Apache Commons Collections
4545

4646
[![Java CI](https://github.com/apache/commons-collections/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-collections/actions/workflows/maven.yml)
4747
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.commons/commons-collections4?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.commons/commons-collections4)
48-
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-collections4/4.5.0-M3.svg)](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.5.0-M3)
48+
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-collections4/4.5.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.5.0)
4949
[![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)
5050
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-collections/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-collections)
5151

@@ -68,7 +68,7 @@ Alternatively, you can pull it from the central Maven repositories:
6868
<dependency>
6969
<groupId>org.apache.commons</groupId>
7070
<artifactId>commons-collections4</artifactId>
71-
<version>4.5.0-M3</version>
71+
<version>4.5.0</version>
7272
</dependency>
7373
```
7474

RELEASE-NOTES.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
Apache Commons Collections 4.5.0 Release Notes
2+
----------------------------------------------
3+
4+
The Apache Commons Collections team is pleased to announce the release of Apache Commons Collections 4.5.0.
5+
6+
The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
7+
8+
This is a feature and maintenance release. Java 8 or later is required.
9+
10+
Changes in this version
11+
-----------------------
12+
13+
New features
14+
------------
15+
16+
* Add IteratorUtils.toSet(Iterator). Thanks to Gary Gregory.
17+
* Add IteratorUtils.toSet(Iterator, int). Thanks to Gary Gregory.
18+
* Add EnumerationUtils.toSet(Enumeration). Thanks to Gary Gregory.
19+
* COLLECTIONS-693: Please add OWASP Dependency Check to the build. Thanks to Gary Gregory.
20+
21+
Fixed Bugs
22+
----------
23+
24+
* Refactor AbstractPropertiesFactory.load(File) to use NIO. Thanks to Gary Gregory.
25+
* Refactor AbstractPropertiesFactory.load(String) to use NIO. Thanks to Gary Gregory.
26+
27+
Changes
28+
-------
29+
30+
* Bump commons-codec:commons-codec from 1.17.1 to 1.18.0 #591. Thanks to Gary Gregory.
31+
* Bump org.apache.commons:commons-parent from 78 to 81 #2296. Thanks to Gary Gregory, Dependabot.
32+
* Bump commons.jacoco.version from 0.8.13-SNAPSHOT to 0.13.0. Thanks to Gary Gregory.
33+
* [test] Bump commons-io:commons-io from 2.18.0 to 2.19.0. Thanks to Gary Gregory.
34+
35+
36+
For complete information on Apache Commons Collections, including instructions on how to submit bug reports,
37+
patches, or suggestions for improvement, see the Apache Commons Collections website:
38+
39+
https://commons.apache.org/proper/commons-collections/
40+
41+
Download page: https://commons.apache.org/proper/commons-collections/download_collections.cgi
42+
43+
-----------------------------------------------------------------------------
44+
145
Apache Commons Collections 4.5.0-M3 RELEASE NOTES
246
-------------------------------------------------
347

src/changes/changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<title>Apache Commons Collections Release Notes</title>
2323
</properties>
2424
<body>
25-
<release version="4.5.0-M4" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
25+
<release version="4.5.0" date="2025-04-19" description="This is a feature and maintenance release. Java 8 or later is required.">
2626
<!-- FIX -->
2727
<action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor AbstractPropertiesFactory.load(File) to use NIO.</action>
2828
<action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor AbstractPropertiesFactory.load(String) to use NIO.</action>

src/site/xdoc/download_collections.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,32 +115,32 @@ limitations under the License.
115115
</p>
116116
</subsection>
117117
</section>
118-
<section name="Apache Commons Collections 4.5.0-M3 (Requires Java 8 or above)">
118+
<section name="Apache Commons Collections 4.5.0 (Requires Java 8 or above)">
119119
<subsection name="Binaries">
120120
<table>
121121
<tr>
122-
<td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.tar.gz">commons-collections4-4.5.0-M3-bin.tar.gz</a></td>
123-
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.tar.gz.sha512">sha512</a></td>
124-
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.tar.gz.asc">pgp</a></td>
122+
<td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-bin.tar.gz">commons-collections4-4.5.0-bin.tar.gz</a></td>
123+
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-bin.tar.gz.sha512">sha512</a></td>
124+
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-bin.tar.gz.asc">pgp</a></td>
125125
</tr>
126126
<tr>
127-
<td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.zip">commons-collections4-4.5.0-M3-bin.zip</a></td>
128-
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.zip.sha512">sha512</a></td>
129-
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-M3-bin.zip.asc">pgp</a></td>
127+
<td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.5.0-bin.zip">commons-collections4-4.5.0-bin.zip</a></td>
128+
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-bin.zip.sha512">sha512</a></td>
129+
<td><a href="https://downloads.apache.org/commons/collections/binaries/commons-collections4-4.5.0-bin.zip.asc">pgp</a></td>
130130
</tr>
131131
</table>
132132
</subsection>
133133
<subsection name="Source">
134134
<table>
135135
<tr>
136-
<td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M3-src.tar.gz">commons-collections4-4.5.0-M3-src.tar.gz</a></td>
137-
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M3-src.tar.gz.sha512">sha512</a></td>
138-
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M3-src.tar.gz.asc">pgp</a></td>
136+
<td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-src.tar.gz">commons-collections4-4.5.0-src.tar.gz</a></td>
137+
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-src.tar.gz.sha512">sha512</a></td>
138+
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-src.tar.gz.asc">pgp</a></td>
139139
</tr>
140140
<tr>
141-
<td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-M3-src.zip">commons-collections4-4.5.0-M3-src.zip</a></td>
142-
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M3-src.zip.sha512">sha512</a></td>
143-
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-M3-src.zip.asc">pgp</a></td>
141+
<td><a href="[preferred]/commons/collections/source/commons-collections4-4.5.0-src.zip">commons-collections4-4.5.0-src.zip</a></td>
142+
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-src.zip.sha512">sha512</a></td>
143+
<td><a href="https://downloads.apache.org/commons/collections/source/commons-collections4-4.5.0-src.zip.asc">pgp</a></td>
144144
</tr>
145145
</table>
146146
</subsection>

0 commit comments

Comments
 (0)