diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8101dd9c..da347c14 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -49,4 +49,4 @@ jobs:
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn verify -e -B -V
+ run: mvn verify javadoc:javadoc -e -B -V
diff --git a/pom.xml b/pom.xml
index 7e414e57..e3f738d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@ limitations under the License.
org.apache.maven.plugins
maven-javadoc-plugin
- 3.0.0
+ 3.2.0
diff --git a/src/main/java/org/codehaus/plexus/util/Base64.java b/src/main/java/org/codehaus/plexus/util/Base64.java
index dd504552..120feb8f 100644
--- a/src/main/java/org/codehaus/plexus/util/Base64.java
+++ b/src/main/java/org/codehaus/plexus/util/Base64.java
@@ -26,7 +26,7 @@
* @see RFC 2045
* @author Apache Software Foundation
* @since 1.0-dev
- * @version $Id$
+ *
*/
public class Base64
{
diff --git a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
index d7e745b4..be5a4cc7 100644
--- a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
@@ -28,7 +28,7 @@
/**
* @author olamy
- * @version $Id$
+ *
*/
public class CollectionUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
index 74bdf957..8e1fda24 100644
--- a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
+++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
@@ -21,7 +21,7 @@
/**
* Observes the actions of a {@link DirectoryWalker}.
*
- * @version $Id$
+ *
* @see DirectoryWalker
*/
public interface DirectoryWalkListener
diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
index 40f3c3cc..2ffa4b0a 100644
--- a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
+++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
@@ -25,7 +25,7 @@
/**
* DirectoryWalker
*
- * @version $Id$
+ *
*/
public class DirectoryWalker
{
diff --git a/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java b/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
index 6f8d1424..497bb9ef 100644
--- a/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
@@ -76,7 +76,7 @@
* @author Dmitri Plotnikov
* @author Stephen Colebourne
* @since 1.0
- * @version $Id$
+ *
*/
public class ExceptionUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/Expand.java b/src/main/java/org/codehaus/plexus/util/Expand.java
index db81df4a..79a66bdd 100644
--- a/src/main/java/org/codehaus/plexus/util/Expand.java
+++ b/src/main/java/org/codehaus/plexus/util/Expand.java
@@ -71,7 +71,7 @@
* @author Stefan Bodewig
* @author Magesh Umasankar
* @since Ant 1.1 @ant.task category="packaging" name="unzip" name="unjar" name="unwar"
- * @version $Id$
+ *
*/
public class Expand
{
diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
index 7cd1ddcf..9e4d80ad 100644
--- a/src/main/java/org/codehaus/plexus/util/FileUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java
@@ -112,7 +112,7 @@
* @author Christoph.Reck
* @author Peter Donald
* @author Jeff Turner
- * @version $Id$
+ *
*/
public class FileUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/IOUtil.java b/src/main/java/org/codehaus/plexus/util/IOUtil.java
index 0bbd1fd2..5c9be000 100644
--- a/src/main/java/org/codehaus/plexus/util/IOUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/IOUtil.java
@@ -118,7 +118,7 @@
*
* @author Peter Donald
* @author Jeff Turner
- * @version $Id$
+ *
* @since 4.0
*/
diff --git a/src/main/java/org/codehaus/plexus/util/PathTool.java b/src/main/java/org/codehaus/plexus/util/PathTool.java
index a64556c7..8df992e0 100644
--- a/src/main/java/org/codehaus/plexus/util/PathTool.java
+++ b/src/main/java/org/codehaus/plexus/util/PathTool.java
@@ -25,7 +25,7 @@
* @author Pete Kazmier
* @author Vincent Massol
* @author Vincent Siveton
- * @version $Id$
+ *
*/
public class PathTool
{
diff --git a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
index 70389d68..46041a20 100644
--- a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
+++ b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
@@ -36,7 +36,7 @@
* @author Herve Boutemy
* @see Charset
* @see Supported encodings
- * @version $Id$
+ *
* @since 1.4.3
*/
public class ReaderFactory
diff --git a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
index d43d62a6..0ebf9c36 100644
--- a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
@@ -32,7 +32,7 @@
* @author Michal Maczka
* @author Jesse McConnell
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public final class ReflectionUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
index 950524ab..ae925ce3 100644
--- a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
@@ -69,7 +69,7 @@
* @author Arnout J. Kuiper ajkuiper@wxs.nl
* @author Magesh Umasankar
* @author Bruce Atherton
- * @version $Id$
+ *
* @since 1.5
*/
public final class SelectorUtils
diff --git a/src/main/java/org/codehaus/plexus/util/StringOutputStream.java b/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
index b4051925..ef22b575 100644
--- a/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
+++ b/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
@@ -23,7 +23,7 @@
* Wraps a String as an OutputStream.
*
* @author Emmanuel Venisse
- * @version $Id$
+ *
* @deprecated As of version 1.5.2 this class should no longer be used because it does not properly handle character
* encoding. Instead, use {@link java.io.ByteArrayOutputStream#toString(String)}.
*/
diff --git a/src/main/java/org/codehaus/plexus/util/StringUtils.java b/src/main/java/org/codehaus/plexus/util/StringUtils.java
index b52a5a3b..2e8b58d8 100644
--- a/src/main/java/org/codehaus/plexus/util/StringUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/StringUtils.java
@@ -80,7 +80,7 @@
* @author Alexander Day Chaffee
* @author Vincent Siveton
* @since 1.0
- * @version $Id$
+ *
*/
public class StringUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/SweeperPool.java b/src/main/java/org/codehaus/plexus/util/SweeperPool.java
index dcfa0e71..64d28ad7 100644
--- a/src/main/java/org/codehaus/plexus/util/SweeperPool.java
+++ b/src/main/java/org/codehaus/plexus/util/SweeperPool.java
@@ -23,7 +23,7 @@
* disposed first.
*
* @author Bert van Brakel
- * @version $Id$
+ *
*/
public class SweeperPool
{
diff --git a/src/main/java/org/codehaus/plexus/util/WriterFactory.java b/src/main/java/org/codehaus/plexus/util/WriterFactory.java
index 229f1082..87a4283d 100644
--- a/src/main/java/org/codehaus/plexus/util/WriterFactory.java
+++ b/src/main/java/org/codehaus/plexus/util/WriterFactory.java
@@ -35,7 +35,7 @@
* @author Herve Boutemy
* @see Charset
* @see Supported encodings
- * @version $Id$
+ *
* @since 1.4.4
*/
public class WriterFactory
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
index bf36f527..9d0a439e 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
@@ -18,7 +18,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public class CommandLineException
extends Exception
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
index 20514e8a..c0ab3d98 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
@@ -22,7 +22,7 @@
/**
* @author olamy
* @since 1.5.9
- * @version $Id$
+ *
*/
public class CommandLineTimeOutException
extends CommandLineException
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
index 9de3970e..2fc2f813 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
@@ -29,7 +29,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public abstract class CommandLineUtils
{
diff --git a/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
index c36f64ee..802dfb02 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
@@ -20,7 +20,7 @@
/**
* @author Emmanuel Venisse
- * @version $Id$
+ *
*/
public class DefaultConsumer
implements StreamConsumer
diff --git a/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java b/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
index c260e883..2db89002 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
@@ -22,7 +22,7 @@
* The java.util.StringTokenizer is horribly broken. Given the string 1,,,3,,4 (, delim) It will return 1,3,4 Which is
* clearly wrong - 1,EMPTY,EMPTY,3,EMPTY,4 is what it should return
*
- * @version $Id$
+ *
*/
public final class EnhancedStringTokenizer
{
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
index 9bc888a3..e01bda2c 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
@@ -62,7 +62,7 @@
*
* @author Florin Vancea
* @author Paul Julius
- * @version $Id$
+ *
*/
public interface StreamConsumer
{
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java b/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
index dd0d7a1c..3971e449 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
@@ -24,7 +24,7 @@
* Read from an InputStream and write the output to an OutputStream.
*
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public class StreamFeeder
extends AbstractStreamHandler
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java b/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
index b5e0a0dc..12126e88 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
@@ -81,7 +81,7 @@
*
* @author Florin Vancea
* @author Paul Julius
- * @version $Id$
+ *
* @since June 11, 2001
*/
public class StreamPumper
diff --git a/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
index 97b715f0..ed24136e 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
@@ -21,7 +21,7 @@
/**
* @author Jason van Zyl
- * @version $Id$
+ *
*/
public class WriterStreamConsumer
implements StreamConsumer
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
index e955eecc..089bc6fd 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
@@ -23,7 +23,7 @@
/**
* @author Jason van Zyl
- * @version $Id$
+ *
*/
public class BourneShell
extends Shell
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
index 50ecbd68..aa0af43a 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
@@ -26,7 +26,7 @@
*
* @author Carlos Sanchez
* @since 1.2
- * @version $Id$
+ *
*/
public class CmdShell
extends Shell
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
index 5ca7e875..4aa4c2af 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
@@ -23,7 +23,7 @@
*
* @author Carlos Sanchez
* @since 1.2
- * @version $Id$
+ *
*/
public class CommandShell
extends Shell
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
index 2150be01..fe94ee42 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
@@ -32,7 +32,7 @@
*
* @author Carlos Sanchez
* @since 1.2
- * @version $Id$
+ *
*/
public class Shell
implements Cloneable
diff --git a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
index 5b135343..4d460c99 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
@@ -24,7 +24,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class CycleDetector
{
@@ -158,4 +158,4 @@ else if ( isVisiting( v, vertexStateMap ) )
return false;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/DAG.java b/src/main/java/org/codehaus/plexus/util/dag/DAG.java
index 2e75e8c7..c532cff0 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/DAG.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/DAG.java
@@ -27,7 +27,7 @@
* DAG = Directed Acyclic Graph
*
* @author Michal Maczka
- * @version $Id$
+ *
* TODO this class should be renamed from DAG to Dag
*/
public class DAG
diff --git a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
index 1552c55f..c6e19f5f 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
@@ -23,7 +23,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class TopologicalSorter
{
diff --git a/src/main/java/org/codehaus/plexus/util/dag/Vertex.java b/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
index b8081b48..af3097b1 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
@@ -22,7 +22,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class Vertex
implements Cloneable, Serializable
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java b/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
index 387dc68a..e26fdc62 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
@@ -29,7 +29,7 @@
* @author Bob McWhirter
* @author Attila Szegedi
* @author Geir Magnusson Jr.
- * @version $Id$
+ *
*/
public class ClassMap
{
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java b/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
index b6069f95..51420cca 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
@@ -30,7 +30,7 @@
* @author Christoph Reck
* @author Geir Magnusson Jr.
* @author Attila Szegedi
- * @version $Id$
+ *
*/
public class MethodMap
{
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java b/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
index e4603f3d..29010332 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
@@ -37,7 +37,7 @@
*
* @author Jason van Zyl
* @author Vincent Siveton
- * @version $Id$
+ *
* @see http://struts.apache.org/1.x/struts-taglib/indexedprops.html
*/
diff --git a/src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java b/src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java
index 279e3cef..85835210 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java
@@ -20,7 +20,7 @@
import java.io.Writer;
/**
- * @version $Id$
+ *
*/
public class CompactXMLWriter
extends PrettyPrintXMLWriter
diff --git a/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java b/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
index df14f8e9..c4387317 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java
@@ -27,7 +27,7 @@
/**
* Implementation of XMLWriter which emits nicely formatted documents.
*
- * @version $Id$
+ *
*/
public class PrettyPrintXMLWriter
implements XMLWriter
diff --git a/src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java b/src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java
index d3851035..488103d4 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java
@@ -28,7 +28,7 @@
* Write to an MXSerializer.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class SerializerXMLWriter
implements XMLWriter
diff --git a/src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java b/src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java
index 3f7680be..364849ba 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java
@@ -17,7 +17,7 @@
*/
/**
- * @version $Id$
+ *
*/
public interface XMLWriter
{
diff --git a/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java b/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java
index 2dfcc5f0..cf4e4be7 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java
@@ -33,7 +33,7 @@
* the XML document written to the stream.
*
* @author Herve Boutemy
- * @version $Id$
+ *
* @since 1.4.4
*/
public class XmlStreamWriter
diff --git a/src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java b/src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java
index 54318004..73464b8e 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java
@@ -35,7 +35,7 @@
* Common XML utilities methods.
*
* @author Vincent Siveton
- * @version $Id$
+ *
* @since 1.5.7
*/
public class XmlUtil
diff --git a/src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java b/src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java
index a392b0d0..df831097 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java
@@ -22,7 +22,7 @@
* Utility class for the XmlWriter
class.
*
* @author Vincent Siveton
- * @version $Id$
+ *
*/
public class XmlWriterUtil
{
diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
index 1660f9a7..be973059 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
@@ -30,7 +30,7 @@
import java.util.Map;
/**
- * @version $Id$ NOTE: remove all the util code in here when separated, this class should be pure data.
+ * NOTE: remove all the util code in here when separated, this class should be pure data.
*/
public class Xpp3Dom
implements Serializable
diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
index ffe108d5..d2c2d2bf 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
@@ -28,7 +28,7 @@
import java.util.List;
/**
- * @version $Id$
+ *
*/
public class Xpp3DomBuilder
{
diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java
index c257a22f..91770cab 100644
--- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java
@@ -20,7 +20,7 @@
import java.io.Writer;
/**
- * @version $Id$
+ *
*/
public class Xpp3DomWriter
{
diff --git a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
index f29dd418..6a326c4b 100644
--- a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
+++ b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
@@ -46,7 +46,7 @@
*
* @author Peter Donald
* @author Matthew Hawthorne
- * @version $Id$
+ *
* @see FileUtils
*/
public final class FileUtilsTest
diff --git a/src/test/java/org/codehaus/plexus/util/PathToolTest.java b/src/test/java/org/codehaus/plexus/util/PathToolTest.java
index e7f01ba8..4b9985a9 100644
--- a/src/test/java/org/codehaus/plexus/util/PathToolTest.java
+++ b/src/test/java/org/codehaus/plexus/util/PathToolTest.java
@@ -22,7 +22,7 @@
/**
* @author Vincent Siveton
- * @version $Id$
+ *
*/
public class PathToolTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/StringInputStreamTest.java b/src/test/java/org/codehaus/plexus/util/StringInputStreamTest.java
index 5d07271b..cc76544a 100644
--- a/src/test/java/org/codehaus/plexus/util/StringInputStreamTest.java
+++ b/src/test/java/org/codehaus/plexus/util/StringInputStreamTest.java
@@ -20,7 +20,7 @@
/**
* @author Ben Walding
- * @version $Id$
+ *
*/
public class StringInputStreamTest
extends TestCase
diff --git a/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java b/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java
index 42f1a75b..56df66a7 100644
--- a/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java
+++ b/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java
@@ -29,7 +29,7 @@
* Test string utils.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class StringUtilsTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/dag/CycleDetectedExceptionTest.java b/src/test/java/org/codehaus/plexus/util/dag/CycleDetectedExceptionTest.java
index 4d0c9ad9..8fd33944 100644
--- a/src/test/java/org/codehaus/plexus/util/dag/CycleDetectedExceptionTest.java
+++ b/src/test/java/org/codehaus/plexus/util/dag/CycleDetectedExceptionTest.java
@@ -25,7 +25,7 @@
/**
* @author Jason van Zyl
- * @version $Id$
+ *
*/
public class CycleDetectedExceptionTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/dag/CycleDetectorTest.java b/src/test/java/org/codehaus/plexus/util/dag/CycleDetectorTest.java
index df52fe0e..45db6bed 100644
--- a/src/test/java/org/codehaus/plexus/util/dag/CycleDetectorTest.java
+++ b/src/test/java/org/codehaus/plexus/util/dag/CycleDetectorTest.java
@@ -28,7 +28,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class CycleDetectorTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java b/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java
index 0ff1269c..a4210045 100644
--- a/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java
+++ b/src/test/java/org/codehaus/plexus/util/dag/DAGTest.java
@@ -28,7 +28,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class DAGTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/dag/TopologicalSorterTest.java b/src/test/java/org/codehaus/plexus/util/dag/TopologicalSorterTest.java
index 67afbbeb..36bdf1f9 100644
--- a/src/test/java/org/codehaus/plexus/util/dag/TopologicalSorterTest.java
+++ b/src/test/java/org/codehaus/plexus/util/dag/TopologicalSorterTest.java
@@ -25,7 +25,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class TopologicalSorterTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/dag/VertexTest.java b/src/test/java/org/codehaus/plexus/util/dag/VertexTest.java
index 0044795b..d5ab0cd1 100644
--- a/src/test/java/org/codehaus/plexus/util/dag/VertexTest.java
+++ b/src/test/java/org/codehaus/plexus/util/dag/VertexTest.java
@@ -22,7 +22,7 @@
/**
* @author Michal Maczka
- * @version $Id$
+ *
*/
public class VertexTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java
index 39b3f9fa..0eb34b6c 100644
--- a/src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java
+++ b/src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java
@@ -33,7 +33,7 @@
/**
* @author Jason van Zyl
- * @version $Id$
+ *
*/
public class ReflectionValueExtractorTest
{
@@ -552,4 +552,4 @@ public void testRootPropertyRegression()
Object evalued = ReflectionValueExtractor.evaluate( "description", project );
assertNotNull( evalued );
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/codehaus/plexus/util/reflection/ReflectorTest.java b/src/test/java/org/codehaus/plexus/util/reflection/ReflectorTest.java
index c8f1c4aa..ed75fd58 100644
--- a/src/test/java/org/codehaus/plexus/util/reflection/ReflectorTest.java
+++ b/src/test/java/org/codehaus/plexus/util/reflection/ReflectorTest.java
@@ -23,7 +23,7 @@
/**
* @author Jörg Schaible
- * @version $Id$
+ *
*/
public class ReflectorTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java b/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
index 128d004f..1d5b046e 100644
--- a/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
+++ b/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java
@@ -39,7 +39,7 @@
*
* @author Vincent Siveton
* @author Gabriel Belingueres
- * @version $Id$
+ *
*/
public class PrettyPrintXMLWriterTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java b/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
index 25ee91ae..91b6a7f7 100644
--- a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
+++ b/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java
@@ -39,7 +39,7 @@
* Test the {@link XmlUtil} class.
*
* @author Vincent Siveton
- * @version $Id$
+ *
*/
public class XmlUtilTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java b/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
index 6c4fe638..34d99297 100644
--- a/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
+++ b/src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java
@@ -31,7 +31,7 @@
/**
* @author Vincent Siveton
- * @version $Id$
+ *
*/
public class XmlWriterUtilTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java b/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
index 0c8e5a17..f8ac0489 100644
--- a/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
+++ b/src/test/java/org/codehaus/plexus/util/xml/Xpp3DomBuilderTest.java
@@ -33,7 +33,7 @@
* Test the Xpp3DomBuilder.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class Xpp3DomBuilderTest
{
diff --git a/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java b/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
index c0754126..5b685e8e 100644
--- a/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
+++ b/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
@@ -28,7 +28,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id$
+ *
*/
public class MXParserTest
{