Removed @version $ from source per LANG-1129

251 files changed, 2 insertions, 254 deletions

diff --git a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
index b3692690b..fee44c006 100644
--- a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * <p>#ThreadSafe#</p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class AnnotationUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index 0afe0e406..afb384d72 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.mutable.MutableInt;
  *
  * <p>#ThreadSafe#</p>
  * @since 2.0
- * @version $Id$
  */
 public class ArrayUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java
index 06e127e88..824d24212 100644
--- a/src/main/java/org/apache/commons/lang3/BitField.java
+++ b/src/main/java/org/apache/commons/lang3/BitField.java
@@ -69,7 +69,6 @@ package org.apache.commons.lang3;
  *</pre>
  *
  * @since 2.0
- * @version $Id$
  */
 public class BitField {
     
diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
index 1832fe0fd..ba5dea00c 100644
--- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java
+++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.lang3.math.NumberUtils;
  *
  * <p>#ThreadSafe#</p>
  * @since 2.0
- * @version $Id$
  */
 public class BooleanUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/CharEncoding.java b/src/main/java/org/apache/commons/lang3/CharEncoding.java
index 2b48829b9..ea682847c 100644
--- a/src/main/java/org/apache/commons/lang3/CharEncoding.java
+++ b/src/main/java/org/apache/commons/lang3/CharEncoding.java
@@ -32,7 +32,6 @@ import java.nio.charset.IllegalCharsetNameException;
  *
  * @see <a href="http://download.oracle.com/javase/1.3/docs/guide/intl/encoding.doc.html">JRE character encoding names</a>
  * @since 2.1
- * @version $Id$
  */
 public class CharEncoding {
 
diff --git a/src/main/java/org/apache/commons/lang3/CharRange.java b/src/main/java/org/apache/commons/lang3/CharRange.java
index 39b26f9fc..2ccda7c4e 100644
--- a/src/main/java/org/apache/commons/lang3/CharRange.java
+++ b/src/main/java/org/apache/commons/lang3/CharRange.java
@@ -27,7 +27,6 @@ import java.util.NoSuchElementException;
  *
  * <p>#ThreadSafe#</p>
  * @since 1.0
- * @version $Id$
  */
 // TODO: This is no longer public and will be removed later as CharSet is moved 
 // to depend on Range.
diff --git a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
index 2395dc5ff..4335c9bd9 100644
--- a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
@@ -22,7 +22,6 @@ package org.apache.commons.lang3;
  *
  * @see CharSequence
  * @since 3.0
- * @version $Id$
  */
 public class CharSequenceUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java
index 5adae758f..2cd4c7bde 100644
--- a/src/main/java/org/apache/commons/lang3/CharSet.java
+++ b/src/main/java/org/apache/commons/lang3/CharSet.java
@@ -30,7 +30,6 @@ import java.util.Set;
  *
  * <p>#ThreadSafe#</p>
  * @since 1.0
- * @version $Id$
  */
 public class CharSet implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/CharSetUtils.java b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
index 704a8fb85..859967410 100644
--- a/src/main/java/org/apache/commons/lang3/CharSetUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
@@ -26,7 +26,6 @@ package org.apache.commons.lang3;
  * <p>#ThreadSafe#</p>
  * @see CharSet
  * @since 1.0
- * @version $Id$
  */
 public class CharSetUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/CharUtils.java b/src/main/java/org/apache/commons/lang3/CharUtils.java
index eb0c2c684..3e9574115 100644
--- a/src/main/java/org/apache/commons/lang3/CharUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharUtils.java
@@ -25,7 +25,6 @@ package org.apache.commons.lang3;
  * 
  * <p>#ThreadSafe#</p>
  * @since 2.1
- * @version $Id$
  */
 public class CharUtils {
     
diff --git a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
index ea42425e8..2a9f16f0e 100644
--- a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
@@ -22,7 +22,6 @@ package org.apache.commons.lang3;
  * <p>The methods of this class do not allow {@code null} inputs.</p>
  *
  * @since 3.3
- * @version $Id$
  */
 //@Immutable
 public class ClassPathUtils {
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index c56aeab89..0a7480ff8 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.mutable.MutableObject;
  * {@code [I}. </p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class ClassUtils {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index 10f2daef5..05df59430 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -61,7 +61,6 @@ import java.util.UUID;
  * </p>
  * 
  * @since Lang 3.2
- * @version $Id$
  */
 
 public class Conversion {
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index 242ed4051..f98506208 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -30,7 +30,6 @@ import java.util.Map;
  * <p>#ThreadSafe#</p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class EnumUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java
index 822699d24..e37d5ba9c 100644
--- a/src/main/java/org/apache/commons/lang3/JavaVersion.java
+++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java
@@ -22,7 +22,6 @@ package org.apache.commons.lang3;
  * <em>java.specification.version</em> System property. </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public enum JavaVersion {
     
diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index cf2e859d9..3bd2ec1da 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentMap;
  * Each method documents its behaviour in more detail.</p>
  *
  * @since 2.2
- * @version $Id$
  */
 public class LocaleUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/NotImplementedException.java b/src/main/java/org/apache/commons/lang3/NotImplementedException.java
index 51038298f..82e3784e8 100644
--- a/src/main/java/org/apache/commons/lang3/NotImplementedException.java
+++ b/src/main/java/org/apache/commons/lang3/NotImplementedException.java
@@ -39,7 +39,6 @@ package org.apache.commons.lang3;
  * This class was originally added in Lang 2.0, but removed in 3.0.
  *
  * @since 3.2 
- * @version $Id: NotImplementedException.java 905636 2010-02-02 14:03:32Z niallp $
  */
 public class NotImplementedException extends UnsupportedOperationException {
 
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index 8a8a7ab15..46d35dd34 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -40,7 +40,6 @@ import org.apache.commons.lang3.text.StrBuilder;
  *
  * <p>#ThreadSafe#</p>
  * @since 1.0
- * @version $Id$
  */
 //@Immutable
 public class ObjectUtils {
diff --git a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
index 9c09f54a0..f9ed698df 100644
--- a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
@@ -31,7 +31,6 @@ import java.util.Random;
  *
  * <p>#ThreadSafe#</p>
  * @since 1.0
- * @version $Id$
  */
 public class RandomStringUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/RandomUtils.java b/src/main/java/org/apache/commons/lang3/RandomUtils.java
index 0846a237c..2bef91ab3 100644
--- a/src/main/java/org/apache/commons/lang3/RandomUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomUtils.java
@@ -23,7 +23,6 @@ import java.util.Random;
  * 
  * @since 3.3
  *
- * @version $Id$
  */
 public class RandomUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/Range.java b/src/main/java/org/apache/commons/lang3/Range.java
index 62d219c3a..450897f65 100644
--- a/src/main/java/org/apache/commons/lang3/Range.java
+++ b/src/main/java/org/apache/commons/lang3/Range.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
  * <p>#ThreadSafe# if the objects and comparator are thread-safe</p>
  * 
  * @since 3.0
- * @version $Id$
  */
 public final class Range<T> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/SerializationException.java b/src/main/java/org/apache/commons/lang3/SerializationException.java
index 20e6cc4c6..588eff05a 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationException.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationException.java
@@ -23,7 +23,6 @@ package org.apache.commons.lang3;
  *
  * <p>#NotThreadSafe# because Throwable is not thread-safe</p>
  * @since 1.0
- * @version $Id$
  */
 public class SerializationException extends RuntimeException {
 
diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
index d4384368a..68ebbd5b6 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
@@ -43,7 +43,6 @@ import java.util.Map;
  *
  * <p>#ThreadSafe#</p>
  * @since 1.0
- * @version $Id$
  */
 public class SerializationUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
index da19c00fb..a69f3f3fb 100644
--- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
@@ -36,7 +36,6 @@ import org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover;
  *
  * <p>#ThreadSafe#</p>
  * @since 2.0
- * @version $Id$
  */
 public class StringEscapeUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index a8cd1d4a9..55d81914e 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -111,7 +111,6 @@ import java.util.regex.Pattern;
  * <p>#ThreadSafe#</p>
  * @see java.lang.String
  * @since 1.0
- * @version $Id$
  */
 //@Immutable
 public class StringUtils {
diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java
index 292b1b4d4..527cf0e36 100644
--- a/src/main/java/org/apache/commons/lang3/SystemUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java
@@ -31,7 +31,6 @@ import java.io.File;
  * </p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class SystemUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
index c8af09471..a0177ae6e 100644
--- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
@@ -32,7 +32,6 @@ import java.util.List;
  * @see java.lang.Thread
  * @see java.lang.ThreadGroup
  * @since 3.5
- * @version $Id$
  */
 public class ThreadUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java
index 3b7c766dc..f83089549 100644
--- a/src/main/java/org/apache/commons/lang3/Validate.java
+++ b/src/main/java/org/apache/commons/lang3/Validate.java
@@ -40,7 +40,6 @@ import java.util.regex.Pattern;
  * </pre>
  *
  * <p>#ThreadSafe#</p>
- * @version $Id$
  * @see java.lang.String#format(String, Object...)
  * @since 2.0
  */
diff --git a/src/main/java/org/apache/commons/lang3/builder/Builder.java b/src/main/java/org/apache/commons/lang3/builder/Builder.java
index eeb207d3e..496d2248e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Builder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Builder.java
@@ -75,7 +75,6 @@ package org.apache.commons.lang3.builder;
  * @param <T> the type of object that the builder will construct or compute.
  * 
  * @since 3.0
- * @version $Id$
  */
 public interface Builder<T> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
index 52e33f295..56d2fcd91 100644
--- a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
@@ -91,7 +91,6 @@ import org.apache.commons.lang3.ArrayUtils;
  * @see EqualsBuilder
  * @see HashCodeBuilder
  * @since 1.0
- * @version $Id$
  */
 public class CompareToBuilder implements Builder<Integer> {
     
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diff.java b/src/main/java/org/apache/commons/lang3/builder/Diff.java
index 7d3f28def..d1b0dafd2 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diff.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diff.java
@@ -39,7 +39,6 @@ import org.apache.commons.lang3.tuple.Pair;
  *            between primitive objects are stored as their Object wrapper
  *            equivalent.
  * @since 3.3
- * @version $Id$
  */
 public abstract class Diff<T> extends Pair<T, T> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index e4f4ed0fa..7a97e9cae 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -58,7 +58,6 @@ import org.apache.commons.lang3.ArrayUtils;
  * </p>
  * 
  * @since 3.3
- * @version $Id$
  * @see Diffable
  * @see Diff
  * @see DiffResult
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index c321ba5c1..2dbd85eb6 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -32,7 +32,6 @@ import java.util.List;
  * </p>
  * 
  * @since 3.3
- * @version $Id$
  */
 public class DiffResult implements Iterable<Diff<?>> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diffable.java b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
index 6fc5bdbc5..9f85eb132 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diffable.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
@@ -38,7 +38,6 @@ package org.apache.commons.lang3.builder;
  *
  * @param <T> the type of objects that this object may be differentiated against
  * @since 3.3
- * @version $Id$
  */
 public interface Diffable<T> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
index 7551b0daa..eb7b6f1f6 100644
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
@@ -82,7 +82,6 @@ import org.apache.commons.lang3.tuple.Pair;
  * used by the <code>reflectionEquals</code> methods.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class EqualsBuilder implements Builder<Boolean> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index a2956a5a0..d56ee9f46 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -99,7 +99,6 @@ import org.apache.commons.lang3.Validate;
  * used by the <code>reflectionHashCode</code> methods.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class HashCodeBuilder implements Builder<Integer> {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
index dd86e3afb..d54e8b9cc 100644
--- a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
@@ -61,7 +61,6 @@ import org.apache.commons.lang3.SystemUtils;
  * </p>
  * 
  * @since 3.4
- * @version $Id$
  */
 public class MultilineRecursiveToStringStyle extends RecursiveToStringStyle {
 
@@ -217,4 +216,4 @@ public class MultilineRecursiveToStringStyle extends RecursiveToStringStyle {
         resetIndent();
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
index 99fb5e464..b39e9eaaa 100644
--- a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
@@ -49,7 +49,6 @@ import org.apache.commons.lang3.ClassUtils;
  * <code>Person@7f54[name=Stephen,age=29,smoker=false,job=Job@43cd2[title=Manager]]</code></p>
  * 
  * @since 3.2
- * @version $Id$
  */
 public class RecursiveToStringStyle extends ToStringStyle {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index e34c11b9b..d172b1e17 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -92,7 +92,6 @@ import org.apache.commons.lang3.ClassUtils;
  * </p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class ReflectionToStringBuilder extends ToStringBuilder {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
index 929103857..b9ba30c3b 100644
--- a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
@@ -26,7 +26,6 @@ package org.apache.commons.lang3.builder;
  * program to access.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class StandardToStringStyle extends ToStringStyle {
     
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
index e933665ec..43637516e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
@@ -84,7 +84,6 @@ import org.apache.commons.lang3.ObjectUtils;
  * the {@link ToStringStyle} passed into the constructor.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class ToStringBuilder implements Builder<String> {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
index fbb40474d..667990d5b 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
@@ -61,7 +61,6 @@ import org.apache.commons.lang3.SystemUtils;
  * </pre>
  *
  * @since 1.0
- * @version $Id$
  */
 public abstract class ToStringStyle implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/builder/package-info.java b/src/main/java/org/apache/commons/lang3/builder/package-info.java
index 401fce75f..0043587f3 100644
--- a/src/main/java/org/apache/commons/lang3/builder/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/builder/package-info.java
@@ -29,6 +29,5 @@
  * @see java.lang.Comparable#compareTo(Object)
  *
  * @since 1.0
- * @version $Id$
  */
 package org.apache.commons.lang3.builder;
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
index e6219ee96..416dba7e0 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
@@ -61,7 +61,6 @@ import java.util.concurrent.atomic.AtomicReference;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public abstract class AtomicInitializer<T> implements ConcurrentInitializer<T> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
index 5bb5096db..3ad5e4eb3 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
@@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicReference;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public abstract class AtomicSafeInitializer<T> implements
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
index 7b6043bda..7b2662fac 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
@@ -80,7 +80,6 @@ import java.util.concurrent.Future;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public abstract class BackgroundInitializer<T> implements
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
index 6c61189a6..9164ccaf6 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
@@ -85,7 +85,6 @@ import java.util.concurrent.atomic.AtomicLong;
  * </pre>
  *
  * @since 3.0
- * @version $Id$
  */
 public class BasicThreadFactory implements ThreadFactory {
     /** A counter for the threads created by this factory. */
@@ -249,7 +248,6 @@ public class BasicThreadFactory implements ThreadFactory {
      * BasicThreadFactory} for a usage example.
      * </p>
      *
-     * @version $Id$
      */
     public static class Builder 
         implements org.apache.commons.lang3.builder.Builder<BasicThreadFactory> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
index b95bf2a9e..19414003a 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
@@ -62,7 +62,6 @@ import java.util.concurrent.ExecutorService;
  *
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public class CallableBackgroundInitializer<T> extends BackgroundInitializer<T> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java
index 8d6fb5464..92c642c09 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentException.java
@@ -30,7 +30,6 @@ package org.apache.commons.lang3.concurrent;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class ConcurrentException extends Exception {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
index 7d5974d17..5532f74b1 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentInitializer.java
@@ -35,7 +35,6 @@ package org.apache.commons.lang3.concurrent;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public interface ConcurrentInitializer<T> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java
index f329f8f58..a9e7d70a4 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentRuntimeException.java
@@ -31,7 +31,6 @@ package org.apache.commons.lang3.concurrent;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class ConcurrentRuntimeException extends RuntimeException {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java
index 8a98893f4..06c4080ab 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.Validate;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class ConcurrentUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
index 0d15711ac..7d5e4fc62 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
@@ -35,7 +35,6 @@ import org.apache.commons.lang3.ObjectUtils;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer
  */
 public class ConstantInitializer<T> implements ConcurrentInitializer<T> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
index a13e6de43..be5482a80 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
@@ -75,7 +75,6 @@ package org.apache.commons.lang3.concurrent;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  * @param <T> the type of the object managed by this initializer class
  */
 public abstract class LazyInitializer<T> implements ConcurrentInitializer<T> {
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
index 61e0bd97c..2ca5c6e49 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
@@ -92,7 +92,6 @@ import java.util.concurrent.ExecutorService;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class MultiBackgroundInitializer
         extends
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
index a3c19b3ca..9e47b160f 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
@@ -127,7 +127,6 @@ import org.apache.commons.lang3.Validate;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class TimedSemaphore {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/package-info.java b/src/main/java/org/apache/commons/lang3/concurrent/package-info.java
index 9b5b08812..0ff55f00b 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/package-info.java
@@ -435,6 +435,5 @@
  * Also some statistical data is available, e.g. the average number of <code>acquire()</code> calls per time frame.
  * When a timed semaphore is no more needed, its <code>shutdown()</code> method has to be called.</p>
  *
- * @version $Id$
  */
 package org.apache.commons.lang3.concurrent;
diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index f9857ef22..0f51796fb 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -65,7 +65,6 @@ import org.apache.commons.lang3.Validate;
  * @param <L> the type of event listener that is supported by this proxy.
  *
  * @since 3.0
- * @version $Id$
  */
 public class EventListenerSupport<L> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/event/EventUtils.java b/src/main/java/org/apache/commons/lang3/event/EventUtils.java
index fc19b9b16..0bddc9309 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventUtils.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventUtils.java
@@ -31,7 +31,6 @@ import org.apache.commons.lang3.reflect.MethodUtils;
  * Provides some useful event-based utility methods.
  *
  * @since 3.0
- * @version $Id$
  */
 public class EventUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/event/package-info.java b/src/main/java/org/apache/commons/lang3/event/package-info.java
index 4b70c15b4..0227a16bc 100644
--- a/src/main/java/org/apache/commons/lang3/event/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/event/package-info.java
@@ -18,6 +18,5 @@
  * Provides some useful event-based utilities.
  *
  * @since 3.0
- * @version $Id$
  */
 package org.apache.commons.lang3.event;
diff --git a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
index 7e803ddc2..a64357c85 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -35,7 +35,6 @@ import org.apache.commons.lang3.SystemUtils;
  * <code>Throwable</code> objects.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 public class ExceptionUtils {
     
diff --git a/src/main/java/org/apache/commons/lang3/exception/package-info.java b/src/main/java/org/apache/commons/lang3/exception/package-info.java
index 713f60877..b2f31a9de 100644
--- a/src/main/java/org/apache/commons/lang3/exception/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/exception/package-info.java
@@ -22,6 +22,5 @@
  * and examination routines.</p>
  *
  * @since 1.0
- * @version $Id$
  */
 package org.apache.commons.lang3.exception;
diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java
index 100bd1680..ee1d638e1 100644
--- a/src/main/java/org/apache/commons/lang3/math/Fraction.java
+++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java
@@ -30,7 +30,6 @@ import java.math.BigInteger;
  * equivalent, please see the Commons Math BigFraction class. </p>
  *
  * @since 2.0
- * @version $Id$
  */
 public final class Fraction extends Number implements Comparable<Fraction> {
 
diff --git a/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java b/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
index a32ce47c7..6d34e62d0 100644
--- a/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/IEEE754rUtils.java
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.Validate;
  * <p>See: <a href="http://en.wikipedia.org/wiki/IEEE_754r">http://en.wikipedia.org/wiki/IEEE_754r</a></p>
  *
  * @since 2.4
- * @version $Id$
  */
 public class IEEE754rUtils {
     
diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
index 7b3f739b5..8f99c782d 100644
--- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.lang3.Validate;
  * <p>Provides extra functionality for Java Number classes.</p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class NumberUtils {
     
diff --git a/src/main/java/org/apache/commons/lang3/math/package-info.java b/src/main/java/org/apache/commons/lang3/math/package-info.java
index a3329e0b3..fd6f8623d 100644
--- a/src/main/java/org/apache/commons/lang3/math/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/math/package-info.java
@@ -29,6 +29,5 @@
  * NumberUtils also has a related {@link org.apache.commons.lang3.math.NumberUtils#isNumber(String) isNumber(String)} method.</p>
  *
  * @since 2.0
- * @version $Id$
  */
 package org.apache.commons.lang3.math;
diff --git a/src/main/java/org/apache/commons/lang3/mutable/Mutable.java b/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
index b36dc394e..301cac22c 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/Mutable.java
@@ -28,7 +28,6 @@ package org.apache.commons.lang3.mutable;
  * 
  * @param <T> the type to set and get 
  * @since 2.1
- * @version $Id$
  */
 public interface Mutable<T> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java b/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
index 31755ca97..085df4007 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.BooleanUtils;
  * 
  * @see Boolean
  * @since 2.2
- * @version $Id$
  */
 public class MutableBoolean implements Mutable<Boolean>, Serializable, Comparable<MutableBoolean> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
index abe43fa4d..80edf3a01 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.math.NumberUtils;
  * 
  * @see Byte
  * @since 2.1
- * @version $Id$
  */
 public class MutableByte extends Number implements Comparable<MutableByte>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
index 907c198f6..855b04cca 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
@@ -23,7 +23,6 @@ package org.apache.commons.lang3.mutable;
  * 
  * @see Double
  * @since 2.1
- * @version $Id$
  */
 public class MutableDouble extends Number implements Comparable<MutableDouble>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
index 3a4ae688f..7f798f7ec 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
@@ -23,7 +23,6 @@ package org.apache.commons.lang3.mutable;
  * 
  * @see Float
  * @since 2.1
- * @version $Id$
  */
 public class MutableFloat extends Number implements Comparable<MutableFloat>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
index 87e4dbd32..1b86adede 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.math.NumberUtils;
  * 
  * @see Integer
  * @since 2.1
- * @version $Id$
  */
 public class MutableInt extends Number implements Comparable<MutableInt>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
index 569d69bf7..d9391c4a3 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.math.NumberUtils;
  * 
  * @see Long
  * @since 2.1
- * @version $Id$
  */
 public class MutableLong extends Number implements Comparable<MutableLong>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java b/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
index a92a53d41..180cf3a70 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableObject.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
  * 
  * @param <T> the type to set and get 
  * @since 2.1
- * @version $Id$
  */
 public class MutableObject<T> implements Mutable<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
index 7245b3cd2..531324506 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.math.NumberUtils;
  * 
  * @see Short
  * @since 2.1
- * @version $Id$
  */
 public class MutableShort extends Number implements Comparable<MutableShort>, Mutable<Number> {
 
diff --git a/src/main/java/org/apache/commons/lang3/mutable/package-info.java b/src/main/java/org/apache/commons/lang3/mutable/package-info.java
index 911f19fc8..c5b834737 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/package-info.java
@@ -20,6 +20,5 @@
  * These classes are not thread-safe.</p>
  *
  * @since 2.1
- * @version $Id$
  */
 package org.apache.commons.lang3.mutable;
diff --git a/src/main/java/org/apache/commons/lang3/package-info.java b/src/main/java/org/apache/commons/lang3/package-info.java
index 7868e2a2f..88779d7a0 100644
--- a/src/main/java/org/apache/commons/lang3/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/package-info.java
@@ -120,6 +120,5 @@
  * <p>The {@link org.apache.commons.lang3.BitField} class provides a wrapper class around the classic bitmask integer, whilst the {@link org.apache.commons.lang3.Validate} class may be used for assertions (remember, we support Java 1.2). </p>
  *
  * @since 1.0
- * @version $Id$
  */
 package org.apache.commons.lang3;
diff --git a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
index 5eca29439..7d4369458 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate;
  * fails then a warning will be logged and the method may fail.</p>
  *
  * @since 2.5
- * @version $Id$
  */
 public class ConstructorUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
index 90b2668f5..f8fc11369 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
@@ -34,7 +34,6 @@ import java.util.List;
  * changed that shouldn't be. This facility should be used with care.
  * 
  * @since 2.5
- * @version $Id$
  */
 public class FieldUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
index f379db67c..04c363731 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.lang3.ClassUtils;
  * extracted and refactored from {@link MethodUtils} when it was imported from Commons BeanUtils.
  *
  * @since 2.5
- * @version $Id$
  */
 abstract class MemberUtils {
     // TODO extract an interface to implement compareParameterSets(...)?
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 6c2d50748..180c35cf5 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -54,7 +54,6 @@ import org.apache.commons.lang3.Validate;
  * If this call fails then the method may fail.</p>
  *
  * @since 2.5
- * @version $Id$
  */
 public class MethodUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java b/src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java
index 138d9b0d2..bead33f42 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeLiteral.java
@@ -69,7 +69,6 @@ import org.apache.commons.lang3.Validate;
  *   &lt;T&gt; T obtain(Typed&lt;T&gt; typed, ...);
  * </pre>
  *
- * @version $Id$
  * @since 3.2
  */
 public abstract class TypeLiteral<T> implements Typed<T> {
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
index 62a238062..6eb286ab9 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.builder.Builder;
  * generics. </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class TypeUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/reflect/Typed.java b/src/main/java/org/apache/commons/lang3/reflect/Typed.java
index 167bf4899..4841f5c30 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/Typed.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/Typed.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Type;
  * Generalization of "has a type."
  * @see TypeLiteral
  * @since 3.2
- * @version $Id$
  */
 public interface Typed<T> {
 
diff --git a/src/main/java/org/apache/commons/lang3/reflect/package-info.java b/src/main/java/org/apache/commons/lang3/reflect/package-info.java
index 79672acf1..5483643ef 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/package-info.java
@@ -19,6 +19,5 @@
  * <p>These classes are immutable, and therefore thread-safe.</p>
  *
  * @since 3.0
- * @version $Id$
  */
 package org.apache.commons.lang3.reflect;
diff --git a/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java b/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
index 1544a4f3b..9199ef8b4 100644
--- a/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
+++ b/src/main/java/org/apache/commons/lang3/text/CompositeFormat.java
@@ -26,7 +26,6 @@ import java.text.ParsePosition;
  * example of use for this would be a webapp where data is taken in one way and
  * stored in a database another way.
  * 
- * @version $Id$
  */
 public class CompositeFormat extends Format {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
index bfe34b4f6..d0835aa26 100644
--- a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
+++ b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
@@ -64,7 +64,6 @@ import org.apache.commons.lang3.Validate;
  * </ul>
  *
  * @since 2.4
- * @version $Id$
  */
 public class ExtendedMessageFormat extends MessageFormat {
     private static final long serialVersionUID = -2362048321261811743L;
diff --git a/src/main/java/org/apache/commons/lang3/text/FormatFactory.java b/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
index 3460b4db5..ffd91b5e0 100644
--- a/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
+++ b/src/main/java/org/apache/commons/lang3/text/FormatFactory.java
@@ -23,7 +23,6 @@ import java.util.Locale;
  * Format factory.
  * 
  * @since 2.4
- * @version $Id$
  */
 public interface FormatFactory {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
index abdd1149c..9be8e6745 100644
--- a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang3.Validate;
  * and padding, and is not designed to allow generalised alternate formats.</p>
  * 
  * @since Lang 3.0
- * @version $Id$
  */
 public class FormattableUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 7b541a6b2..a2010fdc3 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -72,7 +72,6 @@ import org.apache.commons.lang3.builder.Builder;
  * the interface. 
  *
  * @since 2.2
- * @version $Id$
  */
 public class StrBuilder implements CharSequence, Appendable, Serializable, Builder<String> {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrLookup.java b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
index b77a58348..c4d42b3ee 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrLookup.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
@@ -34,7 +34,6 @@ import java.util.Properties;
  * key as a primary key, and looked up the value on demand from the database
  *
  * @since 2.2
- * @version $Id$
  */
 public abstract class StrLookup<V> {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
index 15148185b..a1ed6a53b 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
  * If these do not suffice, you can subclass and implement your own matcher.
  *
  * @since 2.2
- * @version $Id$
  */
 public abstract class StrMatcher {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
index aa1e3d2d3..766e1614c 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
@@ -119,7 +119,6 @@ import org.apache.commons.lang3.StringUtils;
  * {@link #setEnableSubstitutionInVariables(boolean) enableSubstitutionInVariables}
  * property to <b>true</b>.
  *
- * @version $Id$
  * @since 2.2
  */
 public class StrSubstitutor {
diff --git a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
index f620b3975..c9650b8d4 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
@@ -83,7 +83,6 @@ import org.apache.commons.lang3.StringUtils;
  * </table>
  *
  * @since 2.2
- * @version $Id$
  */
 public class StrTokenizer implements ListIterator<String>, Cloneable {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/WordUtils.java b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
index ce21d92b2..c95146fb0 100644
--- a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.lang3.SystemUtils;
  * Each method documents its behaviour in more detail.</p>
  * 
  * @since 2.0
- * @version $Id$
  */
 public class WordUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/package-info.java b/src/main/java/org/apache/commons/lang3/text/package-info.java
index 051d727e6..61e4b05d4 100644
--- a/src/main/java/org/apache/commons/lang3/text/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/text/package-info.java
@@ -23,6 +23,5 @@
  * While somewhat ungainly, the <code>Str</code> prefix has been used to ensure we don't clash with any current or future standard Java classes. </p>
  *
  * @since 2.1
- * @version $Id$
  */
 package org.apache.commons.lang3.text;
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java
index 51e4e1d7d..f07566194 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.ArrayUtils;
  * the first translator consumes codepoints from the input.
  * 
  * @since 3.0
- * @version $Id$
  */
 public class AggregateTranslator extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
index 17e73b640..06c357dab 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java
@@ -27,7 +27,6 @@ import java.util.Locale;
  * is completely contextual, the API does not present two separate signatures.
  * 
  * @since 3.0
- * @version $Id$
  */
 public abstract class CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
index 5a8780665..d080f5a6b 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java
@@ -24,7 +24,6 @@ import java.io.Writer;
  * will replace up to one character at a time.
  * 
  * @since 3.0
- * @version $Id$
  */
 public abstract class CodePointTranslator extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
index 23695758f..190d0a238 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
@@ -22,7 +22,6 @@ package org.apache.commons.lang3.text.translate;
  * All arrays are of length [*][2].
  *
  * @since 3.0
- * @version $Id$
  */
 public class EntityArrays {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
index 65722f24b..b457c3096 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java
@@ -20,7 +20,6 @@ package org.apache.commons.lang3.text.translate;
  * Translates codepoints to their Unicode escaped value suitable for Java source.
  * 
  * @since 3.2
- * @version $Id$
  */
 public class JavaUnicodeEscaper extends UnicodeEscaper {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java
index bb2bbd63b..ea1fbc31c 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
  * Translates a value using a lookup table.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LookupTranslator extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
index 0e2e033dc..c38b02ac7 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java
@@ -23,7 +23,6 @@ import java.io.Writer;
  * Translates codepoints to their XML numeric entity escaped value.
  *
  * @since 3.0
- * @version $Id$
  */
 public class NumericEntityEscaper extends CodePointTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
index ede2cf301..163045189 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
@@ -28,7 +28,6 @@ import java.util.EnumSet;
  * Note that the semi-colon is optional.
  * 
  * @since 3.0
- * @version $Id$
  */
 public class NumericEntityUnescaper extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
index 550650435..5ec567f42 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java
@@ -28,7 +28,6 @@ import java.io.Writer;
  * 1 to 377. This is because parsing Java is the main use case.
  * 
  * @since 3.0
- * @version $Id: OctalUnescaper.java 967237 2010-07-23 20:08:57Z mbenson $
  */
 public class OctalUnescaper extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
index 3a63b721b..dcaf54e21 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
@@ -23,7 +23,6 @@ import java.io.Writer;
  * Translates codepoints to their Unicode escaped value.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnicodeEscaper extends CodePointTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java
index 3b1e9d02d..fd881afc0 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java
@@ -25,7 +25,6 @@ import java.io.Writer;
  * without the +.
  * 
  * @since 3.0
- * @version $Id$
  */
 public class UnicodeUnescaper extends CharSequenceTranslator {
 
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
index ce86d5e85..44e319c1d 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java
@@ -22,7 +22,6 @@ import java.io.Writer;
 /**
  * Helper subclass to CharSequenceTranslator to remove unpaired surrogates.
  * 
- * @version $Id$
  */
 public class UnicodeUnpairedSurrogateRemover extends CodePointTranslator {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/package-info.java b/src/main/java/org/apache/commons/lang3/text/translate/package-info.java
index fd47b62cb..7d30d890c 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/package-info.java
@@ -20,6 +20,5 @@
  * <p>These classes are immutable, and therefore thread-safe.</p>
  *
  * @since 3.0
- * @version $Id$
  */
 package org.apache.commons.lang3.text.translate;
diff --git a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
index 17cd6e60a..642eb4d89 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
@@ -31,7 +31,6 @@ import java.util.TimeZone;
  * override any previously called Calendar.clear() calls. See LANG-755.</p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class DateFormatUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/time/DateUtils.java b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
index 096107365..c49dbbb41 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
@@ -48,7 +48,6 @@ import java.util.concurrent.TimeUnit;
  * </p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class DateUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index f29099c8b..8eeab9225 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -46,7 +46,6 @@ import org.apache.commons.lang3.Validate;
  * A token character can be repeated to ensure that the field occupies a certain minimum
  * size. Values will be left-padded with 0 unless padding is disabled in the method invocation.
  * @since 2.1
- * @version $Id$
  */
 public class DurationFormatUtils {
 
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
index 7f1722059..b4cc85d88 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
@@ -68,7 +68,6 @@ import java.util.TimeZone;
  * versions. FastDateFormat implements the behavior of Java 7.</p>
  *
  * @since 2.0
- * @version $Id$
  */
 public class FastDateFormat extends Format implements DateParser, DatePrinter {
     /**
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
index 3f8d02119..f8a700e42 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
@@ -65,7 +65,6 @@ import java.util.regex.Pattern;
  * <p>Timing tests indicate this class is as about as fast as SimpleDateFormat
  * in single thread applications and about 25% faster in multi-thread applications.</p>
  *
- * @version $Id$
  * @since 3.2
  * @see FastDatePrinter
  */
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
index 093e0f277..3f6b3bd14 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
@@ -73,7 +73,6 @@ import java.util.concurrent.ConcurrentMap;
  * 'YYY' will be formatted as '2003', while it was '03' in former Java
  * versions. FastDatePrinter implements the behavior of Java 7.</p>
  *
- * @version $Id$
  * @since 3.2
  * @see FastDateParser
  */
diff --git a/src/main/java/org/apache/commons/lang3/time/FormatCache.java b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
index 73a768990..9224b59f1 100644
--- a/src/main/java/org/apache/commons/lang3/time/FormatCache.java
+++ b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentMap;
  * <p>FormatCache is a cache and factory for {@link Format}s.</p>
  * 
  * @since 3.0
- * @version $Id: FormatCache 892161 2009-12-18 07:21:10Z  $
  */
 // TODO: Before making public move from getDateTimeInstance(Integer,...) to int; or some other approach.
 abstract class FormatCache<F extends Format> {
diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index 953479344..239bc5161 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -53,7 +53,6 @@ package org.apache.commons.lang3.time;
  * <p>This class is not thread-safe</p>
  * 
  * @since 2.0
- * @version $Id$
  */
 public class StopWatch {
 
diff --git a/src/main/java/org/apache/commons/lang3/time/package-info.java b/src/main/java/org/apache/commons/lang3/time/package-info.java
index 7ea3a500e..5cf6769b3 100644
--- a/src/main/java/org/apache/commons/lang3/time/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/time/package-info.java
@@ -24,6 +24,5 @@
  * <p>New in Lang 2.1 is the {@link org.apache.commons.lang3.time.DurationFormatUtils} class, which provides various methods for formatting durations.</p>
  *
  * @since 2.0
- * @version $Id$
  */
 package org.apache.commons.lang3.time;
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
index 3e0a74065..dfb66ebda 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
@@ -30,7 +30,6 @@ package org.apache.commons.lang3.tuple;
  * @param <R> the right element type
  *
  * @since Lang 3.0
- * @version $Id$
  */
 public final class ImmutablePair<L, R> extends Pair<L, R> {
 
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
index 7e4660c22..cc64c0d48 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
@@ -30,7 +30,6 @@ package org.apache.commons.lang3.tuple;
  * @param <M> the middle element type
  * @param <R> the right element type
  *
- * @version $Id$
  * @since 3.2
  */
 public final class ImmutableTriple<L, M, R> extends Triple<L, M, R> {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
index 2e37b9f57..35ab57619 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
@@ -25,7 +25,6 @@ package org.apache.commons.lang3.tuple;
  * @param <R> the right element type
  *
  * @since Lang 3.0
- * @version $Id$
  */
 public class MutablePair<L, R> extends Pair<L, R> {
 
diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
index bd2d97b5b..1d3218433 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
@@ -25,7 +25,6 @@ package org.apache.commons.lang3.tuple;
  * @param <M> the middle element type
  * @param <R> the right element type
  *
- * @version $Id$
  * @since 3.2
  */
 public class MutableTriple<L, M, R> extends Triple<L, M, R> {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
index b3f4e5976..1f5a47174 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
@@ -37,7 +37,6 @@ import org.apache.commons.lang3.builder.CompareToBuilder;
  * @param <R> the right element type
  *
  * @since Lang 3.0
- * @version $Id$
  */
 public abstract class Pair<L, R> implements Map.Entry<L, R>, Comparable<Pair<L, R>>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/lang3/tuple/Triple.java b/src/main/java/org/apache/commons/lang3/tuple/Triple.java
index 515646e7b..196580aee 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Triple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Triple.java
@@ -35,7 +35,6 @@ import org.apache.commons.lang3.builder.CompareToBuilder;
  * @param <M> the middle element type
  * @param <R> the right element type
  *
- * @version $Id$
  * @since 3.2
  */
 public abstract class Triple<L, M, R> implements Comparable<Triple<L, M, R>>, Serializable {
diff --git a/src/main/java/org/apache/commons/lang3/tuple/package-info.java b/src/main/java/org/apache/commons/lang3/tuple/package-info.java
index 7d309d6c2..b58034460 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/package-info.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/package-info.java
@@ -18,6 +18,5 @@
  * Tuple classes, starting with a Pair class in version 3.0.
  *
  * @since 3.0
- * @version $Id$
  */
 package org.apache.commons.lang3.tuple;
diff --git a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
index 446e8d916..e87abaed9 100644
--- a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java
@@ -41,7 +41,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class AnnotationUtilsTest {
     @TestAnnotation(
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsAddTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsAddTest.java
index 6c18f6210..e49e8011c 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsAddTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsAddTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 /**
  * Tests ArrayUtils add methods.
  *
- * @version $Id$
  */
 public class ArrayUtilsAddTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java
index ba01c8092..8643659f1 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Tests ArrayUtils remove and removeElement methods.
  * 
- * @version $Id$
  */
 public class ArrayUtilsRemoveMultipleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
index 302de1e28..6aae240af 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Tests ArrayUtils remove and removeElement methods.
  * 
- * @version $Id$
  */
 public class ArrayUtilsRemoveTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index be3e11960..df724a5d8 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.ArrayUtils}.
  *
- * @version $Id$
  */
 @SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class ArrayUtilsTest  {
diff --git a/src/test/java/org/apache/commons/lang3/BitFieldTest.java b/src/test/java/org/apache/commons/lang3/BitFieldTest.java
index dd71abda9..54ca77e61 100644
--- a/src/test/java/org/apache/commons/lang3/BitFieldTest.java
+++ b/src/test/java/org/apache/commons/lang3/BitFieldTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Class to test BitField functionality
  *
- * @version $Id$
  */
 public class BitFieldTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java b/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
index d3464b7ae..90a874d0d 100644
--- a/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.BooleanUtils}.
  *
- * @version $Id$
  */
 public class BooleanUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
index b3c92089a..35557f359 100644
--- a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
  * Tests CharEncoding.
  * 
  * @see CharEncoding
- * @version $Id$
  */
 public class CharEncodingTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharRangeTest.java b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
index 301e6f7da..48a72e83b 100644
--- a/src/test/java/org/apache/commons/lang3/CharRangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharRangeTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.CharRange}.
  *
- * @version $Id$
  */
 public class CharRangeTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
index bb76dab6b..c8be1ecf5 100644
--- a/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 /**
  * Tests CharSequenceUtils
  *
- * @version $Id: CharSequenceUtilsTest.java 1066341 2011-02-02 06:21:53Z bayard $
  */
 public class CharSequenceUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharSetTest.java b/src/test/java/org/apache/commons/lang3/CharSetTest.java
index d2144b1ac..a6cb4bc14 100644
--- a/src/test/java/org/apache/commons/lang3/CharSetTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSetTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.CharSet}.
  *
- * @version $Id$
  */
 public class CharSetTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharSetUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharSetUtilsTest.java
index d0df7ad8f..b88643a5e 100644
--- a/src/test/java/org/apache/commons/lang3/CharSetUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSetUtilsTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.CharSetUtils}.
  *
- * @version $Id$
  */
 public class CharSetUtilsTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java b/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
index d6b54d992..2913d1108 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
@@ -54,7 +54,6 @@ run_inlined_CharUtils_isAsciiNumeric: 709 milliseconds.
 run_inlined_CharUtils_isAsciiNumeric: 84,420 milliseconds.
 
 
- * @version $Id$
  */
 public class CharUtilsPerfRun {
     final static String VERSION = "$Id$";
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
index f6297c60c..2544d3772 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.CharUtils}.
  *
- * @version $Id$
  */
 public class CharUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ClassPathUtilsTest.java b/src/test/java/org/apache/commons/lang3/ClassPathUtilsTest.java
index d8790f341..4dfd5d0c5 100644
--- a/src/test/java/org/apache/commons/lang3/ClassPathUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassPathUtilsTest.java
@@ -27,7 +27,6 @@ import java.lang.reflect.Modifier;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class ClassPathUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index 0ee67e8f5..b69ad1c3d 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -48,7 +48,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.ClassUtils}.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing") // JUnit4 does not support primitive equality testing apart from long
 public class ClassUtilsTest  {
diff --git a/src/test/java/org/apache/commons/lang3/ConversionTest.java b/src/test/java/org/apache/commons/lang3/ConversionTest.java
index 4cf34d42e..6f5d52132 100644
--- a/src/test/java/org/apache/commons/lang3/ConversionTest.java
+++ b/src/test/java/org/apache/commons/lang3/ConversionTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link Conversion}.
  * 
- * @version $Id$
  */
 public class ConversionTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
index 92995e76e..a2d0fb084 100644
--- a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 
 /**
  * 
- * @version $Id$
  */
 public class EnumUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
index c8a6c81f3..189cf6d4c 100644
--- a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
+++ b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
@@ -38,7 +38,6 @@ import static org.apache.commons.lang3.JavaVersion.getJavaVersion;
 /**
  * Unit tests {@link org.apache.commons.lang3.JavaVersion}.
  *
- * @version $Id$
  */
 public class JavaVersionTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
index ba2cc007a..660991f93 100644
--- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
 /**
  * Unit tests for {@link LocaleUtils}.
  *
- * @version $Id$
  */
 public class LocaleUtilsTest  {
 
@@ -589,4 +588,4 @@ public class LocaleUtilsTest  {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/commons/lang3/NotImplementedExceptionTest.java b/src/test/java/org/apache/commons/lang3/NotImplementedExceptionTest.java
index a0b1ade50..0174e8324 100644
--- a/src/test/java/org/apache/commons/lang3/NotImplementedExceptionTest.java
+++ b/src/test/java/org/apache/commons/lang3/NotImplementedExceptionTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull;
 /**
  * Unit tests {@link org.apache.commons.lang3.NotImplementedException}.
  * 
- * @version $Id: NotImplementedExceptionTest.java 905628 2010-02-02 13:29:55Z niallp $
  */
 public class NotImplementedExceptionTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
index 4d48e5af4..c8a741a41 100644
--- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
@@ -43,7 +43,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.ObjectUtils}.
  *
- * @version $Id$
  */
 @SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class ObjectUtilsTest {
diff --git a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
index f9fcd0336..699a8a96d 100644
--- a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.RandomStringUtils}.
  *
- * @version $Id$
  */
 public class RandomStringUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/RandomUtilsTest.java b/src/test/java/org/apache/commons/lang3/RandomUtilsTest.java
index f1080c948..74d44ca82 100644
--- a/src/test/java/org/apache/commons/lang3/RandomUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/RandomUtilsTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Tests for {@link RandomUtils}
  *
- * @version $Id$
  */
 public class RandomUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/RangeTest.java b/src/test/java/org/apache/commons/lang3/RangeTest.java
index 16d49e2ad..112683fda 100644
--- a/src/test/java/org/apache/commons/lang3/RangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/RangeTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
  * Tests the methods in the {@link org.apache.commons.lang3.Range} class.
  * </p>
  * 
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class RangeTest {
diff --git a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
index 0e82ded6e..1dae4949e 100644
--- a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
@@ -43,7 +43,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.SerializationUtils}.
  *
- * @version $Id$
  */
 public class SerializationUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
index 1e31309eb..8162699c9 100644
--- a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
@@ -37,7 +37,6 @@ import org.junit.Test;
 /**
  * Unit tests for {@link StringEscapeUtils}.
  *
- * @version $Id$
  */
 public class StringEscapeUtilsTest {
     private final static String FOO = "foo";
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
index c4dbcef74..c7ddcfef4 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils} - Substring methods
  *
- * @version $Id$
  */
 public class StringUtilsEqualsIndexOfTest  {
     private static final String BAR = "bar";
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsIsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsIsTest.java
index 057aa76fe..dcde99e19 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsIsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsIsTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils} - Substring methods
  *
- * @version $Id$
  */
 public class StringUtilsIsTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java
index 440793dba..fe739217a 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.text.StrBuilder;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils} - StartsWith/EndsWith methods
  *
- * @version $Id$
  */
 public class StringUtilsStartsEndsWithTest {
     private static final String foo    = "foo";
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java
index b7e83b608..ca7c5d2c1 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsSubstringTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils} - Substring methods
  *
- * @version $Id$
  */
 public class StringUtilsSubstringTest  {
     private static final String FOO = "foo";
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
index 44200bd92..280fd66c5 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -42,7 +42,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils}.
  *
- * @version $Id$
  */
 @SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class StringUtilsTest {
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java
index e020ee59f..d0b34be32 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.StringUtils} - Trim/Empty methods
  *
- * @version $Id$
  */
 public class StringUtilsTrimEmptyTest  {
     private static final String FOO = "foo";
diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
index 308237042..ad6e9f970 100644
--- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
  * 
  * Only limited testing can be performed.
  * 
- * @version $Id$
  */
 public class SystemUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
index 244c77bb0..675fa5b06 100644
--- a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.ThreadUtils}.
  *
- * @version $Id$
  */
 public class ThreadUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/ValidateTest.java b/src/test/java/org/apache/commons/lang3/ValidateTest.java
index be4f4d781..f8a8cb041 100644
--- a/src/test/java/org/apache/commons/lang3/ValidateTest.java
+++ b/src/test/java/org/apache/commons/lang3/ValidateTest.java
@@ -40,7 +40,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.Validate}.
  *
- * @version $Id$
  */
 public class ValidateTest  {
     
diff --git a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
index 294e50c48..c09d2ccb0 100644
--- a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.CompareToBuilder}.
  *
- * @version $Id$
  */
 public class CompareToBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
index e1511b7b1..edc6ee47b 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.DefaultToStringStyleTest}.
  *
- * @version $Id$
  */
 public class DefaultToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
index 9d7c3971d..61f3c4789 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link DiffBuilder}.
  *
- * @version $Id$
  */
 public class DiffBuilderTest {
     
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
index a5f42ffc5..28382b951 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link DiffResult}.
  *
- * @version $Id$
  */
 public class DiffResultTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffTest.java
index 4ae8ff2b1..73f25b38b 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link Diff}.
  *
- * @version $Id$
  */
 public class DiffTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
index 702c5a2c8..e3d888975 100644
--- a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.EqualsBuilder}.
  *
- * @version $Id$
  */
 public class EqualsBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java
index 250d49bf6..91639d47e 100644
--- a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
  * {@link org.apache.commons.lang3.builder.EqualsBuilderTest} to insure that equal
  * objects must have equal hash codes.
  * 
- * @version $Id$
  */
 public class HashCodeBuilderAndEqualsBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
index 9009fbde4..f997ffa09 100644
--- a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.HashCodeBuilder}.
  * 
- * @version $Id$
  */
 public class HashCodeBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
index f5fadace0..ccd5596a5 100644
--- a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.JsonToStringStyleTest}.
  *
- * @version $Id$
  */
 public class JsonToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
index 3a506a077..3f9c22e84 100644
--- a/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.MultiLineToStringStyleTest}.
  *
- * @version $Id$
  */
 public class MultiLineToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyleTest.java
index abf64f005..274b2f230 100644
--- a/src/test/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyleTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class MultilineRecursiveToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/NoClassNameToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/NoClassNameToStringStyleTest.java
index 6b0934885..7f96ededb 100644
--- a/src/test/java/org/apache/commons/lang3/builder/NoClassNameToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/NoClassNameToStringStyleTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals;
 /**
  * Unit tests {@link ToStringStyle#NO_CLASS_NAME_STYLE}.
  *
- * @version $Id$
  */
 public class NoClassNameToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
index 7d64e8ff6..e585268e1 100644
--- a/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.NoFieldNamesToStringStyleTest}.
  *
- * @version $Id$
  */
 public class NoFieldNamesToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
index ffaa34913..cd2d53daf 100644
--- a/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/RecursiveToStringStyleTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.RecursiveToStringStyleTest}.
  *
- * @version $Id$
  */
 public class RecursiveToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
index 1ce1cd9de..554ad73e4 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
@@ -46,7 +46,6 @@ import org.junit.Test;
  * @see <a href="https://issues.apache.org/jira/browse/LANG-762">[LANG-762] Handle or document ReflectionToStringBuilder

  *      and ToStringBuilder for collections that are not thread safe</a>

  * @since 3.1

- * @version $Id$

  */

 public class ReflectionToStringBuilderConcurrencyTest {

 

diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
index 505c1dc08..9e7fc0c3a 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class ReflectionToStringBuilderExcludeTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
index 58946cfb5..fb237a564 100755..100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 
 /**
  * Test class for ToStringExclude annotation
- * @version $Id$
  */
 public class ReflectionToStringBuilderExcludeWithAnnotationTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderMutateInspectConcurrencyTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderMutateInspectConcurrencyTest.java
index c4899117e..5227b8997 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderMutateInspectConcurrencyTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderMutateInspectConcurrencyTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
  * @see <a href="https://issues.apache.org/jira/browse/LANG-762">[LANG-762] Handle or document ReflectionToStringBuilder

  *      and ToStringBuilder for collections that are not thread safe</a>

  * @since 3.1

- * @version $Id$

  */

 public class ReflectionToStringBuilderMutateInspectConcurrencyTest {

 

diff --git a/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
index 124cb1a1e..e2ab6df5e 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.ToStringStyle#SHORT_PREFIX_STYLE}.
  * 
- * @version $Id$
  */
 public class ShortPrefixToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java
index 93e0b8505..eafdb6739 100644
--- a/src/test/java/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.SimpleToStringStyleTest}.
  *
- * @version $Id$
  */
 public class SimpleToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
index 70363951d..58c6f2ba7 100644
--- a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.builder.ToStringStyle}.
  *
- * @version $Id$
  */
 public class StandardToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
index d52dd5266..8e3c5ec49 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 /**
  * Unit tests for {@link org.apache.commons.lang3.builder.ToStringBuilder}.
  *
- * @version $Id$
  */
 public class ToStringBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
index db590e923..4ab13871b 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
@@ -44,7 +44,6 @@ import org.junit.Test;
  * @see <a href="https://issues.apache.org/jira/browse/LANG-762">[LANG-762] Handle or document ReflectionToStringBuilder

  *      and ToStringBuilder for collections that are not thread safe</a>

  * @since 3.1

- * @version $Id$

  */

 public class ToStringStyleConcurrencyTest {

 

diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleTest.java
index 2747a7ddf..4217bbcbb 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 /**
  * Test case for ToStringStyle.
  * 
- * @version $Id$
  */
 public class ToStringStyleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
index 6bd8204af..6fd7b0ea0 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
  * tests are executed.
  * </p>
  *
- * @version $Id$
  */
 public abstract class AbstractConcurrentInitializerTest {
     /**
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
index 7434bb5dc..14ce0c1b4 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
@@ -19,7 +19,6 @@ package org.apache.commons.lang3.concurrent;
 /**
  * Test class for {@code AtomicInitializer}.
  *
- * @version $Id$
  */
 public class AtomicInitializerTest extends AbstractConcurrentInitializerTest {
     /**
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
index bcf1688cb..0295d8f02 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 /**
  * Test class for {@code AtomicSafeInitializer}.
  *
- * @version $Id$
  */
 public class AtomicSafeInitializerTest extends
         AbstractConcurrentInitializerTest {
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
index 3bf8a867a..eeb9682ec 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 /**
  * Test class for {@code BasicThreadFactory}.
  *
- * @version $Id$
  */
 public class BasicThreadFactoryTest {
     /** Constant for the test naming pattern. */
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
index ac78126f4..aa99e5931 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Test class for {@code CallableBackgroundInitializer}
  *
- * @version $Id$
  */
 public class CallableBackgroundInitializerTest  {
     /** Constant for the result of the call() invocation. */
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java b/src/test/java/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java
index d23d95475..cca8781d4 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java
@@ -35,7 +35,6 @@ import org.junit.Test;
 /**
  * Test class for {@link ConcurrentUtils}.
  *
- * @version $Id$
  */
 public class ConcurrentUtilsTest {
     /**
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
index 446089c19..ed0eed073 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/ConstantInitializerTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * Test class for {@code ConstantInitializer}.
  *
- * @version $Id$
  */
 public class ConstantInitializerTest {
     /** Constant for the object managed by the initializer. */
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerTest.java
index 409234ff1..ae76de684 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerTest.java
@@ -21,7 +21,6 @@ import org.junit.Before;
 /**
  * Test class for {@code LazyInitializer}.
  *
- * @version $Id$
  */
 public class LazyInitializerTest extends AbstractConcurrentInitializerTest {
     /** The initializer to be tested. */
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
index 72183c12e..8f048408d 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 /**
  * Test class for {@link MultiBackgroundInitializer}.
  *
- * @version $Id$
  */
 public class MultiBackgroundInitializerTest {
     /** Constant for the names of the child initializers. */
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java b/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
index 745c712bc..ad069c869 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 /**
  * Test class for TimedSemaphore.
  *
- * @version $Id$
  */
 public class TimedSemaphoreTest {
     /** Constant for the time period. */
diff --git a/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java b/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
index 8923b4e06..5f65125f6 100644
--- a/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
+++ b/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
@@ -38,7 +38,6 @@ import org.junit.Test;
 
 /**
  * @since 3.0
- * @version $Id$
  */
 public class EventListenerSupportTest 
 {
diff --git a/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java b/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java
index 2178ea455..58c5b67e3 100644
--- a/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/event/EventUtilsTest.java
@@ -40,7 +40,6 @@ import org.junit.Test;
 
 /**
  * @since 3.0
- * @version $Id$
  */
 public class EventUtilsTest 
 {
diff --git a/src/test/java/org/apache/commons/lang3/math/FractionTest.java b/src/test/java/org/apache/commons/lang3/math/FractionTest.java
index b1bca6819..5146b5ba5 100644
--- a/src/test/java/org/apache/commons/lang3/math/FractionTest.java
+++ b/src/test/java/org/apache/commons/lang3/math/FractionTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Test cases for the {@link Fraction} class
  *
- * @version $Id$
  */
 public class FractionTest  {
     
diff --git a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java
index c3dc66f24..b17dcac05 100644
--- a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.math.IEEE754rUtils}.
  *
- * @version $Id$
  */
 public class IEEE754rUtilsTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
index 132d71ef9..b6b555e84 100644
--- a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.math.NumberUtils}.
  *
- * @version $Id$
  */
 public class NumberUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java
index 8e3e3145a..77db87d37 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableBooleanTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.*;
  * 
  * @since 2.2
  * @see MutableBoolean
- * @version $Id$
  */
 public class MutableBooleanTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
index 12d328330..37bddfa6c 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableByteTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableByte
  */
 public class MutableByteTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
index 1518062c3..af071fc3c 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableDoubleTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableDouble
  */
 public class MutableDoubleTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
index f4663b19d..2f67c138b 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableFloatTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableFloat
  */
 public class MutableFloatTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
index e68eede87..e18fd5fc7 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableIntTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableInt
  */
 public class MutableIntTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
index 350c7c055..936c4ef30 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableLong
  */
 public class MutableLongTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
index 07c3c1fce..763b24406 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableObjectTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableShort
  */
 public class MutableObjectTest {
diff --git a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
index 8384542fd..a177185ef 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/MutableShortTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 /**
  * JUnit tests.
  * 
- * @version $Id$
  * @see MutableShort
  */
 public class MutableShortTest {
diff --git a/src/test/java/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java
index ac58ba961..c40f66fc3 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.lang3.mutable.MutableObject;
 
 /**
  * Unit tests ConstructorUtils
- * @version $Id$
  */
 public class ConstructorUtilsTest {
     public static class TestBean {
diff --git a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
index 36c232c94..05355d495 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
@@ -34,7 +34,6 @@ import static org.junit.Assume.assumeNotNull;
 /**
  * Unit tests FieldUtils
  * 
- * @version $Id$
  */
 public class FieldUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
index b056c1467..c30088c4e 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
@@ -51,7 +51,6 @@ import org.junit.Test;
 
 /**
  * Unit tests MethodUtils
- * @version $Id$
  */
 public class MethodUtilsTest {
   
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 56b23a241..9b6ca9b1d 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -42,7 +42,6 @@ import org.junit.Test;
 
 /**
  * Test TypeUtils
- * @version $Id$
  */
 @SuppressWarnings({ "unchecked", "unused" , "rawtypes" })
 //raw types, where used, are used purposely
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/Ambig.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/Ambig.java
index a2c2b61c9..198a8cf9c 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/Ambig.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/Ambig.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public class Ambig implements Foo, Bar {
 
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/Bar.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/Bar.java
index ab0bf700c..105dd1def 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/Bar.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/Bar.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public interface Bar {
     public static final String VALUE = "bar";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/Foo.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/Foo.java
index f31756cc6..551199360 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/Foo.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/Foo.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public interface Foo {
     public static final String VALUE = "foo";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericParent.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericParent.java
index 3f482d922..f848567b9 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericParent.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericParent.java
@@ -18,7 +18,6 @@ package org.apache.commons.lang3.reflect.testbed;
 
 /**
  * Class declaring a parameter variable.
- * @version $Id$
  */
 public class GenericParent<T> implements GenericConsumer<T> {
 
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java
index f69d7545a..390044cdd 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java
@@ -20,7 +20,6 @@ import java.util.List;
 
 /**
  * Holds generic testbed types.
- * @version $Id$
  */
 public class GenericTypeHolder {
     public GenericParent<String> stringParent;
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/Parent.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/Parent.java
index 9a95990b7..70447b444 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/Parent.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/Parent.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 class Parent implements Foo {
     public String s = "s";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java
index eec45d2b8..9e9bf9eba 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 @SuppressWarnings({ "unused" }) // deliberate re-use of variable names
 public class PrivatelyShadowedChild extends Parent {
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/PublicChild.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/PublicChild.java
index 359d9ae96..c91a06f58 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/PublicChild.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/PublicChild.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public class PublicChild extends Parent {
     static final String VALUE = "child";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java
index 5347bb9b3..a95ec350f 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public class PubliclyShadowedChild extends Parent {
     public String s = "ss";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java
index d227f7b35..75f1ca203 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public class StaticContainer {
     public static final Object IMMUTABLE_PUBLIC = "public";
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java
index 34ebb0ba4..18af79d7e 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java
@@ -17,7 +17,6 @@
 package org.apache.commons.lang3.reflect.testbed;
 
 /**
- * @version $Id$
  */
 public class StaticContainerChild extends StaticContainer {
 
diff --git a/src/test/java/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java b/src/test/java/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java
index feed91822..dd285bc4f 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java
@@ -18,7 +18,6 @@ package org.apache.commons.lang3.reflect.testbed;
 
 /**
  * {@link GenericParent} subclass that explicitly specifies &lt;T&gt; as {@link String}.
- * @version $Id$
  */
 public class StringParameterizedChild extends GenericParent<String> {
     @Override
diff --git a/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java b/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java
index 926019e8d..79ff231bf 100644
--- a/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java
@@ -42,7 +42,6 @@ import org.apache.commons.lang3.SystemUtils;
  * Test case for {@link ExtendedMessageFormat}.
  *
  * @since 2.4
- * @version $Id$
  */
 public class ExtendedMessageFormatTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/FormattableUtilsTest.java b/src/test/java/org/apache/commons/lang3/text/FormattableUtilsTest.java
index bb847427a..5904bb810 100644
--- a/src/test/java/org/apache/commons/lang3/text/FormattableUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/FormattableUtilsTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link FormattableUtils}.
  *
- * @version $Id$
  */
 public class FormattableUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java
index 3d0ed4b9d..4ab98d266 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.lang3.SystemUtils;
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.StrBuilder}.
  *
- * @version $Id$
  */
 public class StrBuilderAppendInsertTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
index a9c614570..96dc5f030 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang3.ArrayUtils;
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.StrBuilder}.
  * 
- * @version $Id$
  */
 public class StrBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrLookupTest.java b/src/test/java/org/apache/commons/lang3/text/StrLookupTest.java
index 0f55738b9..ce3fdf41a 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrLookupTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrLookupTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Test class for StrLookup.
  *
- * @version $Id$
  */
 public class StrLookupTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java b/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java
index 89bc3a741..4720265a8 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrMatcherTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.StrMatcher}.
  *
- * @version $Id$
  */
 public class StrMatcherTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java b/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java
index 89ee7b4aa..64daf4f72 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrSubstitutorTest.java
@@ -36,7 +36,6 @@ import org.junit.Test;
 /**
  * Test class for StrSubstitutor.
  *
- * @version $Id$
  */
 public class StrSubstitutorTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java
index 6be8ded79..c920b3ce0 100644
--- a/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/WordUtilsTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 /**
  * Unit tests for WordUtils class.
  * 
- * @version $Id$
  */
 public class WordUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/EntityArraysTest.java b/src/test/java/org/apache/commons/lang3/text/translate/EntityArraysTest.java
index 8d3b3fc3c..2d33b7bfc 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/EntityArraysTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/EntityArraysTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.EntityArrays}.
- * @version $Id$
  */
 public class EntityArraysTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java b/src/test/java/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java
index 67419f86e..4fa526ea7 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.LookupTranslator}.
- * @version $Id$
  */
 public class LookupTranslatorTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java b/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java
index 816d8a8d2..6f77d065d 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.NumericEntityEscaper}.
- * @version $Id$
  */
 public class NumericEntityEscaperTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaperTest.java b/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaperTest.java
index 4087cb9ed..b39104168 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaperTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaperTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.NumericEntityUnescaper}.
- * @version $Id$
  */
 public class NumericEntityUnescaperTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/OctalUnescaperTest.java b/src/test/java/org/apache/commons/lang3/text/translate/OctalUnescaperTest.java
index b100fee8e..15473a8ab 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/OctalUnescaperTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/OctalUnescaperTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.OctalUnescaper}.
- * @version $Id: OctalUnescaperTest.java 979392 2010-07-26 18:09:52Z mbenson $
  */
 public class OctalUnescaperTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java
index 61f2a0cc6..d684604bf 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.UnicodeEscaper}.
- * @version $Id$
  */
 public class UnicodeEscaperTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java
index f003011f3..e950f417f 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.UnicodeEscaper}.
- * @version $Id$
  */
 public class UnicodeUnescaperTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemoverTest.java b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
index 08e1b1e5b..80241b3c9 100644
--- a/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Unit tests for {@link org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover}.
  *
- * @version $Id$
  */
 public class UnicodeUnpairedSurrogateRemoverTest {
     final UnicodeUnpairedSurrogateRemover subject = new UnicodeUnpairedSurrogateRemover();
diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsRoundingTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsRoundingTest.java
index 29de105b1..bfe7a125c 100644
--- a/src/test/java/org/apache/commons/lang3/time/DateUtilsRoundingTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsRoundingTest.java
@@ -36,7 +36,6 @@ import java.util.Locale;
  * A month with 31 days will be rounded up from the 17th
  * 
  * @since 3.0
- * @version $Id$
  */
 public class DateUtilsRoundingTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
index b9e3061bf..320d44caa 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java
@@ -42,7 +42,6 @@ import org.junit.Test;
  * Unit tests {@link org.apache.commons.lang3.time.FastDateFormat}.
  *
  * @since 2.0
- * @version $Id$
  */
 public class FastDateFormatTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
index 1d8643755..3c47bd289 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
@@ -38,7 +38,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.time.FastDateParser}.
  *
- * @version $Id$
  * @since 3.2
  */
 public class FastDateParserTest {
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
index 06155bdcf..54acd9f84 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDatePrinterTest.java
@@ -36,7 +36,6 @@ import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.lang3.time.FastDatePrinter}.
  *
- * @version $Id$
  * @since 3.0
  */
 public class FastDatePrinterTest {
diff --git a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
index 3e464cb66..cea76fca9 100644
--- a/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * TestCase for StopWatch.
  *
- * @version $Id$
  */
 public class StopWatchTest  {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
index 01661042e..462122ce7 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 /**
  * Test the Pair class.
- * @version $Id$
  */
 public class ImmutablePairTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java
index a6e7cf330..42b5ed625 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 /**
  * Test the Triple class.
- * @version $Id$
  */
 public class ImmutableTripleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
index 0b64004a5..11daffeef 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/MutablePairTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 /**
  * Test the MutablePair class.
- * @version $Id$
  */
 public class MutablePairTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
index 210a95549..002b697e3 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 /**
  * Test the MutableTriple class.
- * @version $Id$
  */
 public class MutableTripleTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/PairTest.java b/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
index 365f2abe3..41d9274ef 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/PairTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 /**
  * Test the Pair class.
  * 
- * @version $Id$
  */
 public class PairTest {
 
diff --git a/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
index d9cff33cd..45b4e3c61 100644
--- a/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
+++ b/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Test the Triple class.
  *
- * @version $Id$
  */
 public class TripleTest {