You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/05/16 13:55:43 UTC
[commons-io] branch master updated (6d46195 -> 05611c9)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git.
from 6d46195 Back up maven-bundle-plugin to 3.5.1 since 4.0.0 and up require Java 8.
new 25c09bc Javadoc. Remove Subversion's "@version $Id$".
new 05611c9 Remove Subversion's "@version $Id$".
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/commons/io/Charsets.java | 2 +-
.../org/apache/commons/io/DirectoryWalker.java | 49 +++++++++++++++++++---
.../commons/io/filefilter/AbstractFileFilter.java | 2 +-
.../commons/io/filefilter/AndFileFilter.java | 2 +-
.../io/filefilter/CanExecuteFileFilter.java | 2 +-
.../commons/io/filefilter/CanReadFileFilter.java | 2 +-
.../commons/io/filefilter/CanWriteFileFilter.java | 2 +-
.../io/filefilter/ConditionalFileFilter.java | 2 +-
.../commons/io/filefilter/DelegateFileFilter.java | 2 +-
.../commons/io/filefilter/DirectoryFileFilter.java | 2 +-
.../commons/io/filefilter/EmptyFileFilter.java | 2 +-
.../commons/io/filefilter/FalseFileFilter.java | 2 +-
.../commons/io/filefilter/FileFileFilter.java | 2 +-
.../commons/io/filefilter/FileFilterUtils.java | 2 +-
.../commons/io/filefilter/HiddenFileFilter.java | 2 +-
.../apache/commons/io/filefilter/IOFileFilter.java | 2 +-
.../commons/io/filefilter/NameFileFilter.java | 2 +-
.../commons/io/filefilter/NotFileFilter.java | 2 +-
.../apache/commons/io/filefilter/OrFileFilter.java | 2 +-
.../commons/io/filefilter/PrefixFileFilter.java | 2 +-
.../commons/io/filefilter/SuffixFileFilter.java | 2 +-
.../commons/io/filefilter/TrueFileFilter.java | 2 +-
.../apache/commons/io/input/NullInputStream.java | 2 +-
.../org/apache/commons/io/input/NullReader.java | 2 +-
.../java/org/apache/commons/io/input/Tailer.java | 2 +-
.../commons/io/monitor/FileAlterationListener.java | 2 +-
.../io/monitor/FileAlterationListenerAdaptor.java | 2 +-
.../commons/io/monitor/FileAlterationObserver.java | 2 +-
.../commons/io/output/AppendableOutputStream.java | 2 +-
.../commons/io/output/CloseShieldOutputStream.java | 2 +-
.../commons/io/output/FileWriterWithEncoding.java | 2 +-
.../apache/commons/io/output/NullOutputStream.java | 2 +-
.../org/apache/commons/io/EndianUtilsTest.java | 2 +-
.../java/org/apache/commons/io/HexDumpTest.java | 2 +-
.../io/output/CountingOutputStreamTest.java | 2 +-
35 files changed, 78 insertions(+), 39 deletions(-)
[commons-io] 01/02: Javadoc. Remove Subversion's "@version $Id$".
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 25c09bc20b639bde3879745325c89299f44a4d20
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 16 09:55:19 2019 -0400
Javadoc. Remove Subversion's "@version $Id$".
---
.../org/apache/commons/io/DirectoryWalker.java | 49 +++++++++++++++++++---
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/DirectoryWalker.java b/src/main/java/org/apache/commons/io/DirectoryWalker.java
index a897c38..b04a204 100644
--- a/src/main/java/org/apache/commons/io/DirectoryWalker.java
+++ b/src/main/java/org/apache/commons/io/DirectoryWalker.java
@@ -33,8 +33,10 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* limit the files and directories visited.
* Commons IO supplies many common filter implementations in the
* <a href="filefilter/package-summary.html"> filefilter</a> package.
+ * </p>
* <p>
* The following sections describe:
+ * </p>
* <ul>
* <li><a href="#example">1. Example Implementation</a> - example
* <code>FileCleaner</code> implementation.</li>
@@ -82,20 +84,25 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
*
* <h3 id="filter">2. Filter Example</h3>
*
+ * <p>
* Choosing which directories and files to process can be a key aspect
* of using this class. This information can be setup in three ways,
* via three different constructors.
+ * </p>
* <p>
* The first option is to visit all directories and files.
* This is achieved via the no-args constructor.
+ * </p>
* <p>
* The second constructor option is to supply a single {@link FileFilter}
* that describes the files and directories to visit. Care must be taken
* with this option as the same filter is used for both directories
* and files.
+ * </p>
* <p>
* For example, if you wanted all directories which are not hidden
* and files which end in ".txt":
+ * </p>
* <pre>
* public class FooDirectoryWalker extends DirectoryWalker {
* public FooDirectoryWalker(FileFilter filter) {
@@ -127,9 +134,11 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* the correct <code>FileFilter</code>, something which is very easy to
* get wrong when attempted manually, particularly when trying to
* express constructs like 'any file in directories named docs'.
+ * </p>
* <p>
* For example, if you wanted all directories which are not hidden
* and files which end in ".txt":
+ * </p>
* <pre>
* public class FooDirectoryWalker extends DirectoryWalker {
* public FooDirectoryWalker(IOFileFilter dirFilter, IOFileFilter fileFilter) {
@@ -143,15 +152,20 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* FileFilterUtils.suffixFileFilter(".txt"),
* );
* </pre>
+ * <p>
* This is much simpler than the previous example, and is why it is the preferred
* option for filtering.
+ * </p>
*
* <h3 id="cancel">3. Cancellation</h3>
*
+ * <p>
* The DirectoryWalker contains some of the logic required for cancel processing.
* Subclasses must complete the implementation.
+ * </p>
* <p>
* What <code>DirectoryWalker</code> does provide for cancellation is:
+ * </p>
* <ul>
* <li>{@link CancelException} which can be thrown in any of the
* <i>lifecycle</i> methods to stop processing.</li>
@@ -161,6 +175,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* </ul>
* <p>
* Implementations need to provide:
+ * </p>
* <ul>
* <li>The decision logic on whether to cancel processing or not.</li>
* <li>Constructing and throwing a {@link CancelException}.</li>
@@ -168,6 +183,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* </ul>
* <p>
* Two possible scenarios are envisaged for cancellation:
+ * </p>
* <ul>
* <li><a href="#external">3.1 External / Multi-threaded</a> - cancellation being
* decided/initiated by an external process.</li>
@@ -177,9 +193,11 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* <p>
* The following sections provide example implementations for these two different
* scenarios.
+ * </p>
*
* <h4 id="external">3.1 External / Multi-threaded</h4>
*
+ * <p>
* This example provides a public <code>cancel()</code> method that can be
* called by another thread to stop the processing. A typical example use-case
* would be a cancel button on a GUI. Calling this method sets a
@@ -189,6 +207,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* will cause the walk to stop immediately. The <code>handleCancelled()</code>
* method will be the next, and last, callback method received once cancellation
* has occurred.
+ * </p>
*
* <pre>
* public class FooDirectoryWalker extends DirectoryWalker {
@@ -211,9 +230,11 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
*
* <h4 id="internal">3.2 Internal</h4>
*
+ * <p>
* This shows an example of how internal cancellation processing could be implemented.
* <b>Note</b> the decision logic and throwing a {@link CancelException} could be implemented
* in any of the <i>lifecycle</i> methods.
+ * </p>
*
* <pre>
* public class BarDirectoryWalker extends DirectoryWalker {
@@ -241,7 +262,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public abstract class DirectoryWalker<T> {
@@ -262,12 +283,13 @@ public abstract class DirectoryWalker<T> {
}
/**
- * Construct an instance with a filter and limit the <i>depth</i> navigated to.
+ * Constructs an instance with a filter and limit the <i>depth</i> navigated to.
* <p>
* The filter controls which files and directories will be navigated to as
* part of the walk. The {@link FileFilterUtils} class is useful for combining
* various filters together. A {@code null} filter means that no
* filtering should occur and all files and directories will be visited.
+ * </p>
*
* @param filter the filter to apply, null means visit all files
* @param depthLimit controls how <i>deep</i> the hierarchy is
@@ -279,13 +301,14 @@ public abstract class DirectoryWalker<T> {
}
/**
- * Construct an instance with a directory and a file filter and an optional
+ * Constructs an instance with a directory and a file filter and an optional
* limit on the <i>depth</i> navigated to.
* <p>
* The filters control which files and directories will be navigated to as part
* of the walk. This constructor uses {@link FileFilterUtils#makeDirectoryOnly(IOFileFilter)}
* and {@link FileFilterUtils#makeFileOnly(IOFileFilter)} internally to combine the filters.
* A {@code null} filter means that no filtering should occur.
+ * </p>
*
* @param directoryFilter the filter to apply to directories, null means visit all directories
* @param fileFilter the filter to apply to files, null means visit all files
@@ -311,10 +334,12 @@ public abstract class DirectoryWalker<T> {
* <p>
* Users of this class do not need to call this method. This method will
* be called automatically by another (public) method on the specific subclass.
+ * </p>
* <p>
* Writers of subclasses should call this method to start the directory walk.
* Once called, this method will emit events as it walks the hierarchy.
* The event methods have the prefix <code>handle</code>.
+ * </p>
*
* @param startDirectory the directory to start from, not null
* @param results the collection of result objects, may be updated
@@ -379,6 +404,7 @@ public abstract class DirectoryWalker<T> {
* automatically by the walk of the tree. However, sometimes a single method,
* typically {@link #handleFile}, may take a long time to run. In that case,
* you may wish to check for cancellation by calling this method.
+ * </p>
*
* @param file the current file being processed
* @param depth the current file level (starting directory = 0)
@@ -399,6 +425,7 @@ public abstract class DirectoryWalker<T> {
* This method should be implemented by those subclasses that want to
* provide a public <code>cancel()</code> method available from another
* thread. The design pattern for the subclass should be as follows:
+ * </p>
* <pre>
* public class FooDirectoryWalker extends DirectoryWalker {
* private volatile boolean cancelled = false;
@@ -418,8 +445,10 @@ public abstract class DirectoryWalker<T> {
* <p>
* If this method returns true, then the directory walk is immediately
* cancelled. The next callback method will be {@link #handleCancelled}.
+ * </p>
* <p>
* This implementation returns false.
+ * </p>
*
* @param file the file or directory being processed
* @param depth the current directory level (starting directory = 0)
@@ -439,6 +468,7 @@ public abstract class DirectoryWalker<T> {
* obtained from the exception.
* <p>
* This implementation just re-throws the {@link CancelException}.
+ * </p>
*
* @param startDirectory the directory that the walk started from
* @param results the collection of result objects, may be updated
@@ -457,6 +487,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked at the start of processing.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param startDirectory the directory to start from
* @param results the collection of result objects, may be updated
@@ -472,8 +503,10 @@ public abstract class DirectoryWalker<T> {
* This method returns a boolean to indicate if the directory should be examined or not.
* If you return false, the entire directory and any subdirectories will be skipped.
* Note that this functionality is in addition to the filtering by file filter.
+ * </p>
* <p>
* This implementation does nothing and returns true.
+ * </p>
*
* @param directory the current directory being processed
* @param depth the current directory level (starting directory = 0)
@@ -491,6 +524,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked at the start of processing each directory.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param directory the current directory being processed
* @param depth the current directory level (starting directory = 0)
@@ -506,6 +540,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked with the contents of each directory.
* <p>
* This implementation returns the files unchanged
+ * </p>
*
* @param directory the current directory being processed
* @param depth the current directory level (starting directory = 0)
@@ -523,6 +558,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked for each (non-directory) file.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param file the current file being processed
* @param depth the current directory level (starting directory = 0)
@@ -537,6 +573,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked for each restricted directory.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param directory the restricted directory
* @param depth the current directory level (starting directory = 0)
@@ -552,6 +589,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked at the end of processing each directory.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param directory the directory being processed
* @param depth the current directory level (starting directory = 0)
@@ -567,6 +605,7 @@ public abstract class DirectoryWalker<T> {
* Overridable callback method invoked at the end of processing.
* <p>
* This implementation does nothing.
+ * </p>
*
* @param results the collection of result objects, may be updated
* @throws IOException if an I/O Error occurs
@@ -617,7 +656,7 @@ public abstract class DirectoryWalker<T> {
}
/**
- * Return the file when the operation was cancelled.
+ * Returns the file when the operation was cancelled.
*
* @return the file when the operation was cancelled
*/
@@ -626,7 +665,7 @@ public abstract class DirectoryWalker<T> {
}
/**
- * Return the depth when the operation was cancelled.
+ * Returns the depth when the operation was cancelled.
*
* @return the depth when the operation was cancelled
*/
[commons-io] 02/02: Remove Subversion's "@version $Id$".
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 05611c9fc584e0201bc31434a559a4097e6b200f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 16 09:55:38 2019 -0400
Remove Subversion's "@version $Id$".
---
src/main/java/org/apache/commons/io/Charsets.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java | 2 +-
.../java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java | 2 +-
.../java/org/apache/commons/io/filefilter/ConditionalFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/input/NullInputStream.java | 2 +-
src/main/java/org/apache/commons/io/input/NullReader.java | 2 +-
src/main/java/org/apache/commons/io/input/Tailer.java | 2 +-
src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java | 2 +-
.../org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java | 2 +-
src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java | 2 +-
src/main/java/org/apache/commons/io/output/AppendableOutputStream.java | 2 +-
src/main/java/org/apache/commons/io/output/CloseShieldOutputStream.java | 2 +-
src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java | 2 +-
src/main/java/org/apache/commons/io/output/NullOutputStream.java | 2 +-
src/test/java/org/apache/commons/io/EndianUtilsTest.java | 2 +-
src/test/java/org/apache/commons/io/HexDumpTest.java | 2 +-
.../java/org/apache/commons/io/output/CountingOutputStreamTest.java | 2 +-
34 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/Charsets.java b/src/main/java/org/apache/commons/io/Charsets.java
index 627db90..b160b04 100644
--- a/src/main/java/org/apache/commons/io/Charsets.java
+++ b/src/main/java/org/apache/commons/io/Charsets.java
@@ -51,7 +51,7 @@ import java.util.TreeMap;
*
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
* @since 2.3
- * @version $Id$
+ *
*/
public class Charsets {
//
diff --git a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
index afd372c..ad138ef 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
@@ -26,7 +26,7 @@ import java.io.File;
* otherwise your class will infinitely loop.
*
* @since 1.0
- * @version $Id$
+ *
*/
public abstract class AbstractFileFilter implements IOFileFilter {
diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
index 33b04f3..e585b29 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
@@ -30,7 +30,7 @@ import java.util.List;
* {@code false}.
*
* @since 1.0
- * @version $Id$
+ *
*
* @see FileFilterUtils#and(IOFileFilter...)
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java
index 2aac689..540de6b 100644
--- a/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java
@@ -46,7 +46,7 @@ import java.io.Serializable;
* </pre>
*
* @since 2.7
- * @version $Id$
+ *
*/
public class CanExecuteFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java
index 32b1b12..35ab0be 100644
--- a/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java
@@ -58,7 +58,7 @@ import java.io.Serializable;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public class CanReadFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java
index a5aec9a..52e5b8d 100644
--- a/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java
@@ -50,7 +50,7 @@ import java.io.Serializable;
* <code>CanReadFileFilter.READ_ONLY</code>.
*
* @since 1.3
- * @version $Id$
+ *
*/
public class CanWriteFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java
index ee128dd..5753dc3 100644
--- a/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java
@@ -22,7 +22,7 @@ import java.util.List;
* Defines operations for conditional file filters.
*
* @since 1.1
- * @version $Id$
+ *
*/
public interface ConditionalFileFilter {
diff --git a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
index 4328bf3..978a51e 100644
--- a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
* This class turns a Java FileFilter or FilenameFilter into an IO FileFilter.
*
* @since 1.0
- * @version $Id$
+ *
*
* @see FileFilterUtils#asFileFilter(FileFilter)
* @see FileFilterUtils#asFileFilter(FilenameFilter)
diff --git a/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java
index 3a8419e..0997510 100644
--- a/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java
@@ -34,7 +34,7 @@ import java.io.Serializable;
* </pre>
*
* @since 1.0
- * @version $Id$
+ *
*
* @see FileFilterUtils#directoryFileFilter()
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
index a204b8a..3b0e36c 100644
--- a/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
@@ -49,7 +49,7 @@ import java.io.Serializable;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public class EmptyFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
index 4cf5ba1..9d8d53d 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
* A file filter that always returns false.
*
* @since 1.0
- * @version $Id$
+ *
*
* @see FileFilterUtils#falseFileFilter()
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java
index d7287fd..b42c846 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java
@@ -34,7 +34,7 @@ import java.io.Serializable;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
* @see FileFilterUtils#fileFileFilter()
*/
public class FileFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
index f9a0818..68cb813 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
@@ -35,7 +35,7 @@ import org.apache.commons.io.IOCase;
* every class you use.
*
* @since 1.0
- * @version $Id$
+ *
*/
public class FileFilterUtils {
diff --git a/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
index 3adeb76..e4d1b19 100644
--- a/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
@@ -46,7 +46,7 @@ import java.io.Serializable;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public class HiddenFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
index 2037040..678fdb7 100644
--- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
@@ -25,7 +25,7 @@ import java.io.FilenameFilter;
* interfaces together.
*
* @since 1.0
- * @version $Id$
+ *
*/
public interface IOFileFilter extends FileFilter, FilenameFilter {
diff --git a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
index bd409c1..a9ca2b9 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
@@ -37,7 +37,7 @@ import org.apache.commons.io.IOCase;
* </pre>
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#nameFileFilter(String)
* @see FileFilterUtils#nameFileFilter(String, IOCase)
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
index d00c6c2..5963cf1 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
* This filter produces a logical NOT of the filters specified.
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#notFileFilter(IOFileFilter)
*/
public class NotFileFilter extends AbstractFileFilter implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
index d21588e..b79d439 100644
--- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
@@ -30,7 +30,7 @@ import java.util.List;
* {@code true}.
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#or(IOFileFilter...)
*/
public class OrFileFilter
diff --git a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
index b1ec2e5..fdc6b60 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -37,7 +37,7 @@ import org.apache.commons.io.IOCase;
* </pre>
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#prefixFileFilter(String)
* @see FileFilterUtils#prefixFileFilter(String, IOCase)
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
index 5c7a2a3..c4fe1ea 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -38,7 +38,7 @@ import org.apache.commons.io.IOCase;
* </pre>
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#suffixFileFilter(String)
* @see FileFilterUtils#suffixFileFilter(String, IOCase)
*/
diff --git a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
index 0a6fef9..ad12b48 100644
--- a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
* A file filter that always returns true.
*
* @since 1.0
- * @version $Id$
+ *
* @see FileFilterUtils#trueFileFilter()
*/
public class TrueFileFilter implements IOFileFilter, Serializable {
diff --git a/src/main/java/org/apache/commons/io/input/NullInputStream.java b/src/main/java/org/apache/commons/io/input/NullInputStream.java
index 46339a6..ad8be20 100644
--- a/src/main/java/org/apache/commons/io/input/NullInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/NullInputStream.java
@@ -60,7 +60,7 @@ import java.io.InputStream;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public class NullInputStream extends InputStream {
diff --git a/src/main/java/org/apache/commons/io/input/NullReader.java b/src/main/java/org/apache/commons/io/input/NullReader.java
index 3d610e8..d4d6039 100644
--- a/src/main/java/org/apache/commons/io/input/NullReader.java
+++ b/src/main/java/org/apache/commons/io/input/NullReader.java
@@ -60,7 +60,7 @@ import java.io.Reader;
* </pre>
*
* @since 1.3
- * @version $Id$
+ *
*/
public class NullReader extends Reader {
diff --git a/src/main/java/org/apache/commons/io/input/Tailer.java b/src/main/java/org/apache/commons/io/input/Tailer.java
index bd9b321..9436886 100644
--- a/src/main/java/org/apache/commons/io/input/Tailer.java
+++ b/src/main/java/org/apache/commons/io/input/Tailer.java
@@ -113,7 +113,7 @@ import org.apache.commons.io.FileUtils;
* <p>The file is read using the default charset; this can be overridden if necessary</p>
* @see TailerListener
* @see TailerListenerAdapter
- * @version $Id$
+ *
* @since 2.0
* @since 2.5 Updated behavior and documentation for {@link Thread#interrupt()}
*/
diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
index 61d026b..0d01ab4 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
@@ -23,7 +23,7 @@ import java.io.File;
* Register {@link FileAlterationListener}s with a {@link FileAlterationObserver}.
*
* @see FileAlterationObserver
- * @version $Id$
+ *
* @since 2.0
*/
public interface FileAlterationListener {
diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
index e92f479..fa7a245 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
@@ -22,7 +22,7 @@ import java.io.File;
* Convenience {@link FileAlterationListener} implementation that does nothing.
*
* @see FileAlterationObserver
- * @version $Id$
+ *
* @since 2.0
*/
public class FileAlterationListenerAdaptor implements FileAlterationListener {
diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
index 7bcd07a..9426919 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
@@ -116,7 +116,7 @@ import org.apache.commons.io.comparator.NameFileComparator;
*
* @see FileAlterationListener
* @see FileAlterationMonitor
- * @version $Id$
+ *
* @since 2.0
*/
public class FileAlterationObserver implements Serializable {
diff --git a/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java b/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java
index e7830eb..25f1ad2 100644
--- a/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java
@@ -28,7 +28,7 @@ import java.io.OutputStream;
*
* @since 2.5
* @see java.lang.Appendable
- * @version $Id$
+ *
* @param <T> The type of the {@link Appendable} wrapped by this AppendableOutputStream.
*/
public class AppendableOutputStream <T extends Appendable> extends OutputStream {
diff --git a/src/main/java/org/apache/commons/io/output/CloseShieldOutputStream.java b/src/main/java/org/apache/commons/io/output/CloseShieldOutputStream.java
index 74e0f93..8518b7b 100644
--- a/src/main/java/org/apache/commons/io/output/CloseShieldOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/CloseShieldOutputStream.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
* passed to a component that wants to explicitly close the stream even if
* other components would still use the stream for output.
* </p>
- * @version $Id$
+ *
* @since 1.4
*/
public class CloseShieldOutputStream extends ProxyOutputStream {
diff --git a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
index 87d8ce4..e426e7d 100644
--- a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
@@ -44,7 +44,7 @@ import org.apache.commons.io.FileUtils;
*
*
* @since 1.4
- * @version $Id$
+ *
*/
public class FileWriterWithEncoding extends Writer {
// Cannot extend ProxyWriter, as requires writer to be
diff --git a/src/main/java/org/apache/commons/io/output/NullOutputStream.java b/src/main/java/org/apache/commons/io/output/NullOutputStream.java
index 90a996a..8d05129 100644
--- a/src/main/java/org/apache/commons/io/output/NullOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/NullOutputStream.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
* This output stream has no destination (file/socket etc.) and all
* bytes written to it are ignored and lost.
* </p>
- * @version $Id$
+ *
*/
public class NullOutputStream extends OutputStream {
diff --git a/src/test/java/org/apache/commons/io/EndianUtilsTest.java b/src/test/java/org/apache/commons/io/EndianUtilsTest.java
index 75e3d63..36ca587 100644
--- a/src/test/java/org/apache/commons/io/EndianUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/EndianUtilsTest.java
@@ -27,7 +27,7 @@ import java.io.IOException;
import org.junit.Test;
/**
- * @version $Id$
+ *
*/
public class EndianUtilsTest {
diff --git a/src/test/java/org/apache/commons/io/HexDumpTest.java b/src/test/java/org/apache/commons/io/HexDumpTest.java
index e3fb048..dbb7e80 100644
--- a/src/test/java/org/apache/commons/io/HexDumpTest.java
+++ b/src/test/java/org/apache/commons/io/HexDumpTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
- * @version $Id$
+ *
*/
public class HexDumpTest {
diff --git a/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java
index 303b06f..0ddb56a 100644
--- a/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
- * @version $Id$
+ *
*/
public class CountingOutputStreamTest {