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/01/20 15:46:10 UTC

(commons-collections) 03/04: Declutter: Tests don't need Javadoc @since tags

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 190815d4e1e608f88817b14329e7e3a8a6bf81d3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 20 10:29:28 2024 -0500

    Declutter: Tests don't need Javadoc @since tags
---
 .../java/org/apache/commons/collections4/ClosureUtilsTest.java   | 1 -
 .../java/org/apache/commons/collections4/FactoryUtilsTest.java   | 1 -
 .../java/org/apache/commons/collections4/FluentIterableTest.java | 1 -
 .../java/org/apache/commons/collections4/GuavaTestlibTest.java   | 9 ++++-----
 .../java/org/apache/commons/collections4/IterableUtilsTest.java  | 1 -
 .../java/org/apache/commons/collections4/MultiMapUtilsTest.java  | 1 -
 .../java/org/apache/commons/collections4/MultiSetUtilsTest.java  | 1 -
 .../java/org/apache/commons/collections4/PredicateUtilsTest.java | 1 -
 .../java/org/apache/commons/collections4/SplitMapUtilsTest.java  | 1 -
 .../org/apache/commons/collections4/TransformerUtilsTest.java    | 1 -
 .../apache/commons/collections4/bag/AbstractSortedBagTest.java   | 1 -
 .../org/apache/commons/collections4/bag/CollectionBagTest.java   | 1 -
 .../apache/commons/collections4/bag/CollectionSortedBagTest.java | 1 -
 .../org/apache/commons/collections4/bag/PredicatedBagTest.java   | 1 -
 .../apache/commons/collections4/bag/PredicatedSortedBagTest.java | 1 -
 .../org/apache/commons/collections4/bag/SynchronizedBagTest.java | 1 -
 .../org/apache/commons/collections4/bag/TransformedBagTest.java  | 1 -
 .../commons/collections4/bag/TransformedSortedBagTest.java       | 1 -
 .../org/apache/commons/collections4/bag/UnmodifiableBagTest.java | 1 -
 .../commons/collections4/bag/UnmodifiableSortedBagTest.java      | 1 -
 .../commons/collections4/collection/AbstractCollectionTest.java  | 1 -
 .../commons/collections4/collection/CompositeCollectionTest.java | 2 --
 .../commons/collections4/collection/IndexedCollectionTest.java   | 1 -
 .../collections4/collection/PredicatedCollectionBuilderTest.java | 1 -
 .../collections4/collection/PredicatedCollectionTest.java        | 1 -
 .../collections4/collection/SynchronizedCollectionTest.java      | 1 -
 .../collections4/collection/TransformedCollectionTest.java       | 1 -
 .../collections4/collection/UnmodifiableCollectionTest.java      | 1 -
 .../collections4/functors/AbstractAnyAllOnePredicateTest.java    | 1 -
 .../collections4/functors/AbstractCompositePredicateTest.java    | 1 -
 .../commons/collections4/functors/AbstractMockPredicateTest.java | 1 -
 .../apache/commons/collections4/functors/AllPredicateTest.java   | 1 -
 .../commons/collections4/iterators/AbstractIteratorTest.java     | 1 -
 .../commons/collections4/iterators/AbstractListIteratorTest.java | 1 -
 .../commons/collections4/iterators/AbstractMapIteratorTest.java  | 1 -
 .../collections4/iterators/AbstractOrderedMapIteratorTest.java   | 1 -
 .../commons/collections4/iterators/PermutationIteratorTest.java  | 1 -
 .../commons/collections4/junit/ObjectToStringComparator.java     | 1 -
 .../commons/collections4/keyvalue/AbstractMapEntryTest.java      | 1 -
 .../commons/collections4/keyvalue/DefaultKeyValueTest.java       | 1 -
 .../commons/collections4/keyvalue/DefaultMapEntryTest.java       | 1 -
 .../apache/commons/collections4/keyvalue/TiedMapEntryTest.java   | 1 -
 .../commons/collections4/keyvalue/UnmodifiableMapEntryTest.java  | 1 -
 .../org/apache/commons/collections4/list/FixedSizeListTest.java  | 1 -
 .../org/apache/commons/collections4/list/GrowthListTest.java     | 1 -
 .../org/apache/commons/collections4/list/PredicatedListTest.java | 1 -
 .../org/apache/commons/collections4/list/SetUniqueListTest.java  | 1 -
 .../apache/commons/collections4/list/TransformedListTest.java    | 1 -
 .../java/org/apache/commons/collections4/list/TreeListTest.java  | 1 -
 .../apache/commons/collections4/list/UnmodifiableListTest.java   | 1 -
 .../org/apache/commons/collections4/map/CompositeMapTest.java    | 1 -
 .../org/apache/commons/collections4/map/DefaultedMapTest.java    | 1 -
 .../org/apache/commons/collections4/map/FixedSizeMapTest.java    | 1 -
 .../apache/commons/collections4/map/FixedSizeSortedMapTest.java  | 1 -
 .../java/org/apache/commons/collections4/map/IdentityMap.java    | 1 -
 .../java/org/apache/commons/collections4/map/LazyMapTest.java    | 1 -
 .../org/apache/commons/collections4/map/LazySortedMapTest.java   | 1 -
 .../org/apache/commons/collections4/map/ListOrderedMap2Test.java | 1 -
 .../org/apache/commons/collections4/map/ListOrderedMapTest.java  | 1 -
 .../org/apache/commons/collections4/map/MultiValueMapTest.java   | 1 -
 .../apache/commons/collections4/map/PassiveExpiringMapTest.java  | 1 -
 .../org/apache/commons/collections4/map/PredicatedMapTest.java   | 1 -
 .../apache/commons/collections4/map/PredicatedSortedMapTest.java | 1 -
 .../org/apache/commons/collections4/map/TransformedMapTest.java  | 1 -
 .../commons/collections4/map/TransformedSortedMapTest.java       | 1 -
 .../org/apache/commons/collections4/map/UnmodifiableMapTest.java | 1 -
 .../commons/collections4/map/UnmodifiableOrderedMapTest.java     | 1 -
 .../commons/collections4/map/UnmodifiableSortedMapTest.java      | 1 -
 .../collections4/multimap/AbstractMultiValuedMapTest.java        | 1 -
 .../collections4/multimap/ArrayListValuedHashMapTest.java        | 1 -
 .../commons/collections4/multimap/HashSetValuedHashMapTest.java  | 1 -
 .../collections4/multimap/TransformedMultiValuedMapTest.java     | 1 -
 .../collections4/multimap/UnmodifiableMultiValuedMapTest.java    | 1 -
 .../commons/collections4/multiset/AbstractMultiSetTest.java      | 1 -
 .../apache/commons/collections4/multiset/HashMultiSetTest.java   | 1 -
 .../commons/collections4/multiset/PredicatedMultiSetTest.java    | 1 -
 .../commons/collections4/multiset/SynchronizedMultiSetTest.java  | 1 -
 .../commons/collections4/multiset/UnmodifiableMultiSetTest.java  | 1 -
 .../org/apache/commons/collections4/queue/AbstractQueueTest.java | 1 -
 .../apache/commons/collections4/queue/CircularFifoQueueTest.java | 1 -
 .../apache/commons/collections4/queue/PredicatedQueueTest.java   | 1 -
 .../apache/commons/collections4/queue/SynchronizedQueueTest.java | 1 -
 .../apache/commons/collections4/queue/TransformedQueueTest.java  | 1 -
 .../apache/commons/collections4/queue/UnmodifiableQueueTest.java | 1 -
 .../commons/collections4/set/AbstractNavigableSetTest.java       | 1 -
 .../org/apache/commons/collections4/set/AbstractSetTest.java     | 1 -
 .../apache/commons/collections4/set/AbstractSortedSetTest.java   | 1 -
 .../org/apache/commons/collections4/set/CompositeSetTest.java    | 1 -
 .../org/apache/commons/collections4/set/ListOrderedSet2Test.java | 1 -
 .../org/apache/commons/collections4/set/ListOrderedSetTest.java  | 1 -
 .../org/apache/commons/collections4/set/MapBackedSet2Test.java   | 1 -
 .../org/apache/commons/collections4/set/MapBackedSetTest.java    | 1 -
 .../commons/collections4/set/PredicatedNavigableSetTest.java     | 1 -
 .../org/apache/commons/collections4/set/PredicatedSetTest.java   | 1 -
 .../apache/commons/collections4/set/PredicatedSortedSetTest.java | 1 -
 .../commons/collections4/set/TransformedNavigableSetTest.java    | 1 -
 .../org/apache/commons/collections4/set/TransformedSetTest.java  | 1 -
 .../commons/collections4/set/TransformedSortedSetTest.java       | 1 -
 .../commons/collections4/set/UnmodifiableNavigableSetTest.java   | 1 -
 .../org/apache/commons/collections4/set/UnmodifiableSetTest.java | 1 -
 .../commons/collections4/set/UnmodifiableSortedSetTest.java      | 1 -
 .../commons/collections4/splitmap/TransformedSplitMapTest.java   | 1 -
 .../org/apache/commons/collections4/trie/PatriciaTrie2Test.java  | 1 -
 .../org/apache/commons/collections4/trie/PatriciaTrieTest.java   | 1 -
 .../apache/commons/collections4/trie/UnmodifiableTrieTest.java   | 1 -
 105 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
index dcf4c24fc..3b5f6688a 100644
--- a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the ClosureUtils class.
  *
- * @since 3.0
  */
 public class ClosureUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
index e07e5adc5..cb7f15aca 100644
--- a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the org.apache.commons.collections.FactoryUtils class.
  *
- * @since 3.0
  */
 public class FactoryUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
index 0d7a046db..89ce97e70 100644
--- a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
@@ -40,7 +40,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for FluentIterable.
  *
- * @since 4.1
  */
 public class FluentIterableTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/GuavaTestlibTest.java b/src/test/java/org/apache/commons/collections4/GuavaTestlibTest.java
index 32be60e7a..1f2ac6085 100644
--- a/src/test/java/org/apache/commons/collections4/GuavaTestlibTest.java
+++ b/src/test/java/org/apache/commons/collections4/GuavaTestlibTest.java
@@ -22,6 +22,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.apache.commons.collections4.list.TreeList;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.collections4.map.LRUMap;
@@ -38,16 +42,11 @@ import com.google.common.collect.testing.features.Feature;
 import com.google.common.collect.testing.features.ListFeature;
 import com.google.common.collect.testing.features.MapFeature;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * This test uses Google's Guava Testlib testing libraries to validate the
  * contract of collection classes in Commons Collections. This was introduced
  * after COLLECTIONS-802, where the issue reported was found with Testlib.
  *
- * @since 4.5.0
  * @see <a href="https://github.com/google/guava/tree/master/guava-testlib">https://github.com/google/guava/tree/master/guava-testlib</a>
  * @see <a href="https://issues.apache.org/jira/browse/COLLECTIONS-802">https://issues.apache.org/jira/browse/COLLECTIONS-802</a>
  */
diff --git a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
index 7890b6024..48bc060ff 100644
--- a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
@@ -43,7 +43,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for IterableUtils.
  *
- * @since 4.1
  */
 public class IterableUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
index 2bb6e21dc..8062bf594 100644
--- a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for MultiMapUtils
  *
- * @since 4.1
  */
 public class MultiMapUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java b/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java
index 5f56d3c41..666317b40 100644
--- a/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
 
 /**
  * Tests for MultiSetUtils.
- * @since 4.2
  */
 public class MultiSetUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
index 76999206d..5364c6b3d 100644
--- a/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
@@ -45,7 +45,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the PredicateUtils class.
  *
- * @since 3.0
  */
 @SuppressWarnings("boxing")
 public class PredicateUtilsTest extends AbstractPredicateTest {
diff --git a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
index 3ce950cec..d6521c9c8 100644
--- a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for {@link TransformedSplitMap}
  *
- * @since 4.0
  */
 @SuppressWarnings("boxing")
 public class SplitMapUtilsTest {
diff --git a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
index b5012e73e..3c5a65091 100644
--- a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
@@ -43,7 +43,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the TransformerUtils class.
  *
- * @since 3.0
  */
 public class TransformerUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
index 07a48374b..3220ec128 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.SortedBag;
  * {@link org.apache.commons.collections4.SortedBag SortedBag}
  * methods and contracts.
  *
- * @since 3.0
  */
 public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
index 1d7294840..2b1778501 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Note: This test is mainly for serialization support, the CollectionBag decorator
  * is extensively used and tested in AbstractBagTest.
  *
- * @since 4.0
  */
 public class CollectionBagTest<T> extends AbstractCollectionTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
index b97bb0de8..bcc52710a 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Note: This test is mainly for serialization support, the CollectionSortedBag decorator
  * is extensively used and tested in AbstractSortedBagTest.
  *
- * @since 4.0
  */
 public class CollectionSortedBagTest<T> extends AbstractCollectionTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
index ede28adf6..644f9782e 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractBagTest} for exercising the {@link PredicatedBag}
  * implementation.
  *
- * @since 3.0
  */
 public class PredicatedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
index f7e791d21..26291553f 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedBagTest} for exercising the {@link PredicatedSortedBag}
  * implementation.
  *
- * @since 3.0
  */
 public class PredicatedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
index 796d5a81d..4985a4180 100644
--- a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.Bag;
  * Extension of {@link AbstractBagTest} for exercising the {@link SynchronizedBag}
  * implementation.
  *
- * @since 4.0
  */
 public class SynchronizedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
index a4b29ed12..9fc446b51 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractBagTest} for exercising the {@link TransformedBag}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
index 538583b95..70b41e0bf 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedBagTest} for exercising the {@link TransformedSortedBag}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
index aa86823f2..fe5098f3b 100644
--- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableBag} implementation.
  *
- * @since 4.0
  */
 public class UnmodifiableBagTest<E> extends AbstractBagTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
index efe2a202c..54c983e3e 100644
--- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableSortedBag} implementation.
  *
- * @since 4.0
  */
 public class UnmodifiableSortedBagTest<E> extends AbstractSortedBagTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 4d6b60cce..8abbf7a4e 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -1015,7 +1015,6 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
 
     /**
      *  Tests {@link Collection#removeIf(Predicate)}.
-     * @since 4.4
      */
     @Test
     public void testCollectionRemoveIf() {
diff --git a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
index 316eb633e..3b482e87a 100644
--- a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link CompositeCollection} implementation.
  *
- * @since 3.0
  */
 public class CompositeCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -373,7 +372,6 @@ public class CompositeCollectionTest<E> extends AbstractCollectionTest<E> {
     }
 
     /**
-     * @since 4.4
      */
     @Test
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
index ccc98ee35..672f909e4 100644
--- a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link IndexedCollection} implementation.
  *
- * @since 4.0
  */
 @SuppressWarnings("boxing")
 public class IndexedCollectionTest extends AbstractCollectionTest<String> {
diff --git a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
index 11e00b2c8..72fc6f4af 100644
--- a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the PredicatedCollection.Builder class.
  *
- * @since 4.1
  */
 public class PredicatedCollectionBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
index 21b59a435..bfc38809a 100644
--- a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link PredicatedCollection} implementation.
  *
- * @since 3.0
  */
 public class PredicatedCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
index 9fac27162..bc851f41b 100644
--- a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
@@ -24,7 +24,6 @@ import java.util.Collection;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link SynchronizedCollection} implementation.
  *
- * @since 3.1
  */
 public class SynchronizedCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
index 485f1ced8..6f67e1706 100644
--- a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the {@link TransformedCollection}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
index 1614a3e20..63026fd23 100644
--- a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableCollection} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
index 4305b488d..6c17ffe70 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Base class for tests of AnyPredicate, AllPredicate, and OnePredicate.
  *
- * @since 3.0
  */
 public abstract class AbstractAnyAllOnePredicateTest<T> extends AbstractCompositePredicateTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
index 861e3ac67..f6c5e7c17 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Base class for tests of composite predicates.
  *
- * @since 3.0
  */
 public abstract class AbstractCompositePredicateTest<T> extends AbstractMockPredicateTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
index 24f6b32f6..88bad4b20 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.BeforeEach;
  * Base class for tests of predicates which delegate to other predicates when evaluating an object.  This class
  * provides methods to create and verify mock predicates to which to delegate.
  *
- * @since 3.0
  */
 public abstract class AbstractMockPredicateTest<T> {
     /**
diff --git a/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
index 378fe411d..4cfa3bc2d 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests the org.apache.commons.collections.functors.AllPredicate class.
  *
- * @since 3.0
  */
 @SuppressWarnings("boxing")
 public class AllPredicateTest extends AbstractAnyAllOnePredicateTest<Integer> {
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
index 10beb7341..4abcd3cb3 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
  * They must also specify certain details of how the iterator operates by
  * overriding the supportsXxx() methods if necessary.
  *
- * @since 3.0
  */
 public abstract class AbstractIteratorTest<E> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
index 3140d50a2..47b3b4012 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
  *
- * @since 3.0
  */
 public abstract class AbstractListIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
index e9bf7e200..c8539a159 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
  *
- * @since 3.0
  */
 public abstract class AbstractMapIteratorTest<K, V> extends AbstractIteratorTest<K> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
index 65816f3ce..308a21f38 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
@@ -41,7 +41,6 @@ import org.junit.jupiter.api.Test;
  * They must also specify certain details of how the list iterator operates by
  * overriding the supportsXxx() methods if necessary.
  *
- * @since 3.0
  */
 public abstract class AbstractOrderedMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
index 1af31de2d..8ef1362fe 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test class for PermutationIterator.
  *
- * @since 4.0
  */
 public class PermutationIteratorTest extends AbstractIteratorTest<List<Character>> {
 
diff --git a/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java b/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java
index e36736704..923b528bd 100644
--- a/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java
+++ b/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java
@@ -25,7 +25,6 @@ public final class ObjectToStringComparator implements Comparator<Object>, Seria
     /**
      * Singleton instance.
      *
-     * @since 4.5
      */
     public static final ObjectToStringComparator INSTANCE = new ObjectToStringComparator();
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
index 5f7106358..b6f0e1227 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * {@link #testConstructors()} to test the constructors of the Map.Entry
  * type being tested.
  *
- * @since 3.0
  */
 public abstract class AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
index d7cb1f2e2..29a7a2739 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test the DefaultKeyValue class.
  *
- * @since 3.0
  */
 public class DefaultKeyValueTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
index 9b1cc8e74..93652bfeb 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test the DefaultMapEntry class.
  *
- * @since 3.0
  */
 public class DefaultMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
index cd2419b1e..64f9d2313 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test the TiedMapEntry class.
  *
- * @since 3.0
  */
 public class TiedMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
index 402352dcb..33a6e90ab 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test the UnmodifiableMapEntry class.
  *
- * @since 3.0
  */
 public class UnmodifiableMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
index a4d4b3a2c..1d98400f2 100644
--- a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractListTest} for exercising the {@link FixedSizeList}
  * implementation.
  *
- * @since 3.0
  */
 public class FixedSizeListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
index fed96c16d..90d0c85c2 100644
--- a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.function.Executable;
 /**
  * Extension of {@link AbstractListTest} for exercising the {@link GrowthList}.
  *
- * @since 3.2
  */
 public class GrowthListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
index 18ce52e1d..adddafba8 100644
--- a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractListTest} for exercising the
  * {@link PredicatedList} implementation.
  *
- * @since 3.0
  */
 public class PredicatedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
index 4e15662a2..0b06f49e3 100644
--- a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
 /**
  * JUnit tests.
  *
- * @since 3.0
  */
 public class SetUniqueListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
index 6ab97435d..fa53d7d64 100644
--- a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractListTest} for exercising the {@link TransformedList}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
index 3e108a4cb..30095ef7d 100644
--- a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
 /**
  * JUnit tests
  *
- * @since 3.1
  */
 public class TreeListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
index 98cf4c494..94a1a0b64 100644
--- a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractListTest} for exercising the
  * {@link UnmodifiableList} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
index 0c0419e32..bd00eea33 100644
--- a/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the
  * {@link CompositeMap} implementation.
  *
- * @since 3.0
  */
 public class CompositeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
index 9fa52855c..deb63ef97 100644
--- a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the
  * {@link DefaultedMap} implementation.
  *
- * @since 3.2
  */
 public class DefaultedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
index cc22cd781..d113d5686 100644
--- a/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.IterableMap;
  * Extension of {@link AbstractMapTest} for exercising the {@link FixedSizeMap}
  * implementation.
  *
- * @since 3.0
  */
 public class FixedSizeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
index 710152ba2..4c9f3165c 100644
--- a/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
@@ -23,7 +23,6 @@ import java.util.TreeMap;
  * Extension of {@link AbstractSortedMapTest} for exercising the {@link FixedSizeSortedMap}
  * implementation.
  *
- * @since 3.0
  */
 public class FixedSizeSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
index 98ad3ac68..17321010d 100644
--- a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
+++ b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
@@ -42,7 +42,6 @@ import java.util.Map;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- * @since 3.0
  */
 public class IdentityMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
diff --git a/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
index 3e520f57e..cf934c7f3 100644
--- a/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the
  * {@link LazyMap} implementation.
  *
- * @since 3.0
  */
 @SuppressWarnings("boxing")
 public class LazyMapTest<K, V> extends AbstractIterableMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
index 1c2672550..6272b8ac1 100644
--- a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
@@ -40,7 +40,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link LazyMapTest} for exercising the
  * {@link LazySortedMap} implementation.
  *
- * @since 3.0
  */
 @SuppressWarnings("boxing")
 public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index d205449ef..0300deafc 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap}
  * implementation.
  *
- * @since 3.1
  */
 public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index 444d0ca35..a1f4db501 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap}
  * implementation.
  *
- * @since 3.0
  */
 public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
index b138641c5..2e268ccf6 100644
--- a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
@@ -45,7 +45,6 @@ import org.junit.jupiter.api.Test;
 /**
  * TestMultiValueMap.
  *
- * @since 3.2
  */
 @Deprecated
 public class MultiValueMapTest<K, V> extends AbstractObjectTest {
diff --git a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
index 92e515496..a0eb021de 100644
--- a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
 /**
  * JUnit tests.
  *
- * @since 4.0
  */
 public class PassiveExpiringMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
index 71763bfca..a58683e20 100644
--- a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the
  * {@link PredicatedMap} implementation.
  *
- * @since 3.0
  */
 public class PredicatedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
index e04fd0246..830222d16 100644
--- a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link PredicatedMapTest} for exercising the
  * {@link PredicatedSortedMap} implementation.
  *
- * @since 3.0
  */
 public class PredicatedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
index 1640073d6..79d710a46 100644
--- a/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the {@link TransformedMap}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
index 5cdf8980c..1494d3f9b 100644
--- a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedMapTest} for exercising the {@link TransformedSortedMap}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
index dd8cd500b..ae6de86e4 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMapTest} for exercising the
  * {@link UnmodifiableMap} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
index 474eb0fef..1956dd181 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractOrderedMapTest} for exercising the
  * {@link UnmodifiableOrderedMap} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
index b865cc54b..5a4076217 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedMapTest} for exercising the
  * {@link UnmodifiableSortedMap} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
index c1300ec24..dcdebeb85 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -55,7 +55,6 @@ import org.junit.jupiter.api.Test;
  * To use, extend this class and implement the {@link #makeObject} method and if
  * necessary override the {@link #makeFullMap()} method.
  *
- * @since 4.1
  */
 public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
index 671edcad9..988ac77cf 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test ArrayListValuedHashMap
  *
- * @since 4.1
  */
 public class ArrayListValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
index f1d780ea0..bf8de19c9 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test HashSetValuedHashMap
  *
- * @since 4.1
  */
 public class HashSetValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
index 3b606a75a..059958219 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for TransformedMultiValuedMap
  *
- * @since 4.1
  */
 public class TransformedMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
index 39208be42..6ccedf8c9 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for UnmodifiableMultiValuedMap
  *
- * @since 4.1
  */
 public class UnmodifiableMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 3701af74b..30d861311 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -60,7 +60,6 @@ import org.junit.jupiter.api.Test;
  * interface (prefix testMultiSet). For MultiSet specific tests use the {@link #makeObject()} and
  * {@link #makeFullCollection()} methods instead of {@link #resetEmpty()} and resetFull().
  *
- * @since 4.1
  */
 public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
index 394fd4ffb..7df0918d4 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.MultiSet;
  * Extension of {@link AbstractMultiSetTest} for exercising the
  * {@link HashMultiSet} implementation.
  *
- * @since 4.1
  */
 public class HashMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
index 188f1536c..511eb8b0b 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMultiSetTest} for exercising the
  * {@link PredicatedMultiSet} implementation.
  *
- * @since 4.1
  */
 public class PredicatedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
index 69ef29e04..a47509b9c 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.MultiSet;
  * Extension of {@link AbstractMultiSetTest} for exercising the
  * {@link SynchronizedMultiSet} implementation.
  *
- * @since 4.1
  */
 public class SynchronizedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
index 02bf0becc..9e7ca8918 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractMultiSetTest} for exercising the
  * {@link UnmodifiableMultiSet} implementation.
  *
- * @since 4.1
  */
 public class UnmodifiableMultiSetTest<E> extends AbstractMultiSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
index 074faa18b..3a4e974b1 100644
--- a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
@@ -45,7 +45,6 @@ import org.junit.jupiter.api.Test;
  * test case (method) your {@link Queue} fails or override one of the
  * protected methods from AbstractCollectionTest.
  *
- * @since 4.0
  */
 public abstract class AbstractQueueTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
index b4f968118..cd510de3e 100644
--- a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Test cases for CircularFifoQueue.
  *
- * @since 4.0
  */
 public class CircularFifoQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
index b39f7f058..791577f6a 100644
--- a/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link PredicatedCollectionTest} for exercising the
  * {@link PredicatedQueue} implementation.
  *
- * @since 4.0
  */
 public class PredicatedQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
index 8114b9d88..efc711d95 100644
--- a/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Extension of {@link AbstractQueueTest} for exercising the {@link SynchronizedQueue} implementation.
  *
- * @since 4.2
  */
 public class SynchronizedQueueTest<T> extends AbstractQueueTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
index 2b6132cd3..fff68ed56 100644
--- a/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link TransformedQueue} implementation.
  *
- * @since 4.0
  */
 public class TransformedQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
index df16414cc..fbc496c27 100644
--- a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableQueue} implementation.
  *
- * @since 4.0
  */
 public class UnmodifiableQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
index 9e7bcb6c9..5271d0b98 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.BulkTest;
  * set is not modifiable, or if your set restricts what kinds of
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
- * @since 4.1
  */
 public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
index 8c60a0a11..f5081a954 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
@@ -42,7 +42,6 @@ import org.junit.jupiter.api.Test;
  * set is not modifiable, or if your set restricts what kinds of
  * elements may be added; see {@link AbstractCollectionTest} for more details.
  *
- * @since 3.0
  */
 public abstract class AbstractSetTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index 94a82394d..7ecd2b65d 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.BulkTest;
  * set is not modifiable, or if your set restricts what kinds of
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
- * @since 3.0
  */
 public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
index bbe7b4180..4361def44 100644
--- a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the
  * {@link CompositeSet} implementation.
  *
- * @since 3.0
  */
 public class CompositeSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
index 77cf3d9cf..d4aef42f7 100644
--- a/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the {@link ListOrderedSet}
  * implementation.
  *
- * @since 3.1
  */
 public class ListOrderedSet2Test<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
index 2161b3420..6a95435da 100644
--- a/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the
  * {@link ListOrderedSet} implementation.
  *
- * @since 3.0
  */
 public class ListOrderedSetTest<E>
     extends AbstractSetTest<E> {
diff --git a/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
index d4979cc73..64c23009e 100644
--- a/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
 /**
  * JUnit test.
  *
- * @since 3.1
  */
 public class MapBackedSet2Test<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
index 94df8905d..29a23b812 100644
--- a/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.map.HashedMap;
 /**
  * JUnit test.
  *
- * @since 3.1
  */
 public class MapBackedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
index 331d34dbd..fa4f2443b 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractNavigableSetTest} for exercising the
  * {@link PredicatedNavigableSet} implementation.
  *
- * @since 4.1
  */
 public class PredicatedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
index 8312ef43d..48907bbfc 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the
  * {@link PredicatedSet} implementation.
  *
- * @since 3.0
  */
 public class PredicatedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
index b47a20056..e3b422bed 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedSetTest} for exercising the
  * {@link PredicatedSortedSet} implementation.
  *
- * @since 3.0
  */
 public class PredicatedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
index 0c2dbb331..dba33d675 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractNavigableSetTest} for exercising the
  * {@link TransformedNavigableSet} implementation.
  *
- * @since 4.1
  */
 public class TransformedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
index b6f9afb20..0dc2baa34 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the {@link TransformedSet}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
index 4a0282699..68e703a21 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedSetTest} for exercising the {@link TransformedSortedSet}
  * implementation.
  *
- * @since 3.0
  */
 public class TransformedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
index ffdeced27..0bacd8eba 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractNavigableSetTest} for exercising the
  * {@link UnmodifiableNavigableSet} implementation.
  *
- * @since 4.1
  */
 public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
     protected UnmodifiableNavigableSet<E> set;
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
index 72b562f9e..468e597ca 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSetTest} for exercising the
  * {@link UnmodifiableSet} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
index 76eebd2b4..d9270b3b9 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedSetTest} for exercising the
  * {@link UnmodifiableSortedSet} implementation.
  *
- * @since 3.0
  */
 public class UnmodifiableSortedSetTest<E> extends AbstractSortedSetTest<E> {
     protected UnmodifiableSortedSet<E> set;
diff --git a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
index 2b2598988..92750c777 100644
--- a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for {@link TransformedSplitMap}
  *
- * @since 4.0
  */
 @SuppressWarnings("boxing")
 public class TransformedSplitMapTest extends BulkTest {
diff --git a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
index 3d53d1bc9..dfa43b5bb 100644
--- a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
+++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.map.AbstractOrderedMapTest;
 /**
  * JUnit test of the OrderedMap interface of a PatriciaTrie.
  *
- * @since 4.0
  */
 public class PatriciaTrie2Test<V> extends AbstractOrderedMapTest<String, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
index 562693cf4..bdf8c0c15 100755
--- a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
@@ -41,7 +41,6 @@ import org.junit.jupiter.api.Test;
 /**
  * JUnit tests for the PatriciaTrie.
  *
- * @since 4.0
  */
 public class PatriciaTrieTest<V> extends AbstractSortedMapTest<String, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
index d2d37dd7e..17950bfc8 100644
--- a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
  * Extension of {@link AbstractSortedMapTest} for exercising the
  * {@link UnmodifiableTrie} implementation.
  *
- * @since 4.0
  */
 public class UnmodifiableTrieTest<V> extends AbstractSortedMapTest<String, V> {