You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/03 14:38:37 UTC
(commons-collections) 01/02: Bump commons-parent from 64 to 66
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
commit 51cc646755c2f6a599debd2e2fdb3c8f6c7dbcca
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 3 09:32:44 2024 -0500
Bump commons-parent from 64 to 66
- Add Maven property project.build.outputTimestamp for build
reproducibility
- Fix Checkstyle on Java 17
---
pom.xml | 2 +-
src/changes/changes.xml | 3 ++-
.../apache/commons/collections4/IterableUtils.java | 20 +++++++++-----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index e69af72e3..583b053e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e912a2903..9307d165b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -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.
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index ded2178d0..2a3fb318f 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -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();