Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump commons-parent from 64 to 66 

- Add Maven property project.build.outputTimestamp for build
reproducibility
- Fix Checkstyle on Java 17
This commit is contained in:
Gary Gregory 2024-02-03 09:32:44 -05:00
parent e8d66eeaa1
commit 51cc646755
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>65</version>
<version>66</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-collections4</artifactId>

3
src/changes/changes.xml
View File

@ -288,6 +288,7 @@
<action dev="ggregory" type="add" due-to="Ajay Kumar Jha, Bruno P. Kinoshita, Claude Warren">
Add test cases for indexOf and contains method of ArrayUtils class #215.
</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">Add Maven property project.build.outputTimestamp for build reproducibility.</action>
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
Bump org.easymock:easymock from 4.0.2 to 5.2.0 #352, #355, #375, #414.
@ -305,7 +306,7 @@
Bump codecov/codecov-action from 2 to 3 #297.
</action>
<action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
Bump Apache commons-parent from 48 to 65, #339, #435.
Bump Apache commons-parent from 48 to 66.
</action>
<action dev="ggregory" type="update" due-to="Gary Gregory">
Bump Jacoco from 0.8.4 to 0.8.8.

20
src/main/java/org/apache/commons/collections4/IterableUtils.java
View File

@ -1008,29 +1008,27 @@ public class IterableUtils {
/**
* Interleaves two iterables into a single iterable.
* <p>
* The returned iterable has an iterator that traverses the elements in {@code a}
* and {@code b} in alternating order. The source iterators are not polled until
* necessary.
* The returned iterable has an iterator that traverses the elements in {@code a} and {@code b} in alternating order. The source iterators are not polled
* until necessary.
* </p>
* <p>
* The returned iterable's iterator supports {@code remove()} when the corresponding
* input iterator supports it.
* The returned iterable's iterator supports {@code remove()} when the corresponding input iterator supports it.
* </p>
*
* @param <E> the element type
* @param <E> the element type
* @param first the first iterable, may not be null
* @param others the array of iterables to interleave, may not be null
* @param others the array of iterables to interleave, may not be null
* @return a new iterable, interleaving the provided iterables
* @throws NullPointerException if either of the provided iterables is null
*/
public static <E> Iterable<E> zippingIterable(final Iterable<? extends E> first,
final Iterable<? extends E>... others) {
public static <E> Iterable<E> zippingIterable(final Iterable<? extends E> first, final Iterable<? extends E>... others) {
checkNotNull(first);
checkNotNull(others);
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
@SuppressWarnings("unchecked") // safe
final
Iterator<? extends E>[] iterators = new Iterator[others.length + 1];
final Iterator<? extends E>[] iterators = new Iterator[others.length + 1];
iterators[0] = first.iterator();
for (int i = 0; i < others.length; i++) {
iterators[i + 1] = others[i].iterator();