You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2017/09/12 11:02:23 UTC

[4/6] commons-collections git commit: Remove @version tag as this component has been migrated to git

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
index f7fe023..733a696 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
@@ -44,7 +44,6 @@ import java.util.Iterator;
  * function as an empty iterator.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class LazyIteratorChain<E> implements Iterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
index 3468011..6f844a8 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * This class implements ResettableListIterator from Commons Collections 3.2.
  *
  * @since 2.1
- * @version $Id$
  */
 public class ListIteratorWrapper<E> implements ResettableListIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
index 58720c8..34d328e 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * implementations will throw a ConcurrentModificationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LoopingIterator<E> implements ResettableIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
index f079238..0224764 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * ConcurrentModificationException.
  *
  * @since 3.2
- * @version $Id$
  */
 public class LoopingListIterator<E> implements ResettableListIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
index ea37d5e..a76c1a2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
@@ -28,7 +28,6 @@ import org.w3c.dom.NodeList;
  * removal of items.
  *
  * @since 4.0
- * @version $Id$
  * @see NodeList
  */
 public class NodeListIterator implements Iterator<Node> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
index 6163e0f..055fafe 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.ResettableIterator;
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id$
  */
 public class ObjectArrayIterator<E> implements ResettableIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index c6196ef..db46045 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Id$
  */
 public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
         implements ResettableListIterator<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
index b3afc0b..162f170 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
@@ -72,7 +72,6 @@ import org.apache.commons.collections4.Transformer;
  * more efficient (and convenient) than using nested for loops to extract a list.
  *
  * @since 3.1
- * @version $Id$
  */
 public class ObjectGraphIterator<E> implements Iterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
index e6a2d89..94cd2c3 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
@@ -28,7 +28,6 @@ import java.util.NoSuchElementException;
  * {@link #peek()} or {@link #element()}.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PeekingIterator<E> implements Iterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index cbb5c33..494e79c 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -38,7 +38,6 @@ import java.util.NoSuchElementException;
  *
  * @param <E>  the type of the objects being permuted
  *
- * @version $Id$
  * @since 4.0
  */
 public class PermutationIterator<E> implements Iterator<List<E>> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
index fdc1eb6..031153b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
@@ -31,7 +31,6 @@ import java.util.Iterator;
  * result in an {@link UnsupportedOperationException}.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PushbackIterator<E> implements Iterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
index d5f192a..4025de8 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * continues. The previous methods work similarly.
  *
  * @since 3.2
- * @version $Id$
  */
 public class ReverseListIterator<E> implements ResettableListIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
index 2941a81..451d490 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * object instance.
  *
  * @since 2.0
- * @version $Id$
  */
 public class SingletonIterator<E>
         implements ResettableIterator<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
index 736132e..c554bf4 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * object instance.
  *
  * @since 2.1
- * @version $Id$
  */
 public class SingletonListIterator<E> implements ResettableListIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
index 656b044..45710e5 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
  * before that position.
  *
  * @since 4.1
- * @version $Id$
  */
 public class SkippingIterator<E> extends AbstractIteratorDecorator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
index 09efade..e930c05 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Transformer;
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since 1.0
- * @version $Id$
  */
 public class TransformIterator<I, O> implements Iterator<O> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
index 72c5373..f95c31c 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.functors.UniquePredicate;
  * and duplicate Objects are skipped.
  *
  * @since 2.1
- * @version $Id$
  */
 public class UniqueFilterIterator<E> extends FilterIterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
index 4f7eb63..03ef31f 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
index 8b10417..b02cb6d 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmodifiable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
index 0b4d926..12d1ca1 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, Unmodifiable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
index 34b5711..b671880 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIterator<K, V>,
         Unmodifiable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
index 6b05872..6bdf20a 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.FluentIterable;
  * and {@code B.next()} until both iterators are exhausted.
  *
  * @since 4.1
- * @version $Id$
  */
 public class ZippingIterator<E> implements Iterator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/iterators/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/package-info.java b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
index 0438c02..4fd4037 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
@@ -23,6 +23,5 @@
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.iterators;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
index f8e3329..f816561 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.KeyValue;
  * and {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
index 94adb07..5182930 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
@@ -23,7 +23,6 @@ import java.util.Map;
  * {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapEntry<K, V> extends AbstractKeyValue<K, V> implements Map.Entry<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
index dc7def2..713ee8b 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.KeyValue;
  * added to a {@link java.util.Map.Entry Map.Entry}.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
index 99b46f6..28d8ac5 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.KeyValue;
  * itself as a key or value.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DefaultKeyValue<K, V> extends AbstractKeyValue<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
index b28527f..a1c8539 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.KeyValue;
  * the {@link java.util.Map.Entry Map.Entry} contract from being broken.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class DefaultMapEntry<K, V> extends AbstractMapEntry<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 2b08d8a..430260d 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -40,7 +40,6 @@ import java.util.Arrays;
  * </pre>
  *
  * @since 3.0
- * @version $Id$
  */
 public class MultiKey<K> implements Serializable {
     // This class could implement List, but that would confuse it's purpose

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
index 613d3f3..b2d1898 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.KeyValue;
  * map, however this will probably mess up any iterators.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
index 74be0d0..2bc3027 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * UnsupportedOperationException when <code>setValue</code> is called.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMapEntry<K, V> extends AbstractMapEntry<K, V> implements Unmodifiable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
index 2e20d63..a81b08c 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
@@ -25,6 +25,5 @@
  *   <li>MultiKey - a holder of multiple keys tied together
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.keyvalue;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 9fdc2ef..50c3e12 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.OrderedIterator;
  * is here.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractLinkedList<E> implements List<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
index bef23bf..e72b645 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  *
  * @param <E> the type of the elements in the list
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorator<E>
         implements List<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
index 61dc970..3fc24d4 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
@@ -26,7 +26,6 @@ import java.util.List;
  * Serializable subclass of AbstractListDecorator.
  *
  * @since 3.1
- * @version $Id$
  */
 public abstract class AbstractSerializableListDecorator<E>
         extends AbstractListDecorator<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index 46c504e..e948475 100644
--- a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -53,7 +53,6 @@ import java.util.ListIterator;
  *
  * @see java.util.LinkedList
  * @since 1.0
- * @version $Id$
  */
 public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
index d397019..56fda3a 100644
--- a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeList<E>
         extends AbstractSerializableListDecorator<E>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/GrowthList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
index 10ce036..b81802e 100644
--- a/src/main/java/org/apache/commons/collections4/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
@@ -50,7 +50,6 @@ import java.util.List;
  *
  * @see LazyList
  * @since 3.2
- * @version $Id$
  */
 public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/LazyList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java
index 22f6b04..31e70fc 100644
--- a/src/main/java/org/apache/commons/collections4/list/LazyList.java
+++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.Factory;
  *
  * @see GrowthList
  * @since 3.0
- * @version $Id$
  */
 public class LazyList<E> extends AbstractSerializableListDecorator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
index bb5fd2c..71e8630 100644
--- a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
@@ -37,7 +37,6 @@ import java.util.Collection;
  * <b>Note that this implementation is not synchronized.</b>
  *
  * @since 3.0
- * @version $Id$
  */
 public class NodeCachingLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
index 0501d9e..45d2caa 100644
--- a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedList<E> extends PredicatedCollection<E> implements List<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index f1e3bb6..3291145 100644
--- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -46,7 +46,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/TransformedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
index 9c2de73..85306a1 100644
--- a/src/main/java/org/apache/commons/collections4/list/TransformedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedList<E> extends TransformedCollection<E> implements List<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/TreeList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java
index 77285c6..feffa1c 100644
--- a/src/main/java/org/apache/commons/collections4/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections4.OrderedIterator;
  * does use slightly more memory.
  *
  * @since 3.1
- * @version $Id$
  */
 public class TreeList<E> extends AbstractList<E> {
 //    add; toArray; iterator; insert; get; indexOf; remove

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
index c23e4e6..be496c1 100644
--- a/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
+++ b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableList<E>
         extends AbstractSerializableListDecorator<E>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/list/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/package-info.java b/src/main/java/org/apache/commons/collections4/list/package-info.java
index 7ac1cae..91c0121 100644
--- a/src/main/java/org/apache/commons/collections4/list/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/list/package-info.java
@@ -35,6 +35,5 @@
  *   <li>SetUnique - a list that avoids duplicate entries like a Set</li>
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.list;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
index 78ee18e..1b91f39 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator;
  * This extends clause will be removed in v5.0.
  *
  * @since 3.0
- * @version $Id$
  */
 public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements IterableMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
index 0ba6d6e..45028ce 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.set.AbstractSetDecorator;
  * </p>
  *
  * @since 3.1
- * @version $Id$
  */
 abstract class AbstractInputCheckedMapDecorator<K, V>
         extends AbstractMapDecorator<K, V> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
index 2927fff..2fd1739 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.MapIterator;
  * Provide a basic {@link IterableMap} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractIterableMap<K, V> implements IterableMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
index 0d6967e..1595a08 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
  * methods exposed.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
index 1939bad..1599418 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
@@ -36,7 +36,6 @@ import java.util.Set;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
index 6c06d2f..568c1bc 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractOrderedMapDecorator<K, V> extends AbstractMapDecorator<K, V>
         implements OrderedMap<K, V> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index 5cbd87b..9ccd7e5 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -77,7 +77,6 @@ import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
  *
  * @see java.lang.ref.Reference
  * @since 3.1 (extracted from ReferenceMap in 3.0)
- * @version $Id$
  */
 public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
index 1cb568f..a0f6018 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
@@ -42,7 +42,6 @@ import org.apache.commons.collections4.iterators.ListIteratorWrapper;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecorator<K, V> implements
         IterableSortedMap<K, V> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
index 176f6f3..334016c 100644
--- a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
@@ -60,7 +60,6 @@ import java.util.Map;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class CaseInsensitiveMap<K, V> extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index 5f53bef..df19db9 100644
--- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.collection.CompositeCollection;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index faddcdf..89b4b77 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.2
- * @version $Id$
  *
  * @see LazyMap
  */

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
index d100a40..8b4cbe5 100644
--- a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
+++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Adapts a Map entrySet to the MapIterator interface.
  *
  * @since 4.0
- * @version $Id$
  */
 public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
index b909aef..7322d12 100644
--- a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
@@ -50,7 +50,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeMap<K, V>
         extends AbstractMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
index f57e8e9..9b7c06e 100644
--- a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
@@ -52,7 +52,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
index dcce62a..c93e601 100644
--- a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
+++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
@@ -68,7 +68,6 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/HashedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/HashedMap.java b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
index 9c66adc..06353e4 100644
--- a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
@@ -37,7 +37,6 @@ import java.util.Map;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class HashedMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/LRUMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
index e05d26d..d03754a 100644
--- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.BoundedMap;
  * <code>NullPointerException</code>'s when accessed by concurrent threads.
  *
  * @since 3.0 (previously in main package v1.0)
- * @version $Id$
  */
 public class LRUMap<K, V>
         extends AbstractLinkedMap<K, V> implements BoundedMap<K, V>, Serializable, Cloneable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/LazyMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/LazyMap.java b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
index b46a156..51d933b 100644
--- a/src/main/java/org/apache/commons/collections4/map/LazyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
index ddaf9b6..a706c1b 100644
--- a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LazySortedMap<K,V> extends LazyMap<K,V> implements SortedMap<K,V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
index 6c5db90..3e73b77 100644
--- a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
@@ -58,7 +58,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LinkedMap<K, V> extends AbstractLinkedMap<K, V> implements Serializable, Cloneable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
index b8de298..34bd0bd 100644
--- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
@@ -73,7 +73,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * This class is {@link Serializable} starting with Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ListOrderedMap<K, V>
         extends AbstractMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
index 093e74f..960a3ba 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
@@ -72,7 +72,6 @@ import org.apache.commons.collections4.keyvalue.MultiKey;
  * by concurrent threads without synchronization.
  *
  * @since 3.1
- * @version $Id$
  */
 public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K>, V>
         implements Serializable, Cloneable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
index 7d4ee9a..5ff05ca 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -60,7 +60,6 @@ import org.apache.commons.collections4.iterators.TransformIterator;
  * by concurrent threads without synchronization.
  *
  * @since 3.2
- * @version $Id$
  * @deprecated since 4.1, use {@link org.apache.commons.collections4.MultiValuedMap MultiValuedMap} instead
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index 8ba588a..32d2af0 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -58,7 +58,6 @@ import java.util.concurrent.TimeUnit;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 4.0
- * @version $Id$
  */
 public class PassiveExpiringMap<K, V>
     extends AbstractMapDecorator<K, V>
@@ -72,7 +71,6 @@ public class PassiveExpiringMap<K, V>
      * @param <K> the type of the keys in the map
      * @param <V> the type of the values in the map
      * @since 4.0
-     * @version $Id$
      */
     public static class ConstantTimeToLiveExpirationPolicy<K, V>
         implements ExpirationPolicy<K, V> {
@@ -160,7 +158,6 @@ public class PassiveExpiringMap<K, V>
      * @param <K> the key object type.
      * @param <V> the value object type
      * @since 4.0
-     * @version $Id$
      */
     public static interface ExpirationPolicy<K, V>
         extends Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
index b8fd06e..abcd11d 100644
--- a/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
@@ -45,7 +45,6 @@ import org.apache.commons.collections4.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
index 935654e..a2abd53 100644
--- a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
@@ -46,7 +46,6 @@ import org.apache.commons.collections4.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedMap<K, V> extends PredicatedMap<K, V> implements SortedMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
index 8eafcd2..270854d 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
@@ -73,7 +73,6 @@ import java.lang.ref.Reference;
  * @see java.lang.ref.Reference
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public class ReferenceIdentityMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
index 66f919e..aa82ff9 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
@@ -68,7 +68,6 @@ import java.io.Serializable;
  * @see java.lang.ref.Reference
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public class ReferenceMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
index ff83737..59fc615 100644
--- a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.keyvalue.TiedMapEntry;
  * </ul>
  *
  * @since 3.1
- * @version $Id$
  */
 public class SingletonMap<K, V>
         implements OrderedMap<K, V>, BoundedMap<K, V>, KeyValue<K, V>, Serializable, Cloneable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index a62197d..9915bbd 100644
--- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -91,7 +91,6 @@ import org.apache.commons.collections4.KeyValue;
  * operations will affect the map.<p>
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
index c8715a3..fcd8287 100644
--- a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.Transformer;
  * @see org.apache.commons.collections4.splitmap.TransformedSplitMap
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
index 04273a3..34a0082 100644
--- a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedMap<K, V>
         extends TransformedMap<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
index 088f1f8..82a46b6 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.set.AbstractSetDecorator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableEntrySet<K, V>
         extends AbstractSetDecorator<Map.Entry<K, V>> implements Unmodifiable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
index 1348aa6..02378b6 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMap<K, V>
         extends AbstractMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
index 4d5d23b..d168603 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecorator<K, V> implements
         Unmodifiable, Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
index cafa293..a49e856 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/map/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/map/package-info.java b/src/main/java/org/apache/commons/collections4/map/package-info.java
index 7407697..e2be5cf 100644
--- a/src/main/java/org/apache/commons/collections4/map/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/map/package-info.java
@@ -49,7 +49,6 @@
  *   <li>ListOrdered - ensures that insertion order is retained
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.map;
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
index aafd847..8904f6c 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.ListValuedMap;
  * the List implementation to use as values.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
         implements ListValuedMap<K, V> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
index f4c97fb..620667b 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
@@ -52,7 +52,6 @@ import org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
  * Subclasses specify a Map implementation to use as the internal storage.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
index ff520ca..d49e7a0 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiValuedMapDecorator<K, V>
         implements MultiValuedMap<K, V>, Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
index eb0b2b1..96c3140 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.SetValuedMap;
  * the Set implementation to use as values.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
     implements SetValuedMap<K, V> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
index dfaf13b..873dccf 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 4.1
- * @version $Id$
  */
 public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
     implements Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
index a1ad0a9..b06ada8 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
     implements Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
index acef611..ed1e17a 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.Transformer;
  * <strong>Note that TransformedMultiValuedMap is not synchronized and is not thread-safe.</strong>
  *
  * @since 4.1
- * @version $Id$
  */
 public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecorator<K, V> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
index 2370b1a..1bd629f 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id$
  */
 public final class UnmodifiableMultiValuedMap<K, V>
         extends AbstractMultiValuedMapDecorator<K, V> implements Unmodifiable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multimap/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/package-info.java b/src/main/java/org/apache/commons/collections4/multimap/package-info.java
index 030d3fe..a989234 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/package-info.java
@@ -30,6 +30,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.multimap;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
index d0f22cf..f742854 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
  * number of occurrences of that element in the multiset.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
index 22191af..261175f 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.Transformer;
  * creation of subclass implementations.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implements MultiSet<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
index d504cb2..4c80eb5 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated multiset.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiSetDecorator<E>
         extends AbstractCollectionDecorator<E> implements MultiSet<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
index 73ccf07..0c19848 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
@@ -32,7 +32,6 @@ import java.util.HashMap;
  * of an object to be added or removed at once.
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashMultiSet<E> extends AbstractMapMultiSet<E> implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
index 420677a..b5d1b7e 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * </pre>
  *
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedMultiSet<E> extends PredicatedCollection<E> implements MultiSet<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
index 33ca710..f069720 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
  * Iterators must be separately synchronized around the loop.
  *
  * @since 4.1
- * @version $Id$
  */
 public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implements MultiSet<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
index bd297b0..ddfadc0 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 4.1
- * @version $Id$
  */
 public final class UnmodifiableMultiSet<E>
         extends AbstractMultiSetDecorator<E> implements Unmodifiable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/multiset/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multiset/package-info.java b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
index 40378a1..014a003 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
@@ -31,6 +31,5 @@
  *   <li>Unmodifiable - ensures the multiset cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.multiset;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/package-info.java b/src/main/java/org/apache/commons/collections4/package-info.java
index d7229f5..2608ea2 100644
--- a/src/main/java/org/apache/commons/collections4/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/package-info.java
@@ -22,6 +22,5 @@
  *   <li>ArrayStack - a non synchronized Stack that follows the same API as {@code java.util Stack}
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4;

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
index 3801757..ba8b587 100644
--- a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  *
  * @param <E> the type of the elements in the queue
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractQueueDecorator<E> extends AbstractCollectionDecorator<E>
         implements Queue<E> {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
index 3b098b3..8beb531 100644
--- a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
@@ -44,7 +44,6 @@ import org.apache.commons.collections4.BoundedCollection;
  * This queue prevents null objects from being added.
  *
  * @since 4.0
- * @version $Id$
  */
 public class CircularFifoQueue<E> extends AbstractCollection<E>
     implements Queue<E>, BoundedCollection<E>, Serializable {

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
index 507ab59..016b95d 100644
--- a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * <pre>Queue queue = PredicatedQueue.predicatedQueue(new UnboundedFifoQueue(), NotNullPredicate.INSTANCE);</pre>
  *
  * @since 4.0
- * @version $Id$
  */
 public class PredicatedQueue<E> extends PredicatedCollection<E> implements Queue<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
index b2ac4df..b42366c 100644
--- a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.TransformedCollection;
  * use the Integer form to remove objects.
  *
  * @since 4.0
- * @version $Id$
  */
 public class TransformedQueue<E> extends TransformedCollection<E> implements Queue<E> {
 

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/29d2e939/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
index 5c8384b..309aaac 100644
--- a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 4.0
- * @version $Id$
  */
 public final class UnmodifiableQueue<E>
         extends AbstractQueueDecorator<E>