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 https://github.com/google/guava/tree/master/guava-testlib
* @see https://issues.apache.org/jira/browse/COLLECTIONS-802
*/
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 extends AbstractBagTest {
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 extends AbstractCollectionTest {
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 extends AbstractCollectionTest {
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 extends AbstractBagTest {
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 extends AbstractSortedBagTest {
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 extends AbstractBagTest {
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 extends AbstractBagTest {
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 extends AbstractSortedBagTest {
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 extends AbstractBagTest {
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 extends AbstractSortedBagTest {
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 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 extends AbstractCollectionTest {
@@ -373,7 +372,6 @@ public class CompositeCollectionTest extends AbstractCollectionTest {
}
/**
- * @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 {
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 extends AbstractCollectionTest {
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 extends AbstractCollectionTest {
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