diff --git a/src/main/java/org/apache/commons/codec/BinaryDecoder.java b/src/main/java/org/apache/commons/codec/BinaryDecoder.java
index 546ff76584..5024bf1c46 100644
--- a/src/main/java/org/apache/commons/codec/BinaryDecoder.java
+++ b/src/main/java/org/apache/commons/codec/BinaryDecoder.java
@@ -20,7 +20,6 @@
 /**
  * Defines common decoding methods for byte array decoders.
  *
- * @version $Id$
  */
 public interface BinaryDecoder extends Decoder {
 
diff --git a/src/main/java/org/apache/commons/codec/BinaryEncoder.java b/src/main/java/org/apache/commons/codec/BinaryEncoder.java
index 65f92cc8ba..6803f0c585 100644
--- a/src/main/java/org/apache/commons/codec/BinaryEncoder.java
+++ b/src/main/java/org/apache/commons/codec/BinaryEncoder.java
@@ -20,7 +20,6 @@
 /**
  * Defines common encoding methods for byte array encoders.
  *
- * @version $Id$
  */
 public interface BinaryEncoder extends Encoder {
 
diff --git a/src/main/java/org/apache/commons/codec/CharEncoding.java b/src/main/java/org/apache/commons/codec/CharEncoding.java
index 26a69973e7..27c7aa4821 100644
--- a/src/main/java/org/apache/commons/codec/CharEncoding.java
+++ b/src/main/java/org/apache/commons/codec/CharEncoding.java
@@ -53,7 +53,6 @@
  *
  * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
  * @since 1.4
- * @version $Id$
  */
 public class CharEncoding {
     /**
diff --git a/src/main/java/org/apache/commons/codec/Decoder.java b/src/main/java/org/apache/commons/codec/Decoder.java
index 9f3ba60989..3214bf6f56 100644
--- a/src/main/java/org/apache/commons/codec/Decoder.java
+++ b/src/main/java/org/apache/commons/codec/Decoder.java
@@ -25,7 +25,6 @@
  * <p>
  * One of the two interfaces at the center of the codec package.
  *
- * @version $Id$
  */
 public interface Decoder {
 
diff --git a/src/main/java/org/apache/commons/codec/DecoderException.java b/src/main/java/org/apache/commons/codec/DecoderException.java
index 9d51b04472..2b2fe07959 100644
--- a/src/main/java/org/apache/commons/codec/DecoderException.java
+++ b/src/main/java/org/apache/commons/codec/DecoderException.java
@@ -21,7 +21,6 @@
  * Thrown when there is a failure condition during the decoding process. This exception is thrown when a {@link Decoder}
  * encounters a decoding specific exception such as invalid data, or characters outside of the expected range.
  *
- * @version $Id$
  */
 public class DecoderException extends Exception {
 
diff --git a/src/main/java/org/apache/commons/codec/Encoder.java b/src/main/java/org/apache/commons/codec/Encoder.java
index c7e99eb1f3..ddb652a11b 100644
--- a/src/main/java/org/apache/commons/codec/Encoder.java
+++ b/src/main/java/org/apache/commons/codec/Encoder.java
@@ -24,7 +24,6 @@
  * common generic interface which allows a user to pass a generic Object to any Encoder implementation
  * in the codec package.
  *
- * @version $Id$
  */
 public interface Encoder {
 
diff --git a/src/main/java/org/apache/commons/codec/EncoderException.java b/src/main/java/org/apache/commons/codec/EncoderException.java
index 7115a48d91..27cefad982 100644
--- a/src/main/java/org/apache/commons/codec/EncoderException.java
+++ b/src/main/java/org/apache/commons/codec/EncoderException.java
@@ -22,7 +22,6 @@
  * {@link Encoder} encounters a encoding specific exception such as invalid data, inability to calculate a checksum,
  * characters outside of the expected range.
  *
- * @version $Id$
  */
 public class EncoderException extends Exception {
 
diff --git a/src/main/java/org/apache/commons/codec/StringDecoder.java b/src/main/java/org/apache/commons/codec/StringDecoder.java
index c455a5ba33..0c041e3e0a 100644
--- a/src/main/java/org/apache/commons/codec/StringDecoder.java
+++ b/src/main/java/org/apache/commons/codec/StringDecoder.java
@@ -20,7 +20,6 @@
 /**
  * Defines common decoding methods for String decoders.
  *
- * @version $Id$
  */
 public interface StringDecoder extends Decoder {
 
diff --git a/src/main/java/org/apache/commons/codec/StringEncoder.java b/src/main/java/org/apache/commons/codec/StringEncoder.java
index d8b128eef1..9e445d3b1e 100644
--- a/src/main/java/org/apache/commons/codec/StringEncoder.java
+++ b/src/main/java/org/apache/commons/codec/StringEncoder.java
@@ -20,7 +20,6 @@
 /**
  * Defines common encoding methods for String encoders.
  *
- * @version $Id$
  */
 public interface StringEncoder extends Encoder {
 
diff --git a/src/main/java/org/apache/commons/codec/StringEncoderComparator.java b/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
index 2a190b44e8..08e639924e 100644
--- a/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
+++ b/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
@@ -26,7 +26,6 @@
  *
  * <p>This class is immutable and thread-safe.</p>
  *
- * @version $Id$
  */
 @SuppressWarnings("rawtypes")
 // TODO ought to implement Comparator<String> but that's not possible whilst maintaining binary compatibility.
diff --git a/src/main/java/org/apache/commons/codec/binary/Base32.java b/src/main/java/org/apache/commons/codec/binary/Base32.java
index e7146d87f6..3301ed4558 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32.java
@@ -39,7 +39,6 @@
  * @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
  *
  * @since 1.5
- * @version $Id$
  */
 public class Base32 extends BaseNCodec {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java b/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
index 844f9a067a..f6cd1ce6c6 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
@@ -32,7 +32,6 @@
  * character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, UTF-8, etc).
  * </p>
  *
- * @version $Id$
  * @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
  * @since 1.5
  */
diff --git a/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java b/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
index b231931569..9aa3058285 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
@@ -36,7 +36,6 @@
  * final padding will be omitted and the resulting data will be incomplete/inconsistent.
  * </p>
  *
- * @version $Id$
  * @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
  * @since 1.5
  */
diff --git a/src/main/java/org/apache/commons/codec/binary/Base64.java b/src/main/java/org/apache/commons/codec/binary/Base64.java
index 7bd88d7b17..06e2db73bd 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64.java
@@ -49,7 +49,6 @@
  *
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
  * @since 1.0
- * @version $Id$
  */
 public class Base64 extends BaseNCodec {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java b/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
index 5d926bde78..675e42a50f 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
@@ -36,7 +36,6 @@
  * character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, UTF-8, etc).
  * </p>
  *
- * @version $Id$
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
  * @since 1.4
  */
diff --git a/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java b/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
index 35d3e3c350..edc4093f5d 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
@@ -40,7 +40,6 @@
  * final padding will be omitted and the resulting data will be incomplete/inconsistent.
  * </p>
  *
- * @version $Id$
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
  * @since 1.4
  */
diff --git a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
index ce31ca456f..4f24538224 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
@@ -31,7 +31,6 @@
  * This class is thread-safe.
  * </p>
  *
- * @version $Id$
  */
 public abstract class BaseNCodec implements BinaryEncoder, BinaryDecoder {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java b/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
index 30b2cb3a3a..cbd36a8cfa 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
@@ -29,7 +29,6 @@
  * Abstract superclass for Base-N input streams.
  *
  * @since 1.5
- * @version $Id$
  */
 public class BaseNCodecInputStream extends FilterInputStream {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java b/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
index bfa685b8e0..b598187a1f 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
@@ -35,7 +35,6 @@
  * </p>
  *
  * @since 1.5
- * @version $Id$
  */
 public class BaseNCodecOutputStream extends FilterOutputStream {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java b/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
index 54f8a943c4..02ef4eb7fd 100644
--- a/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
+++ b/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
@@ -31,7 +31,6 @@
  * TODO: also might be good to generate boolean[] from byte[] et cetera.
  *
  * @since 1.3
- * @version $Id$
  */
 public class BinaryCodec implements BinaryDecoder, BinaryEncoder {
     /*
diff --git a/src/main/java/org/apache/commons/codec/binary/Hex.java b/src/main/java/org/apache/commons/codec/binary/Hex.java
index 09d597debc..afd0123154 100644
--- a/src/main/java/org/apache/commons/codec/binary/Hex.java
+++ b/src/main/java/org/apache/commons/codec/binary/Hex.java
@@ -34,7 +34,6 @@
  * This class is thread-safe.
  *
  * @since 1.1
- * @version $Id$
  */
 public class Hex implements BinaryEncoder, BinaryDecoder {
 
diff --git a/src/main/java/org/apache/commons/codec/binary/StringUtils.java b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
index a8f915d7ca..9aa984f7da 100644
--- a/src/main/java/org/apache/commons/codec/binary/StringUtils.java
+++ b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
@@ -33,7 +33,6 @@
  *
  * @see CharEncoding
  * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
- * @version $Id$
  * @since 1.4
  */
 public class StringUtils {
diff --git a/src/main/java/org/apache/commons/codec/digest/B64.java b/src/main/java/org/apache/commons/codec/digest/B64.java
index 355da90036..af0d210e4e 100644
--- a/src/main/java/org/apache/commons/codec/digest/B64.java
+++ b/src/main/java/org/apache/commons/codec/digest/B64.java
@@ -28,7 +28,6 @@
  * This class is immutable and thread-safe.
  * </p>
  *
- * @version $Id$
  * @since 1.7
  */
 class B64 {
diff --git a/src/main/java/org/apache/commons/codec/digest/Crypt.java b/src/main/java/org/apache/commons/codec/digest/Crypt.java
index fbc5182d35..7669b43675 100644
--- a/src/main/java/org/apache/commons/codec/digest/Crypt.java
+++ b/src/main/java/org/apache/commons/codec/digest/Crypt.java
@@ -28,7 +28,6 @@
  * <p>
  * This class is immutable and thread-safe.
  *
- * @version $Id$
  * @since 1.7
  */
 public class Crypt {
diff --git a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
index 9578e514f5..c814e11260 100644
--- a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
@@ -48,7 +48,6 @@
  * String hdigest = new DigestUtils(SHA_224).digestAsHex(new File("pom.xml"));
  * </pre>
  * @see MessageDigestAlgorithms
- * @version $Id$
  */
 public class DigestUtils {
 
diff --git a/src/main/java/org/apache/commons/codec/digest/HmacAlgorithms.java b/src/main/java/org/apache/commons/codec/digest/HmacAlgorithms.java
index ab16fb3279..9627873352 100644
--- a/src/main/java/org/apache/commons/codec/digest/HmacAlgorithms.java
+++ b/src/main/java/org/apache/commons/codec/digest/HmacAlgorithms.java
@@ -35,7 +35,6 @@
  *      "http://docs.oracle.com/javase/9/security/oracleproviders.htm#JSSEC-GUID-A47B1249-593C-4C38-A0D0-68FA7681E0A7">
  *      Java 9 Cryptography Architecture Sun Providers Documentation</a>
  * @since 1.10
- * @version $Id$
  */
 public enum HmacAlgorithms {
 
diff --git a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
index 983cde34e6..5a31ac5a73 100644
--- a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
@@ -52,7 +52,6 @@
  * String hexNot = hm1.hmacHex(new File("NOTICE.txt"));
  * </pre>
  * @since 1.10
- * @version $Id$
  */
 public final class HmacUtils {
 
diff --git a/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java b/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java
index 1f47b59623..10635bd436 100644
--- a/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java
+++ b/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java
@@ -45,7 +45,6 @@
  * <p>
  * This class is immutable and thread-safe.
  *
- * @version $Id$
  * @since 1.7
  */
 public class Md5Crypt {
diff --git a/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithms.java b/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
index 3b2d4acc24..0760084ca5 100644
--- a/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
+++ b/src/main/java/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
@@ -44,7 +44,6 @@
  * @see <a href="http://dx.doi.org/10.6028/NIST.FIPS.180-4">FIPS PUB 180-4</a>
  * @see <a href="http://dx.doi.org/10.6028/NIST.FIPS.202">FIPS PUB 202</a>
  * @since 1.7
- * @version $Id$
  */
 public class MessageDigestAlgorithms {
 
diff --git a/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java b/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
index 766fec494a..877249fe43 100644
--- a/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
+++ b/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
@@ -38,7 +38,6 @@
  * <p>
  * This class is immutable and thread-safe.
  *
- * @version $Id$
  * @since 1.7
  */
 public class Sha2Crypt {
diff --git a/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java b/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
index 786c3210fc..36e0a11a72 100644
--- a/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
+++ b/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
@@ -35,7 +35,6 @@
  * <p>
  * This class is immutable and thread-safe.
  *
- * @version $Id$
  * @since 1.7
  */
 public class UnixCrypt {
diff --git a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
index 96ea4ed232..d35297dc34 100644
--- a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
@@ -66,7 +66,6 @@
  * @see <a href="http://en.wikipedia.org/wiki/Daitch%E2%80%93Mokotoff_Soundex"> Wikipedia - Daitch-Mokotoff Soundex</a>
  * @see <a href="http://www.avotaynu.com/soundex.htm">Avotaynu - Soundexing and Genealogy</a>
  *
- * @version $Id$
  * @since 1.10
  */
 public class DaitchMokotoffSoundex implements StringEncoder {
diff --git a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
index 211e57fb9f..ede1e46f75 100644
--- a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
@@ -33,7 +33,6 @@
  * @see <a href="http://drdobbs.com/184401251?pgno=2">Original Article</a>
  * @see <a href="http://en.wikipedia.org/wiki/Metaphone">http://en.wikipedia.org/wiki/Metaphone</a>
  *
- * @version $Id$
  */
 public class DoubleMetaphone implements StringEncoder {
 
diff --git a/src/main/java/org/apache/commons/codec/language/Metaphone.java b/src/main/java/org/apache/commons/codec/language/Metaphone.java
index 766eda8c4b..ae4425a173 100644
--- a/src/main/java/org/apache/commons/codec/language/Metaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/Metaphone.java
@@ -48,7 +48,6 @@
  * is used to ensure safe publication of the value between threads, and must not invoke {@link #setMaxCodeLen(int)}
  * after initial setup.
  *
- * @version $Id$
  */
 public class Metaphone implements StringEncoder {
 
diff --git a/src/main/java/org/apache/commons/codec/language/Nysiis.java b/src/main/java/org/apache/commons/codec/language/Nysiis.java
index 341f2f9a7c..54008d888a 100644
--- a/src/main/java/org/apache/commons/codec/language/Nysiis.java
+++ b/src/main/java/org/apache/commons/codec/language/Nysiis.java
@@ -65,7 +65,6 @@
  * @see <a href="http://www.dropby.com/NYSIIS.html">NYSIIS on dropby.com</a>
  * @see Soundex
  * @since 1.7
- * @version $Id$
  */
 public class Nysiis implements StringEncoder {
 
diff --git a/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java b/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
index b8ae40045f..317f0e0f88 100644
--- a/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
@@ -27,7 +27,6 @@
  *
  * <p>This class is immutable and thread-safe.</p>
  *
- * @version $Id$
  */
 public class RefinedSoundex implements StringEncoder {
 
diff --git a/src/main/java/org/apache/commons/codec/language/Soundex.java b/src/main/java/org/apache/commons/codec/language/Soundex.java
index e435850be9..5eac90c620 100644
--- a/src/main/java/org/apache/commons/codec/language/Soundex.java
+++ b/src/main/java/org/apache/commons/codec/language/Soundex.java
@@ -27,7 +27,6 @@
  * This class is thread-safe.
  * Although not strictly immutable, the {@link #maxLength} field is not actually used.
  *
- * @version $Id$
  */
 public class Soundex implements StringEncoder {
 
diff --git a/src/main/java/org/apache/commons/codec/language/SoundexUtils.java b/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
index 6409eb2478..75eadf2137 100644
--- a/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
+++ b/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
@@ -25,7 +25,6 @@
  *
  * <p>This class is immutable and thread-safe.</p>
  *
- * @version $Id$
  * @since 1.3
  */
 final class SoundexUtils {
diff --git a/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java b/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
index be85b87e0b..737a976e2c 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
@@ -74,7 +74,6 @@
  * This class is Not ThreadSafe
  * </p>
  * @since 1.6
- * @version $Id$
  */
 public class BeiderMorseEncoder implements StringEncoder {
     // Implementation note: This class is a spring-friendly facade to PhoneticEngine. It allows read/write configuration
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Lang.java b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
index d9e35f022a..31f25d3c9c 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Lang.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
@@ -67,7 +67,6 @@
  * Port of lang.php
  *
  * @since 1.6
- * @version $Id$
  */
 public class Lang {
     // Implementation note: This class is divided into two sections. The first part is a static factory interface that
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Languages.java b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
index 1f3f0325ba..395f004fe1 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Languages.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
@@ -51,7 +51,6 @@
  * This class is immutable and thread-safe.
  *
  * @since 1.6
- * @version $Id$
  */
 public class Languages {
     // Implementation note: This class is divided into two sections. The first part
diff --git a/src/main/java/org/apache/commons/codec/language/bm/NameType.java b/src/main/java/org/apache/commons/codec/language/bm/NameType.java
index 004b2cf2ed..4a7a587a87 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/NameType.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/NameType.java
@@ -23,7 +23,6 @@
  * specifically tuned to family names, and may not work well at all for general text.
  *
  * @since 1.6
- * @version $Id$
  */
 public enum NameType {
 
diff --git a/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java b/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
index 329dfdc853..efc3053e91 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
@@ -48,7 +48,6 @@
  * Ported from phoneticengine.php
  *
  * @since 1.6
- * @version $Id$
  */
 public class PhoneticEngine {
 
diff --git a/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java b/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
index 6558f0da96..ae3e1b5ae8 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/ResourceConstants.java
@@ -25,7 +25,6 @@
  * <p>This class is immutable and thread-safe.</p>
  *
  * @since 1.6
- * @version $Id$
  */
 class ResourceConstants {
 
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Rule.java b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
index cfacaa77e9..fe8014b16f 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
@@ -77,7 +77,6 @@
  * </ul>
  *
  * @since 1.6
- * @version $Id$
  */
 public class Rule {
 
diff --git a/src/main/java/org/apache/commons/codec/language/bm/RuleType.java b/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
index 0e7608b573..a5feb75d24 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/RuleType.java
@@ -21,7 +21,6 @@
  * Types of rule.
  *
  * @since 1.6
- * @version $Id$
  */
 public enum RuleType {
 
diff --git a/src/main/java/org/apache/commons/codec/net/BCodec.java b/src/main/java/org/apache/commons/codec/net/BCodec.java
index 9fee418065..cdaedee8d7 100644
--- a/src/main/java/org/apache/commons/codec/net/BCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/BCodec.java
@@ -41,7 +41,6 @@
  *          Header Extensions for Non-ASCII Text</a>
  *
  * @since 1.3
- * @version $Id$
  */
 public class BCodec extends RFC1522Codec implements StringEncoder, StringDecoder {
     /**
diff --git a/src/main/java/org/apache/commons/codec/net/QCodec.java b/src/main/java/org/apache/commons/codec/net/QCodec.java
index 784ee9408b..221dac77e1 100644
--- a/src/main/java/org/apache/commons/codec/net/QCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/QCodec.java
@@ -47,7 +47,6 @@
  *          Header Extensions for Non-ASCII Text</a>
  *
  * @since 1.3
- * @version $Id$
  */
 public class QCodec extends RFC1522Codec implements StringEncoder, StringDecoder {
     /**
diff --git a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
index aa01f1c2c3..aeb5acae30 100644
--- a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
@@ -61,7 +61,6 @@
  *          Mechanisms for Specifying and Describing the Format of Internet Message Bodies </a>
  *
  * @since 1.3
- * @version $Id$
  */
 public class QuotedPrintableCodec implements BinaryEncoder, BinaryDecoder, StringEncoder, StringDecoder {
     /**
diff --git a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
index 95e75ce693..2f791ca3bf 100644
--- a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
+++ b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
@@ -37,7 +37,6 @@
  *          Message Header Extensions for Non-ASCII Text</a>
  *
  * @since 1.3
- * @version $Id$
  */
 abstract class RFC1522Codec {
 
diff --git a/src/main/java/org/apache/commons/codec/net/URLCodec.java b/src/main/java/org/apache/commons/codec/net/URLCodec.java
index f15cb60afa..78021ae7bc 100644
--- a/src/main/java/org/apache/commons/codec/net/URLCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/URLCodec.java
@@ -43,7 +43,6 @@
  *           of the <a href="http://www.w3.org/TR/html4/">HTML 4.01 Specification</a>
  *
  * @since 1.2
- * @version $Id$
  */
 public class URLCodec implements BinaryEncoder, BinaryDecoder, StringEncoder, StringDecoder {
 
diff --git a/src/main/java/org/apache/commons/codec/net/Utils.java b/src/main/java/org/apache/commons/codec/net/Utils.java
index 69d38a721f..872812bffb 100644
--- a/src/main/java/org/apache/commons/codec/net/Utils.java
+++ b/src/main/java/org/apache/commons/codec/net/Utils.java
@@ -24,7 +24,6 @@
  *
  * <p>This class is immutable and thread-safe.</p>
  *
- * @version $Id$
  * @since 1.4
  */
 class Utils {
diff --git a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
index 1fc805dde8..2bacd24a58 100644
--- a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
+++ b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public abstract class BinaryEncoderAbstractTest {
 
diff --git a/src/test/java/org/apache/commons/codec/CharEncodingTest.java b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
index e2ea336f6a..eb0e24cb90 100644
--- a/src/test/java/org/apache/commons/codec/CharEncodingTest.java
+++ b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
@@ -23,7 +23,6 @@
 /**
  * Sanity checks for {@link CharEncoding}.
  *
- * @version $Id$
  */
 public class CharEncodingTest {
 
diff --git a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
index 881896b0ae..109d840365 100644
--- a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
@@ -25,7 +25,6 @@
 /**
  * Tests {@link DecoderException}.
  *
- * @version $Id$
  */
 public class DecoderExceptionTest {
 
diff --git a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
index 7228cfd976..d2d2036145 100644
--- a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
@@ -25,7 +25,6 @@
 /**
  * Tests {@link EncoderException}.
  *
- * @version $Id$
  */
 public class EncoderExceptionTest {
 
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java b/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
index 12735aa0b1..a7b3a8500f 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
@@ -23,7 +23,6 @@
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public abstract class StringEncoderAbstractTest<T extends StringEncoder> {
 
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
index 3e44be0e23..dc6bd0b585 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -31,7 +31,6 @@
 /**
  * Test cases for the StingEncoderComparator.
  *
- * @version $Id$
  */
 public class StringEncoderComparatorTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
index 0c13700239..5bec44e45d 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -39,7 +39,6 @@
  * Test cases for Base64 class.
  *
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
- * @version $Id$
  */
 public class Base64Test {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java b/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
index e900002a94..a0892cc1b1 100644
--- a/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java
@@ -32,7 +32,6 @@
 /**
  * TestCase for BinaryCodec class.
  *
- * @version $Id$
  */
 public class BinaryCodecTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/HexTest.java b/src/test/java/org/apache/commons/codec/binary/HexTest.java
index 024709219f..953f8bdd1c 100644
--- a/src/test/java/org/apache/commons/codec/binary/HexTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -38,7 +38,6 @@
 /**
  * Tests {@link org.apache.commons.codec.binary.Hex}.
  *
- * @version $Id$
  */
 public class HexTest {
 
diff --git a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
index a566d4f610..acfc80aea7 100644
--- a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
@@ -26,7 +26,6 @@
 /**
  * Tests {@link StringUtils}
  *
- * @version $Id$
  */
 public class StringUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
index 1a5000488f..296e1f0908 100644
--- a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
@@ -40,7 +40,6 @@
 /**
  * Tests DigestUtils methods.
  *
- * @version $Id$
  */
 public class DigestUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
index f5949385a3..0fb8374c0a 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
@@ -32,7 +32,6 @@
 /**
  * Tests HmacUtils methods.
  *
- * @version $Id$
  */
 public class HmacUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
index feadbb0501..22e94b81e7 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
@@ -25,7 +25,6 @@
 /**
  * Tests Caverphone2.
  *
- * @version $Id$
  * @since 1.5
  */
 public class Caverphone2Test extends StringEncoderAbstractTest<Caverphone2> {
diff --git a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
index 72e16a2fa4..d088ec51f9 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
@@ -29,7 +29,6 @@
  * href="http://swoodbridge.com/DoubleMetaPhone/surnames.txt">PHP test program</a>.
  *
  * @see <a href="http://swoodbridge.com/DoubleMetaPhone/surnames.txt">PHP test program</a>
- * @version $Id$
  */
 public class DoubleMetaphone2Test extends StringEncoderAbstractTest<DoubleMetaphone> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
index 006d71a9bd..12844b1ca2 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -32,7 +32,6 @@
  * <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
  *
  * @see "http://www.cuj.com/documents/s=8038/cuj0006philips/"
- * @version $Id$
  */
 public class DoubleMetaphoneTest extends StringEncoderAbstractTest<DoubleMetaphone> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
index 51349d64d6..0df283286f 100644
--- a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
@@ -25,7 +25,6 @@
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class MetaphoneTest extends StringEncoderAbstractTest<Metaphone> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/NysiisTest.java b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
index 0dbda3c589..5362908bca 100644
--- a/src/test/java/org/apache/commons/codec/language/NysiisTest.java
+++ b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
@@ -26,7 +26,6 @@
  * Tests {@link Nysiis}
  *
  * @since 1.7
- * @version $Id$
  */
 public class NysiisTest extends StringEncoderAbstractTest<Nysiis> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
index 2c2303ff4e..7bb62e5faa 100644
--- a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
@@ -26,7 +26,6 @@
 /**
  * Tests RefinedSoundex.
  *
- * @version $Id$
  */
 public class RefinedSoundexTest extends StringEncoderAbstractTest<RefinedSoundex> {
 
diff --git a/src/test/java/org/apache/commons/codec/language/SoundexTest.java b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
index b765b85127..c9a6feca40 100644
--- a/src/test/java/org/apache/commons/codec/language/SoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
@@ -29,7 +29,6 @@
  *
  * <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
  *
- * @version $Id$
  */
 public class SoundexTest extends StringEncoderAbstractTest<Soundex> {
 
diff --git a/src/test/java/org/apache/commons/codec/net/BCodecTest.java b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
index 2bf567d96c..f9b730c749 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -31,7 +31,6 @@
 /**
  * Quoted-printable codec test cases
  *
- * @version $Id$
  */
 public class BCodecTest {
     private static final String[] BASE64_IMPOSSIBLE_CASES = {
diff --git a/src/test/java/org/apache/commons/codec/net/QCodecTest.java b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
index 7327fcb432..d44819ed99 100644
--- a/src/test/java/org/apache/commons/codec/net/QCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
@@ -34,7 +34,6 @@
 /**
  * Quoted-printable codec test cases
  *
- * @version $Id$
  */
 public class QCodecTest {
 
diff --git a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
index 5d019f73b7..57654b34f2 100644
--- a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
@@ -30,7 +30,6 @@
 /**
  * Quoted-printable codec test cases
  *
- * @version $Id$
  */
 public class QuotedPrintableCodecTest {
 
diff --git a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
index ba6a0b904f..5de75d620f 100644
--- a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
@@ -27,7 +27,6 @@
 /**
  * RFC 1522 compliant codec test cases
  *
- * @version $Id$
  */
 public class RFC1522CodecTest {
 
diff --git a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
index dbd3228aff..9b5fe6b080 100644
--- a/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/URLCodecTest.java
@@ -32,7 +32,6 @@
 /**
  * URL codec test cases
  *
- * @version $Id$
  */
 public class URLCodecTest {
 
diff --git a/src/test/java/org/apache/commons/codec/net/UtilsTest.java b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
index 12a42f955d..dfb2af311b 100644
--- a/src/test/java/org/apache/commons/codec/net/UtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/net/UtilsTest.java
@@ -25,7 +25,6 @@
  * Methods currently get 100%/100% line/branch code coverage from other tests classes.
  * </p>
  *
- * @version $Id$
  * @since 1.4
  */
 public class UtilsTest {