From 20d2ba964e5655f342ced361e58ce274f1130b17 Mon Sep 17 00:00:00 2001
From: Olivier Lamy
Date: Thu, 5 Jul 2012 20:49:18 +0000
Subject: [PATCH] remove all @version $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1357898 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/archiva/cli/AbstractProgressConsumer.java | 2 +-
.../src/main/java/org/apache/archiva/cli/ArchivaCli.java | 2 +-
.../main/java/org/apache/archiva/cli/ArtifactCountConsumer.java | 2 +-
.../archiva/converter/artifact/ArtifactConversionException.java | 2 +-
.../apache/archiva/converter/artifact/ArtifactConverter.java | 2 +-
.../archiva/converter/artifact/LegacyToDefaultConverter.java | 2 +-
.../java/org/apache/archiva/converter/artifact/Messages.java | 2 +-
.../converter/artifact/LegacyToDefaultConverterTest.java | 2 +-
.../src/main/java/org/apache/archiva/checksum/Checksum.java | 2 +-
.../java/org/apache/archiva/checksum/ChecksumAlgorithm.java | 2 +-
.../main/java/org/apache/archiva/checksum/ChecksummedFile.java | 2 +-
.../src/main/java/org/apache/archiva/checksum/Hex.java | 2 +-
.../org/apache/archiva/checksum/AbstractChecksumTestCase.java | 2 +-
.../java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java | 2 +-
.../src/test/java/org/apache/archiva/checksum/ChecksumTest.java | 2 +-
.../java/org/apache/archiva/checksum/ChecksummedFileTest.java | 2 +-
.../main/java/org/apache/archiva/common/ArchivaException.java | 2 +-
.../src/main/java/org/apache/archiva/common/utils/BaseFile.java | 2 +-
.../src/main/java/org/apache/archiva/common/utils/DateUtil.java | 2 +-
.../src/main/java/org/apache/archiva/common/utils/PathUtil.java | 2 +-
.../java/org/apache/archiva/common/utils/Slf4JPlexusLogger.java | 2 +-
.../java/org/apache/archiva/common/utils/VersionComparator.java | 2 +-
.../main/java/org/apache/archiva/common/utils/VersionUtil.java | 2 +-
.../test/java/org/apache/archiva/common/utils/BaseFileTest.java | 2 +-
.../test/java/org/apache/archiva/common/utils/DateUtilTest.java | 2 +-
.../test/java/org/apache/archiva/common/utils/PathUtilTest.java | 2 +-
.../org/apache/archiva/common/utils/VersionComparatorTest.java | 2 +-
.../org/apache/archiva/configuration/ConfigurationEvent.java | 2 +-
.../org/apache/archiva/configuration/ConfigurationListener.java | 2 +-
.../org/apache/archiva/configuration/ConfigurationNames.java | 2 +-
.../main/java/org/apache/archiva/configuration/FileTypes.java | 2 +-
.../configuration/functors/FiletypeSelectionPredicate.java | 2 +-
.../archiva/configuration/functors/FiletypeToMapClosure.java | 2 +-
.../archiva/configuration/functors/NetworkProxyComparator.java | 2 +-
.../configuration/functors/NetworkProxySelectionPredicate.java | 2 +-
.../functors/ProxyConnectorConfigurationOrderComparator.java | 2 +-
.../functors/ProxyConnectorSelectionPredicate.java | 2 +-
.../functors/RepositoryConfigurationComparator.java | 2 +-
.../ProxyConnectorConfigurationOrderComparatorTest.java | 2 +-
.../org/apache/archiva/consumers/AbstractMonitoredConsumer.java | 2 +-
.../src/main/java/org/apache/archiva/consumers/Consumer.java | 2 +-
.../java/org/apache/archiva/consumers/ConsumerException.java | 2 +-
.../main/java/org/apache/archiva/consumers/ConsumerMonitor.java | 2 +-
.../archiva/consumers/InvalidRepositoryContentConsumer.java | 2 +-
.../archiva/consumers/KnownRepositoryContentConsumer.java | 2 +-
.../org/apache/archiva/consumers/RepositoryContentConsumer.java | 2 +-
.../archiva/consumers/functors/ConsumerWantsFilePredicate.java | 2 +-
.../archiva/consumers/functors/PermanentConsumerPredicate.java | 2 +-
.../consumers/core/ArtifactMissingChecksumsConsumer.java | 2 +-
.../org/apache/archiva/consumers/core/AutoRemoveConsumer.java | 2 +-
.../org/apache/archiva/consumers/core/AutoRenameConsumer.java | 2 +-
.../apache/archiva/consumers/core/MetadataUpdaterConsumer.java | 2 +-
.../apache/archiva/consumers/core/ValidateChecksumConsumer.java | 2 +-
.../repository/CleanupReleasedSnapshotsRepositoryPurge.java | 2 +-
.../archiva/consumers/core/repository/RepositoryPurge.java | 2 +-
.../consumers/core/repository/RepositoryPurgeException.java | 2 +-
.../converter/legacy/DefaultLegacyRepositoryConverter.java | 2 +-
.../converter/legacy/LegacyConverterArtifactConsumer.java | 2 +-
.../src/main/java/org/apache/archiva/model/ArchivaArtifact.java | 2 +-
.../apache/archiva/model/ArchivaArtifactPlatformDetails.java | 2 +-
.../main/java/org/apache/archiva/model/ArchivaModelCloner.java | 2 +-
.../src/main/java/org/apache/archiva/model/CompoundKey.java | 2 +-
.../src/main/java/org/apache/archiva/model/Keys.java | 2 +-
.../src/main/java/org/apache/archiva/model/RepositoryURL.java | 2 +-
.../test/java/org/apache/archiva/model/RepositoryURLTest.java | 2 +-
.../java/org/apache/archiva/policies/AbstractUpdatePolicy.java | 2 +-
.../java/org/apache/archiva/policies/CachedFailuresPolicy.java | 2 +-
.../main/java/org/apache/archiva/policies/ChecksumPolicy.java | 2 +-
.../java/org/apache/archiva/policies/DownloadErrorPolicy.java | 2 +-
.../main/java/org/apache/archiva/policies/DownloadPolicy.java | 2 +-
.../apache/archiva/policies/PolicyConfigurationException.java | 2 +-
.../org/apache/archiva/policies/PolicyViolationException.java | 2 +-
.../java/org/apache/archiva/policies/PostDownloadPolicy.java | 2 +-
.../java/org/apache/archiva/policies/PreDownloadPolicy.java | 2 +-
.../main/java/org/apache/archiva/policies/ReleasesPolicy.java | 2 +-
.../main/java/org/apache/archiva/policies/SnapshotsPolicy.java | 2 +-
.../archiva/policies/urlcache/DefaultUrlFailureCache.java | 2 +-
.../org/apache/archiva/policies/urlcache/UrlFailureCache.java | 2 +-
.../org/apache/archiva/policies/CachedFailuresPolicyTest.java | 2 +-
.../java/org/apache/archiva/policies/ChecksumPolicyTest.java | 2 +-
.../java/org/apache/archiva/policies/ReleasePolicyTest.java | 2 +-
.../java/org/apache/archiva/policies/SnapshotsPolicyTest.java | 2 +-
.../apache/archiva/proxy/DefaultRepositoryProxyConnectors.java | 2 +-
.../main/java/org/apache/archiva/proxy/NotFoundException.java | 2 +-
.../java/org/apache/archiva/proxy/NotModifiedException.java | 2 +-
.../src/main/java/org/apache/archiva/proxy/ProxyConnector.java | 2 +-
.../org/apache/archiva/proxy/ProxyConnectorOrderComparator.java | 2 +-
.../org/apache/archiva/proxy/RepositoryProxyConnectors.java | 2 +-
.../java/org/apache/archiva/proxy/AbstractProxyTestCase.java | 2 +-
.../org/apache/archiva/proxy/CacheFailuresTransferTest.java | 2 +-
.../java/org/apache/archiva/proxy/ChecksumTransferTest.java | 2 +-
.../test/java/org/apache/archiva/proxy/ErrorHandlingTest.java | 2 +-
.../org/apache/archiva/proxy/ManagedDefaultTransferTest.java | 2 +-
.../org/apache/archiva/proxy/ManagedLegacyTransferTest.java | 2 +-
.../java/org/apache/archiva/proxy/MetadataTransferTest.java | 2 +-
.../test/java/org/apache/archiva/proxy/MockConfiguration.java | 2 +-
.../java/org/apache/archiva/proxy/SnapshotTransferTest.java | 2 +-
.../org/apache/archiva/repository/ContentNotFoundException.java | 2 +-
.../org/apache/archiva/repository/ManagedRepositoryContent.java | 2 +-
.../org/apache/archiva/repository/RemoteRepositoryContent.java | 2 +-
.../org/apache/archiva/repository/RepositoryContentFactory.java | 2 +-
.../java/org/apache/archiva/repository/RepositoryException.java | 2 +-
.../apache/archiva/repository/RepositoryNotFoundException.java | 2 +-
.../archiva/repository/connector/RepositoryConnector.java | 2 +-
.../repository/content/AbstractDefaultRepositoryContent.java | 2 +-
.../repository/content/AbstractLegacyRepositoryContent.java | 2 +-
.../archiva/repository/content/ArtifactExtensionMapping.java | 2 +-
.../apache/archiva/repository/content/DefaultPathParser.java | 2 +-
.../org/apache/archiva/repository/content/FilenameParser.java | 2 +-
.../org/apache/archiva/repository/content/LegacyPathParser.java | 2 +-
.../repository/content/ManagedDefaultRepositoryContent.java | 2 +-
.../repository/content/ManagedLegacyRepositoryContent.java | 2 +-
.../java/org/apache/archiva/repository/content/PathParser.java | 2 +-
.../repository/content/RemoteDefaultRepositoryContent.java | 2 +-
.../repository/content/RemoteLegacyRepositoryContent.java | 2 +-
.../apache/archiva/repository/content/RepositoryRequest.java | 2 +-
.../org/apache/archiva/repository/layout/LayoutException.java | 2 +-
.../org/apache/archiva/repository/metadata/MetadataTools.java | 2 +-
.../repository/metadata/RepositoryMetadataException.java | 2 +-
.../archiva/repository/metadata/RepositoryMetadataMerge.java | 2 +-
.../archiva/repository/metadata/RepositoryMetadataWriter.java | 2 +-
.../archiva/repository/AbstractRepositoryLayerTestCase.java | 2 +-
.../java/org/apache/archiva/repository/MockConfiguration.java | 2 +-
.../java/org/apache/archiva/repository/RepositoryURLTest.java | 2 +-
.../content/AbstractDefaultRepositoryContentTestCase.java | 2 +-
.../content/AbstractLegacyRepositoryContentTestCase.java | 2 +-
.../repository/content/ArtifactExtensionMappingTest.java | 2 +-
.../archiva/repository/content/DefaultPathParserTest.java | 2 +-
.../apache/archiva/repository/content/FilenameParserTest.java | 2 +-
.../apache/archiva/repository/content/LegacyPathParserTest.java | 2 +-
.../repository/content/ManagedDefaultRepositoryContentTest.java | 2 +-
.../repository/content/ManagedLegacyRepositoryContentTest.java | 2 +-
.../repository/content/RemoteDefaultRepositoryContentTest.java | 2 +-
.../repository/content/RemoteLegacyRepositoryContentTest.java | 2 +-
.../archiva/repository/content/RepositoryRequestTest.java | 2 +-
.../apache/archiva/repository/metadata/MetadataToolsTest.java | 2 +-
.../repository/metadata/RepositoryMetadataReaderTest.java | 2 +-
.../repository/metadata/RepositoryMetadataWriterTest.java | 2 +-
.../archiva/repository/scanner/DefaultRepositoryScanner.java | 2 +-
.../archiva/repository/scanner/RepositoryContentConsumers.java | 2 +-
.../archiva/repository/scanner/RepositoryScanStatistics.java | 2 +-
.../apache/archiva/repository/scanner/RepositoryScanner.java | 2 +-
.../archiva/repository/scanner/RepositoryScannerInstance.java | 2 +-
.../repository/scanner/functors/ConsumerProcessFileClosure.java | 2 +-
.../repository/scanner/functors/TriggerBeginScanClosure.java | 2 +-
.../apache/archiva/repository/scanner/InvalidScanConsumer.java | 2 +-
.../apache/archiva/repository/scanner/KnownScanConsumer.java | 2 +-
.../repository/scanner/RepositoryContentConsumersTest.java | 2 +-
.../archiva/repository/scanner/RepositoryScannerTest.java | 2 +-
.../apache/archiva/repository/scanner/SampleKnownConsumer.java | 2 +-
.../apache/archiva/transaction/AbstractTransactionEvent.java | 2 +-
.../main/java/org/apache/archiva/transaction/CopyFileEvent.java | 2 +-
.../java/org/apache/archiva/transaction/CreateFileEvent.java | 2 +-
.../org/apache/archiva/transaction/TransactionException.java | 2 +-
.../org/apache/archiva/transaction/AbstractFileEventTest.java | 2 +-
.../java/org/apache/archiva/xml/ElementTextListClosure.java | 2 +-
.../src/main/java/org/apache/archiva/xml/LatinEntities.java | 2 +-
.../org/apache/archiva/xml/LatinEntityResolutionReader.java | 2 +-
.../src/main/java/org/apache/archiva/xml/XMLException.java | 2 +-
.../src/main/java/org/apache/archiva/xml/XMLReader.java | 2 +-
.../src/main/java/org/apache/archiva/xml/XMLWriter.java | 2 +-
.../java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java | 2 +-
.../src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java | 2 +-
.../org/apache/archiva/xml/LatinEntityResolutionReaderTest.java | 2 +-
.../src/test/java/org/apache/archiva/xml/XMLReaderTest.java | 2 +-
.../src/test/java/org/apache/archiva/xml/XMLWriterTest.java | 2 +-
.../repository/ArchivaRepositoryScanningTaskExecutor.java | 2 +-
.../ArchivaRepositoryScanningTaskExecutorAbstractTest.java | 2 +-
.../ArchivaRepositoryScanningTaskExecutorPhase1Test.java | 2 +-
.../ArchivaRepositoryScanningTaskExecutorPhase2Test.java | 2 +-
.../apache/archiva/rest/api/model/AdminRepositoryConsumer.java | 2 +-
.../rest/services/utils/AddAdminRepoConsumerClosure.java | 2 +-
.../rest/services/utils/AdminRepositoryConsumerComparator.java | 2 +-
.../java/org/apache/archiva/security/AccessDeniedException.java | 2 +-
.../org/apache/archiva/security/ArchivaSecurityException.java | 2 +-
.../org/apache/archiva/security/ArchivaStandardRolesCheck.java | 2 +-
.../main/java/org/apache/archiva/security/ArchivaXworkUser.java | 2 +-
.../org/apache/archiva/security/DefaultUserRepositories.java | 2 +-
.../org/apache/archiva/security/PrincipalNotFoundException.java | 2 +-
.../main/java/org/apache/archiva/security/UserRepositories.java | 2 +-
.../apache/archiva/security/DefaultUserRepositoriesTest.java | 2 +-
.../java/org/apache/archiva/web/startup/ArchivaStartup.java | 2 +-
.../src/main/java/org/apache/archiva/web/startup/Banner.java | 2 +-
.../org/apache/archiva/web/startup/SecuritySynchronization.java | 2 +-
.../java/org/apache/archiva/security/UserRepositoriesStub.java | 2 +-
.../java/org/apache/archiva/web/rss/SecuritySystemStub.java | 2 +-
.../src/test/java/org/apache/archiva/web/test/LoginTest.java | 2 +-
.../src/test/testng/org/apache/archiva/web/test/LoginTest.java | 2 +-
.../main/java/org/apache/archiva/web/action/GlobalResults.java | 2 +-
.../org/apache/archiva/web/action/admin/SystemStatusAction.java | 2 +-
.../web/action/admin/appearance/AbstractAppearanceAction.java | 2 +-
.../admin/connectors/proxy/AbstractProxyConnectorAction.java | 2 +-
.../connectors/proxy/AbstractProxyConnectorFormAction.java | 2 +-
.../action/admin/connectors/proxy/AddProxyConnectorAction.java | 2 +-
.../admin/connectors/proxy/DeleteProxyConnectorAction.java | 2 +-
.../action/admin/connectors/proxy/EditProxyConnectorAction.java | 2 +-
.../action/admin/connectors/proxy/ProxyConnectorsAction.java | 2 +-
.../admin/connectors/proxy/SortProxyConnectorsAction.java | 2 +-
.../admin/networkproxies/ConfigureNetworkProxyAction.java | 2 +-
.../web/action/admin/networkproxies/NetworkProxiesAction.java | 2 +-
.../admin/repositories/AbstractManagedRepositoriesAction.java | 2 +-
.../admin/repositories/AbstractRemoteRepositoriesAction.java | 2 +-
.../admin/repositories/AbstractRepositoriesAdminAction.java | 2 +-
.../action/admin/repositories/AddManagedRepositoryAction.java | 2 +-
.../action/admin/repositories/AddRemoteRepositoryAction.java | 2 +-
.../admin/repositories/DeleteManagedRepositoryAction.java | 2 +-
.../action/admin/repositories/DeleteRemoteRepositoryAction.java | 2 +-
.../action/admin/repositories/EditManagedRepositoryAction.java | 2 +-
.../action/admin/repositories/EditRemoteRepositoryAction.java | 2 +-
.../web/action/admin/repositories/RepositoriesAction.java | 2 +-
.../web/action/admin/scanning/RepositoryScanningAction.java | 2 +-
.../java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java | 2 +-
.../main/java/org/apache/archiva/web/tags/DependencyTree.java | 2 +-
.../java/org/apache/archiva/web/tags/DependencyTreeTag.java | 2 +-
.../main/java/org/apache/archiva/web/tags/ExpressionTool.java | 2 +-
.../src/main/java/org/apache/archiva/web/tags/GroupIdLink.java | 2 +-
.../main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java | 2 +-
.../src/main/java/org/apache/archiva/web/util/ContextUtils.java | 2 +-
.../org/apache/archiva/web/action/AbstractWebworkTestCase.java | 2 +-
.../admin/connectors/proxy/AddProxyConnectorActionTest.java | 2 +-
.../admin/connectors/proxy/DeleteProxyConnectorActionTest.java | 2 +-
.../admin/connectors/proxy/EditProxyConnectorActionTest.java | 2 +-
.../admin/connectors/proxy/ProxyConnectorsActionTest.java | 2 +-
.../admin/connectors/proxy/SortProxyConnectorsActionTest.java | 2 +-
.../admin/repositories/AddManagedRepositoryActionTest.java | 2 +-
.../admin/repositories/AddRemoteRepositoryActionTest.java | 2 +-
.../admin/repositories/DeleteManagedRepositoryActionTest.java | 2 +-
.../admin/repositories/DeleteRemoteRepositoryActionTest.java | 2 +-
.../admin/repositories/EditManagedRepositoryActionTest.java | 2 +-
.../admin/repositories/EditRemoteRepositoryActionTest.java | 2 +-
.../test/java/org/apache/archiva/web/startup/BannerTest.java | 2 +-
.../AbstractRepositoryServletProxiedMetadataTestCase.java | 2 +-
.../webdav/AbstractRepositoryServletProxiedTestCase.java | 2 +-
.../archiva/webdav/AbstractRepositoryServletTestCase.java | 2 +-
.../java/org/apache/archiva/webdav/BypassSecuritySystem.java | 2 +-
.../java/org/apache/archiva/webdav/MimeTypesLoaderTest.java | 2 +-
.../org/apache/archiva/webdav/RepositoryServletBrowseTest.java | 2 +-
.../org/apache/archiva/webdav/RepositoryServletDeployTest.java | 2 +-
.../archiva/webdav/RepositoryServletNoProxyMetadataTest.java | 2 +-
.../org/apache/archiva/webdav/RepositoryServletNoProxyTest.java | 2 +-
.../webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java | 2 +-
.../webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java | 2 +-
.../RepositoryServletProxiedPluginSnapshotPolicyTest.java | 2 +-
.../webdav/RepositoryServletProxiedReleasePolicyTest.java | 2 +-
.../webdav/RepositoryServletProxiedSnapshotPolicyTest.java | 2 +-
.../RepositoryServletProxiedTimestampedSnapshotPolicyTest.java | 2 +-
.../apache/archiva/webdav/RepositoryServletSecurityTest.java | 2 +-
.../java/org/apache/archiva/webdav/RepositoryServletTest.java | 2 +-
.../apache/archiva/webdav/UnauthenticatedRepositoryServlet.java | 2 +-
.../src/main/java/org/apache/archiva/audit/AuditEvent.java | 2 +-
.../src/main/java/org/apache/archiva/audit/AuditListener.java | 2 +-
.../audit/src/main/java/org/apache/archiva/audit/AuditLog.java | 2 +-
.../audit/src/main/java/org/apache/archiva/audit/Auditable.java | 2 +-
.../storage/maven2/MavenRepositoryMetadataReaderTest.java | 2 +-
.../archiva/reports/consumers/DuplicateArtifactsConsumer.java | 2 +-
255 files changed, 255 insertions(+), 255 deletions(-)
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
index be78cb872..0742df402 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/AbstractProgressConsumer.java
@@ -29,7 +29,7 @@ import java.util.Date;
/**
* AbstractProgressConsumer
*
- * @version $Id$
+ *
*/
public abstract class AbstractProgressConsumer
extends AbstractMonitoredConsumer
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index 4dc1bafbb..ebb9111fd 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -55,7 +55,7 @@ import java.util.Properties;
/**
* ArchivaCli
*
- * @version $Id$
+ *
* @todo add back reading of archiva.xml from a given location
*/
public class ArchivaCli
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
index ce647cef8..a0404edbc 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
@@ -29,7 +29,7 @@ import java.util.List;
/**
* ArtifactCountConsumer
*
- * @version $Id$
+ *
*/
@Service("knownRepositoryContentConsumer#count-artifacts")
@Scope("prototype")
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
index bf19bef25..0fe5dff85 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.converter.artifact;
/**
* ArtifactConversionException
*
- * @version $Id$
+ *
*/
public class ArtifactConversionException
extends Exception
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
index 2dcf0e37f..842f01e7c 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* ArtifactConverter
*
- * @version $Id$
+ *
*/
public interface ArtifactConverter
{
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index 216c4ee21..827c80ece 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -67,7 +67,7 @@ import java.util.regex.Matcher;
/**
* LegacyToDefaultConverter
*
- * @version $Id$
+ *
*/
@Service( "artifactConverter#legacy-to-default" )
public class LegacyToDefaultConverter
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
index 17793e974..0cec0fee7 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
@@ -26,7 +26,7 @@ import java.util.ResourceBundle;
/**
* Messages
*
- * @version $Id$
+ *
*/
public class Messages
{
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
index e5a439efa..581e22a43 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
@@ -51,7 +51,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* LegacyToDefaultConverterTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java
index 41f18f4df..271f0d245 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java
@@ -32,7 +32,7 @@ import org.apache.commons.io.output.NullOutputStream;
/**
* Checksum - simple checksum hashing routines.
*
- * @version $Id$
+ *
*/
public class Checksum
{
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
index d3e1c526c..18e7ec023 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
@@ -26,7 +26,7 @@ import org.apache.commons.io.FilenameUtils;
/**
* Enumeration of available ChecksumAlgorithm techniques.
*
- * @version $Id$
+ *
*/
public enum ChecksumAlgorithm {
SHA1("SHA-1", "sha1", "SHA1"),
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
index 98079cd9b..029e45fd2 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
@@ -47,7 +47,7 @@ import java.util.regex.Pattern;
* The file that is being referenced in the checksum file.
*
*
- * @version $Id$
+ *
*/
public class ChecksummedFile
{
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java
index 2c83edc5c..9ca6ce43d 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java
@@ -22,7 +22,7 @@ package org.apache.archiva.checksum;
/**
* Hex - simple hex conversions.
*
- * @version $Id$
+ *
*/
public class Hex
{
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
index 401324b9b..93b9cbeb1 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
@@ -29,7 +29,7 @@ import java.io.File;
/**
* AbstractChecksumTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractChecksumTestCase
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
index 778850c40..bfaa06bc1 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith;
/**
* ChecksumAlgorithmTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ChecksumAlgorithmTest
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
index f763cd952..7f66f16d4 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
/**
* ChecksumTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ChecksumTest
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java
index 8d762d7e6..69d34f28d 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksummedFileTest.java
@@ -31,7 +31,7 @@ import java.io.IOException;
/**
* ChecksummedFileTest
*
- * @version $Id$
+ *
*/
public class ChecksummedFileTest
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ArchivaException.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ArchivaException.java
index 5ff2220bb..5807d6534 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ArchivaException.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/ArchivaException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.common;
/**
* ArchivaException
*
- * @version $Id$
+ *
*/
public class ArchivaException
extends Exception
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java
index a03d083ef..622c284d5 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/BaseFile.java
@@ -26,7 +26,7 @@ import java.net.URI;
* BaseFile - convenient File object that tracks the Base Directory and can provide relative path values
* for the file object based on that Base Directory value.
*
- * @version $Id$
+ *
*/
public class BaseFile
extends File
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/DateUtil.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/DateUtil.java
index b32a26366..79d2bdc8e 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/DateUtil.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/DateUtil.java
@@ -26,7 +26,7 @@ import java.util.GregorianCalendar;
/**
* DateUtil - some (not-so) common date utility methods.
*
- * @version $Id$
+ *
*/
public class DateUtil
{
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
index 700e7565f..69c6ea893 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/PathUtil.java
@@ -27,7 +27,7 @@ import java.net.MalformedURLException;
/**
* PathUtil - simple utility methods for path manipulation.
*
- * @version $Id$
+ *
*/
public class PathUtil
{
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/Slf4JPlexusLogger.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/Slf4JPlexusLogger.java
index 028af1175..960e550d2 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/Slf4JPlexusLogger.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/Slf4JPlexusLogger.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
* Slf4JPlexusLogger - temporary logger to provide an Slf4j Logger to those components
* outside of the archiva codebase that require a plexus logger.
*
- * @version $Id$
+ *
*/
public class Slf4JPlexusLogger
implements org.codehaus.plexus.logging.Logger
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
index 5380d9300..6558b2f6c 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
@@ -47,7 +47,7 @@ import java.util.List;
* Words that are part of the "special word list" will be treated as their index within that heirarchy.
* Words that cannot be identified as special, are treated using normal case-insensitive comparison rules.
*
- * @version $Id$
+ *
*/
public class VersionComparator
implements Comparator
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
index 20f7d21c9..1dae047f9 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
/**
* Version utility methods.
*
- * @version $Id$
+ *
*/
public class VersionUtil
{
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java
index 2808f49f4..df3f19baa 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/BaseFileTest.java
@@ -28,7 +28,7 @@ import java.io.File;
/**
* BaseFileTest
*
- * @version $Id$
+ *
*/
public class BaseFileTest
extends TestCase
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java
index 56f843c1a..a097e5a5e 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/DateUtilTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
/**
* DateUtilTest
*
- * @version $Id$
+ *
*/
public class DateUtilTest extends TestCase
{
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
index 0a7d8555d..5dc75f6a4 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/PathUtilTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
/**
* PathUtilTest
*
- * @version $Id$
+ *
*/
public class PathUtilTest
extends TestCase
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
index 01e9e1132..59e9dde72 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
/**
* VersionComparatorTest
*
- * @version $Id$
+ *
*/
public class VersionComparatorTest
extends TestCase
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java
index 9e1bfb3be..397c838fa 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationEvent.java
@@ -22,7 +22,7 @@ package org.apache.archiva.configuration;
/**
* ConfigurationEvent
*
- * @version $Id$
+ *
*/
public class ConfigurationEvent
{
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java
index 9f172815a..d13157bc2 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationListener.java
@@ -22,7 +22,7 @@ package org.apache.archiva.configuration;
/**
* ConfigurationListener
*
- * @version $Id$
+ *
*/
public interface ConfigurationListener
{
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java
index 6253a9ae1..aaa0a5df9 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ConfigurationNames.java
@@ -22,7 +22,7 @@ package org.apache.archiva.configuration;
/**
* Utility methods for testing the configuration property name.
*
- * @version $Id$
+ *
*/
public class ConfigurationNames
{
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
index 4e7eff495..23a189086 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
@@ -45,7 +45,7 @@ import java.util.Map;
/**
* FileTypes
*
- * @version $Id$
+ *
*/
@Service( "fileTypes" )
public class FileTypes
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
index 9238674dd..e9ba6a57e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
/**
* FiletypeSelectionPredicate
*
- * @version $Id$
+ *
*/
public class FiletypeSelectionPredicate
implements Predicate
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
index 498421b1d..32b70f074 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* FiletypeToMapClosure
*
- * @version $Id$
+ *
*/
public class FiletypeToMapClosure
implements Closure
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
index 455876eff..de5f1148d 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java
@@ -26,7 +26,7 @@ import java.util.Comparator;
/**
* NetworkProxyComparator
*
- * @version $Id$
+ *
*/
public class NetworkProxyComparator
implements Comparator
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
index 3bf8bf44c..822775a4b 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
/**
* NetworkProxySelectionPredicate
*
- * @version $Id$
+ *
*/
public class NetworkProxySelectionPredicate
implements Predicate
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
index cf9eda863..1fc9e7d4e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
@@ -24,7 +24,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import java.util.Comparator;
/**
- * @version $Id$
+ *
* @deprecated ProxyConnectorConfigurationOrderComparator
*/
public class ProxyConnectorConfigurationOrderComparator
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
index 6a4a94ccf..eaa97fb9b 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
/**
* ProxyConnectorPredicate
*
- * @version $Id$
+ *
*/
public class ProxyConnectorSelectionPredicate
implements Predicate
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
index 035fa01d7..ddebce25f 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java
@@ -26,7 +26,7 @@ import java.util.Comparator;
/**
* RepositoryConfigurationComparator
*
- * @version $Id$
+ *
*/
public class RepositoryConfigurationComparator
implements Comparator
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
index 073de9054..7f610a7a0 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
/**
* ProxyConnectorConfigurationOrderComparatorTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class ProxyConnectorConfigurationOrderComparatorTest
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
index 324f0c1d4..e2580fe13 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/AbstractMonitoredConsumer.java
@@ -29,7 +29,7 @@ import java.util.Set;
/**
* AbstractMonitoredConsumer
*
- * @version $Id$
+ *
*/
public abstract class AbstractMonitoredConsumer
implements Consumer
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/Consumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/Consumer.java
index 747ee157d..103f85a63 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/Consumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/Consumer.java
@@ -22,7 +22,7 @@ package org.apache.archiva.consumers;
/**
* Consumer - the base set of methods for a consumer.
*
- * @version $Id$
+ *
*/
public abstract interface Consumer
{
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerException.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerException.java
index f9fbf0343..16bcc2506 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerException.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.ArchivaException;
/**
* ConsumerException - details about the failure of a consumer.
*
- * @version $Id$
+ *
*/
public class ConsumerException
extends ArchivaException
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerMonitor.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerMonitor.java
index dcbbdec94..c762cf1fb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerMonitor.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/ConsumerMonitor.java
@@ -22,7 +22,7 @@ package org.apache.archiva.consumers;
/**
* ConsumerMonitor - a monitor for consumers.
*
- * @version $Id$
+ *
*/
public interface ConsumerMonitor
{
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/InvalidRepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/InvalidRepositoryContentConsumer.java
index 3b2e7583e..83ed11a8c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/InvalidRepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/InvalidRepositoryContentConsumer.java
@@ -22,7 +22,7 @@ package org.apache.archiva.consumers;
/**
* Consumer for Invalid Repository Content
*
- * @version $Id$
+ *
*/
public interface InvalidRepositoryContentConsumer
extends RepositoryContentConsumer
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/KnownRepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/KnownRepositoryContentConsumer.java
index 93cc10a48..41c4bca22 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/KnownRepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/KnownRepositoryContentConsumer.java
@@ -22,7 +22,7 @@ package org.apache.archiva.consumers;
/**
* Consumer for Known Repository Content.
*
- * @version $Id$
+ *
*/
public interface KnownRepositoryContentConsumer
extends RepositoryContentConsumer
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
index 8591d2fe2..4712ec483 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/RepositoryContentConsumer.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* A consumer of content (files) in the repository.
*
- * @version $Id$
+ *
*/
public interface RepositoryContentConsumer
extends Consumer
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
index 2dcbd4a10..7846d1ecb 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
@@ -30,7 +30,7 @@ import org.apache.tools.ant.types.selectors.SelectorUtils;
/**
* ConsumerWantsFilePredicate
*
- * @version $Id$
+ *
*/
public class ConsumerWantsFilePredicate
implements Predicate
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
index cc10aaafa..cfb0bbf87 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/PermanentConsumerPredicate.java
@@ -25,7 +25,7 @@ import org.apache.archiva.consumers.Consumer;
/**
* Selects Consumers that are flaged as 'permanent'.
*
- * @version $Id$
+ *
*/
public class PermanentConsumerPredicate
implements Predicate
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
index 0480d2e76..da32e74d4 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -44,7 +44,7 @@ import java.util.List;
/**
* ArtifactMissingChecksumsConsumer - Create missing and/or fix invalid checksums for the artifact.
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#create-missing-checksums" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
index 513a06ef7..264d65748 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* AutoRemoveConsumer
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#auto-remove" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
index 15af4f915..dcaf8fe9f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
@@ -39,7 +39,7 @@ import java.util.Map;
/**
* AutoRenameConsumer
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#auto-rename" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
index e34ff18f5..dce7d60ec 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -55,7 +55,7 @@ import java.util.List;
/**
* MetadataUpdaterConsumer will create and update the metadata present within the repository.
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#metadata-updater" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
index e289cc1a6..5e1983c3d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -44,7 +44,7 @@ import java.util.List;
/**
* ValidateChecksumConsumer - validate the provided checksum against the file it represents.
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#validate-checksums" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index 6c42176b9..1f4359d71 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -67,7 +67,7 @@ import java.util.List;
* be purged. Leaving 2.1-SNAPSHOT in alone.
*
*
- * @version $Id$
+ *
*/
public class CleanupReleasedSnapshotsRepositoryPurge
extends AbstractRepositoryPurge
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurge.java
index f3b64031a..0aae75459 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurge.java
@@ -20,7 +20,7 @@ package org.apache.archiva.consumers.core.repository;
*/
/**
- * @version $Id$
+ *
*/
public interface RepositoryPurge
{
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeException.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeException.java
index eddeea960..87a06e89c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeException.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeException.java
@@ -21,7 +21,7 @@ package org.apache.archiva.consumers.core.repository;
/**
*
- * @version $Id$
+ *
*/
public class RepositoryPurgeException
extends Exception
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
index b4644d224..1e9ce7b64 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
@@ -44,7 +44,7 @@ import java.util.List;
/**
* DefaultLegacyRepositoryConverter
*
- * @version $Id$
+ *
*/
@Service( "legacyRepositoryConverter#default" )
public class DefaultLegacyRepositoryConverter
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index 7d0ce6b54..bd7f6bcf3 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -48,7 +48,7 @@ import java.util.List;
* LegacyConverterArtifactConsumer - convert artifacts as they are found
* into the destination repository.
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java
index 5a3fb46e8..feef28b7d 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java
@@ -25,7 +25,7 @@ import org.apache.archiva.common.utils.VersionUtil;
/**
* ArchivaArtifact - Mutable artifact object.
*
- * @version $Id$
+ *
*/
public class ArchivaArtifact
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
index 3f33da04e..aea8bad2b 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
@@ -22,7 +22,7 @@ package org.apache.archiva.model;
/**
* A tag for objects that are considered ArchivaArtifactPlatformDetails.
*
- * @version $Id$
+ *
*/
public interface ArchivaArtifactPlatformDetails
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
index 16a9183b7..4601de0ca 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
@@ -27,7 +27,7 @@ import java.util.Properties;
/**
* Utility methods for cloning various Archiva Model objects.
*
- * @version $Id$
+ *
*/
public class ArchivaModelCloner
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
index ea2ccc2d2..6cd0ff9c7 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
@@ -22,7 +22,7 @@ package org.apache.archiva.model;
/**
* Tag for identifying a Compound Key
*
- * @version $Id$
+ *
*/
public interface CompoundKey
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java
index a39f6eb02..1b2057efd 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUtils;
/**
* Keys - utility methods for converting common objects into string keys.
*
- * @version $Id$
+ *
*/
public class Keys
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
index 47fd5b325..1e94ff292 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
@@ -22,7 +22,7 @@ package org.apache.archiva.model;
/**
* RepositoryURL - Mutable (and protocol forgiving) URL object.
*
- * @version $Id$
+ *
*/
public class RepositoryURL
{
diff --git a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java
index 2261b1ae9..705175cd7 100644
--- a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java
+++ b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
/**
* RepositoryURLTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryURLTest
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
index 4ef316ad2..19e829f21 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
@@ -33,7 +33,7 @@ import java.util.Properties;
/**
* AbstractUpdatePolicy
*
- * @version $Id$
+ *
*/
public abstract class AbstractUpdatePolicy
implements PreDownloadPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
index 10c0215fc..e86224f6a 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
@@ -34,7 +34,7 @@ import java.util.Properties;
/**
* {@link PreDownloadPolicy} to check if the requested url has failed before.
*
- * @version $Id$
+ *
*/
@Service( "preDownloadPolicy#cache-failures" )
public class CachedFailuresPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
index fd5eeaf3a..eff2a37c1 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
@@ -35,7 +35,7 @@ import java.util.Properties;
* ChecksumPolicy - a policy applied after the download to see if the file has been downloaded
* successfully and completely (or not).
*
- * @version $Id$
+ *
*/
@Service( "postDownloadPolicy#checksum" )
public class ChecksumPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadErrorPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadErrorPolicy.java
index f5ab975a5..d2a5aa23f 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadErrorPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadErrorPolicy.java
@@ -27,7 +27,7 @@ import java.util.Properties;
* Policy to apply after the download has completed, but before the
* resource is made available to the calling client.
*
- * @version $Id$
+ *
*/
public interface DownloadErrorPolicy
extends Policy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadPolicy.java
index fdf162b93..41c365088 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/DownloadPolicy.java
@@ -25,7 +25,7 @@ import java.util.Properties;
/**
* DownloadPolicy
*
- * @version $Id$
+ *
*/
public interface DownloadPolicy
extends Policy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyConfigurationException.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyConfigurationException.java
index d2624428f..08059d459 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyConfigurationException.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyConfigurationException.java
@@ -25,7 +25,7 @@ import org.apache.archiva.common.ArchivaException;
* PolicyConfigurationException is thrown when a policy cannot be executed due to a
* configuration issue.
*
- * @version $Id$
+ *
*/
public class PolicyConfigurationException
extends ArchivaException
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyViolationException.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyViolationException.java
index 0cfb4c5d0..4c6457e6a 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyViolationException.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PolicyViolationException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.ArchivaException;
/**
* PolicyViolationException
*
- * @version $Id$
+ *
*/
public class PolicyViolationException
extends ArchivaException
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PostDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PostDownloadPolicy.java
index fdddcb0c5..0a4b84f87 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PostDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PostDownloadPolicy.java
@@ -23,7 +23,7 @@ package org.apache.archiva.policies;
* Policy to apply after the download has completed, but before the
* resource is made available to the calling client.
*
- * @version $Id$
+ *
*/
public interface PostDownloadPolicy
extends DownloadPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PreDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PreDownloadPolicy.java
index cdd497090..25d5f531a 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PreDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PreDownloadPolicy.java
@@ -23,7 +23,7 @@ package org.apache.archiva.policies;
/**
* Policy to apply before the download is attempted.
*
- * @version $Id$
+ *
*/
public interface PreDownloadPolicy extends DownloadPolicy
{
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java
index 614a4cc29..0018bdcf9 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ReleasesPolicy.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
/**
* {@link PreDownloadPolicy} to apply for released versions.
*
- * @version $Id$
+ *
*/
@Service("preDownloadPolicy#releases")
public class ReleasesPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java
index 0f9c2c07a..d1addb899 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/SnapshotsPolicy.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
/**
* {@link PreDownloadPolicy} to apply for snapshot versions.
*
- * @version $Id$
+ *
*/
@Service("preDownloadPolicy#snapshots")
public class SnapshotsPolicy
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
index d5da703f9..912ca775d 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
@@ -26,7 +26,7 @@ import java.util.Date;
/**
* DefaultUrlFailureCache
*
- * @version $Id$
+ *
*/
public class DefaultUrlFailureCache
implements UrlFailureCache
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/UrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/UrlFailureCache.java
index 65ef10725..74b775ab8 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/UrlFailureCache.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/UrlFailureCache.java
@@ -23,7 +23,7 @@ package org.apache.archiva.policies.urlcache;
/**
* Cache for requested URLs that cannot be fetched.
*
- * @version $Id$
+ *
*/
public interface UrlFailureCache
{
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
index c7233d868..4cae2df12 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
@@ -34,7 +34,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* CachedFailuresPolicyTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
index e73af8bbb..178443509 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
/**
* ChecksumPolicyTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml"} )
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java
index 34df85517..f2babbb77 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ReleasePolicyTest.java
@@ -35,7 +35,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* ReleasePolicyTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/SnapshotsPolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/SnapshotsPolicyTest.java
index f90ac60aa..50fec5799 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/SnapshotsPolicyTest.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/SnapshotsPolicyTest.java
@@ -35,7 +35,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* SnapshotsPolicyTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index 64e84a474..2eef7df48 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -90,7 +90,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* DefaultRepositoryProxyConnectors
*
- * @version $Id$
+ *
* @todo exception handling needs work - "not modified" is not really an exceptional case, and it has more layers than
* your average brown onion
*/
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java
index 247289398..6fd6f1a01 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.proxy;
/**
* NotFoundException - thrown when the resource requested was not found on the remote repository.
*
- * @version $Id$
+ *
*/
public class NotFoundException
extends ProxyException
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java
index c78f2791f..79fba1e4b 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java
@@ -29,7 +29,7 @@ package org.apache.archiva.proxy;
* Similar in scope to the HTTP 304 Not Modified
response code.
*
*
- * @version $Id$
+ *
*/
public class NotModifiedException
extends ProxyException
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
index ad34a42bc..8bf53b6fd 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
@@ -30,7 +30,7 @@ import java.util.Map;
/**
* This represents a connector for a repository to repository proxy.
*
- * @version $Id$
+ *
*/
public class ProxyConnector
implements RepositoryConnector
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
index 68a1a5996..36f3b0bc5 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
@@ -24,7 +24,7 @@ import java.util.Comparator;
/**
* ProxyConnectorOrderComparator
*
- * @version $Id$
+ *
*/
public class ProxyConnectorOrderComparator
implements Comparator
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
index b62adf1e3..144f48c31 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
@@ -29,7 +29,7 @@ import java.util.List;
/**
* Handler for potential repository proxy connectors.
*
- * @version $Id$
+ *
*/
public interface RepositoryProxyConnectors
{
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
index a1d47668c..d516309b3 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
@@ -69,7 +69,7 @@ import static org.junit.Assert.*;
/**
* AbstractProxyTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
index b2e9d9130..5d1a4e2b9 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
/**
* CacheFailuresTransferTest
*
- * @version $Id$
+ *
*/
public class CacheFailuresTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
index 5ab3733a7..8db426096 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNull;
/**
* ChecksumTransferTest
*
- * @version $Id$
+ *
*/
public class ChecksumTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
index 67ee566c9..6d5139c52 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
/**
* ErrorHandlingTest
*
- * @version $Id$
+ *
*/
public class ErrorHandlingTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
index 2c5634b93..6e00a3460 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
/**
* ManagedDefaultTransferTest
*
- * @version $Id$
+ *
*/
public class ManagedDefaultTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
index 59abf7e60..7354946c8 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
/**
* ManagedLegacyTransferTest
*
- * @version $Id$
+ *
*/
public class ManagedLegacyTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
index 59694abdb..a14089067 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
@@ -92,7 +92,7 @@ import static org.junit.Assert.*;
* (1) If it isn't proxied, no point in having a remote.
*
*
- * @version $Id$
+ *
*/
public class MetadataTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
index 1e3905899..8397a56ce 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java
@@ -40,7 +40,7 @@ import javax.annotation.PostConstruct;
/**
* MockConfiguration
*
- * @version $Id$
+ *
*/
@Service( "archivaConfiguration#mock" )
public class MockConfiguration
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
index 65a3aac50..097a3a3c8 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
/**
* SnapshotTransferTest
*
- * @version $Id$
+ *
*/
public class SnapshotTransferTest
extends AbstractProxyTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ContentNotFoundException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ContentNotFoundException.java
index f335ababf..7579debfe 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ContentNotFoundException.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ContentNotFoundException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.repository;
/**
* ContentNotFoundException is thrown in response for requests for content that is not the repository.
*
- * @version $Id$
+ *
*/
public class ContentNotFoundException
extends RepositoryException
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
index 01c5fc06f..d8ede2020 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
@@ -33,7 +33,7 @@ import java.util.Set;
* ManagedRepositoryContent interface for interacting with a managed repository in an abstract way,
* without the need for processing based on filesystem paths, or working with the database.
*
- * @version $Id$
+ *
*/
public interface ManagedRepositoryContent
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
index c5e85298b..7bbe28c0d 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
@@ -28,7 +28,7 @@ import org.apache.archiva.repository.layout.LayoutException;
* RemoteRepositoryContent interface for interacting with a remote repository in an abstract way,
* without the need for processing based on URLs, or working with the database.
*
- * @version $Id$
+ *
*/
public interface RemoteRepositoryContent
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
index ae98bf6d2..a9f4f9812 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java
@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* RepositoryContentRequest
*
- * @version $Id$
+ *
*/
@Service( "repositoryContentFactory#default" )
public class RepositoryContentFactory
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java
index a7774ac53..b9dca9553 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.repository;
/**
* RepositoryException
*
- * @version $Id$
+ *
*/
public class RepositoryException
extends Exception
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java
index 570ae2b47..ad4ad9b2f 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.repository;
/**
* RepositoryNotFoundException
*
- * @version $Id$
+ *
*/
public class RepositoryNotFoundException
extends RepositoryException
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java
index 1981619d8..6f653e279 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/connector/RepositoryConnector.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* RepositoryConnector
*
- * @version $Id$
+ *
*/
public interface RepositoryConnector
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
index 4d3236301..2ead26d82 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
@@ -39,7 +39,7 @@ import java.util.List;
/**
* AbstractDefaultRepositoryContent - common methods for working with default (maven 2) layout.
*
- * @version $Id$
+ *
*/
public abstract class AbstractDefaultRepositoryContent
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
index 4c88dadba..86b3c4661 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* AbstractLegacyRepositoryContent
*
- * @version $Id$
+ *
*/
public abstract class AbstractLegacyRepositoryContent
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ArtifactExtensionMapping.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ArtifactExtensionMapping.java
index 34db88ba6..11105551f 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ArtifactExtensionMapping.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ArtifactExtensionMapping.java
@@ -25,7 +25,7 @@ import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp
/**
* ArtifactExtensionMapping
*
- * @version $Id$
+ *
*/
public class ArtifactExtensionMapping
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
index e2b3cb299..b5e8ad3d0 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
@@ -38,7 +38,7 @@ import java.util.Collections;
* TODO: remove in favour of path translator, this is just delegating for the most part, but won't accommodate other
* extensions like NPanday
*
- * @version $Id$
+ *
*/
@Service( "pathParser#default" )
public class DefaultPathParser
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/FilenameParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/FilenameParser.java
index 587ffe80f..a86308fe9 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/FilenameParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/FilenameParser.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
/**
* Generic Filename Parser for use with layout routines.
*
- * @version $Id$
+ *
*/
public class FilenameParser
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
index 5ca29ce2b..8e6725179 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
@@ -31,7 +31,7 @@ import java.util.Collection;
* LegacyPathParser is a parser for maven 1 (legacy layout) paths to
* ArtifactReference.
*
- * @version $Id$
+ *
*/
public class LegacyPathParser
implements PathParser
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
index 36b32df06..2957e76d8 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
@@ -46,7 +46,7 @@ import java.util.Set;
/**
* ManagedDefaultRepositoryContent
*
- * @version $Id$
+ *
*/
@Service( "managedRepositoryContent#default" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
index a03626a90..d10cbc544 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
@@ -42,7 +42,7 @@ import java.util.Set;
/**
* ManagedLegacyRepositoryContent
*
- * @version $Id$
+ *
* @todo no need to be a component when filetypes, legacy path parser is not
*/
@Service( "managedRepositoryContent#legacy" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
index 0eebe7589..5dc960913 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
@@ -25,7 +25,7 @@ import org.apache.archiva.repository.layout.LayoutException;
/**
* PathParser interface.
*
- * @version $Id$
+ *
*/
public interface PathParser
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
index 8b58b2b0d..0e1cd5be0 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
/**
* RemoteDefaultRepositoryContent
*
- * @version $Id$
+ *
*/
@Service( "remoteRepositoryContent#default" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
index f806fb7dc..00f69ecaa 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
/**
* RemoteLegacyRepositoryContent
*
- * @version $Id$
+ *
* @todo no need to be a component once legacy path parser is not
*/
@Service( "remoteRepositoryContent#legacy" )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
index 3af7b0289..93b6af4ee 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
@@ -29,7 +29,7 @@ import org.apache.archiva.repository.metadata.MetadataTools;
* RepositoryRequest is used to determine the type of request that is incoming, and convert it to an appropriate
* ArtifactReference.
*
- * @version $Id$
+ *
*
*/
public class RepositoryRequest
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java
index c41ca2900..6e3a77996 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.ArchivaException;
/**
* LayoutException
*
- * @version $Id$
+ *
*/
public class LayoutException extends ArchivaException
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
index 2f0ff245a..c9ae1301a 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
@@ -75,7 +75,7 @@ import java.util.regex.Matcher;
/**
* MetadataTools
*
- * @version $Id$
+ *
*/
@Service( "metadataTools#default" )
public class MetadataTools
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataException.java
index d20da9fd2..16cc89ea0 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataException.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.repository.RepositoryException;
/**
* RepositoryMetadataException
*
- * @version $Id$
+ *
*/
public class RepositoryMetadataException
extends RepositoryException
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
index a045c9c3b..a3ecbf8ca 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
@@ -31,7 +31,7 @@ import org.apache.archiva.model.SnapshotVersion;
/**
* RepositoryMetadataMerge
*
- * @version $Id$
+ *
*/
public class RepositoryMetadataMerge
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
index 2ab57b942..f8eb390f2 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* RepositoryMetadataWriter
*
- * @version $Id$
+ *
*/
public class RepositoryMetadataWriter
{
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
index 36212e442..ee0606c88 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
@@ -34,7 +34,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* AbstractRepositoryLayerTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
index 2a9339737..5137f2ed6 100755
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
@@ -34,7 +34,7 @@ import java.util.Set;
/**
* MockConfiguration
*
- * @version $Id$
+ *
*/
@Service("archivaConfiguration#mock")
public class MockConfiguration
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
index 052f65136..f0bfdbc66 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
/**
* RepositoryURLTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryURLTest
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
index f557092d3..c97483e1d 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
/**
* AbstractDefaultRepositoryContentTestCase
*
- * @version $Id$
+ *
*/
public abstract class AbstractDefaultRepositoryContentTestCase
extends AbstractRepositoryLayerTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
index a103ddcee..d8aed75fb 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
/**
* AbstractLegacyRepositoryContentTestCase
*
- * @version $Id$
+ *
*/
public abstract class AbstractLegacyRepositoryContentTestCase
extends AbstractRepositoryLayerTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
index 0372e8809..0173f19c7 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
/**
* ArtifactExtensionMappingTest
*
- * @version $Id$
+ *
*/
public class ArtifactExtensionMappingTest
extends AbstractRepositoryLayerTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
index 10cb0c015..eb9b61ee8 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
*
* TODO: move to path translator tests
*
- * @version $Id$
+ *
*/
public class DefaultPathParserTest
extends AbstractRepositoryLayerTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
index 5e9002776..93b5748b9 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
/**
* FilenameParserTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class FilenameParserTest
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
index 7f48c8b9a..a555932bd 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
/**
* LegacyPathParserTest
*
- * @version $Id$
+ *
*/
public class LegacyPathParserTest
extends AbstractRepositoryLayerTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
index ded5e6bb2..a96fd02e9 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.*;
/**
* ManagedDefaultRepositoryContentTest
*
- * @version $Id$
+ *
*/
public class ManagedDefaultRepositoryContentTest
extends AbstractDefaultRepositoryContentTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
index 0298630a3..3d3683a3e 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
/**
* ManagedLegacyRepositoryContentTest
*
- * @version $Id$
+ *
*/
public class ManagedLegacyRepositoryContentTest
extends AbstractLegacyRepositoryContentTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
index 96f89c825..b700ae95b 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
@@ -31,7 +31,7 @@ import javax.inject.Named;
/**
* RemoteDefaultRepositoryContentTest
*
- * @version $Id$
+ *
*/
public class RemoteDefaultRepositoryContentTest
extends AbstractDefaultRepositoryContentTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
index 837abb8c5..af45cac9d 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
@@ -31,7 +31,7 @@ import javax.inject.Named;
/**
* RemoteLegacyRepositoryContentTest
*
- * @version $Id$
+ *
*/
public class RemoteLegacyRepositoryContentTest
extends AbstractLegacyRepositoryContentTestCase
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
index e8dffae88..c68708971 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
/**
* RepositoryRequestTest
*
- * @version $Id$
+ *
*/
@ContextConfiguration(
locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
index 38ee82f04..09f178132 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.*;
/**
* MetadataToolsTest
*
- * @version $Id$
+ *
*/
@ContextConfiguration(
locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
index 9e4cab6d2..bff475680 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
@@ -32,7 +32,7 @@ import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
/**
* RepositoryMetadataReaderTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryMetadataReaderTest
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
index 2ea17f0c7..ea099bde0 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
@@ -33,7 +33,7 @@ import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
/**
* RepositoryMetadataWriterTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class RepositoryMetadataWriterTest
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
index 469321de5..28a050762 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
@@ -39,7 +39,7 @@ import java.util.Set;
/**
* DefaultRepositoryScanner
*
- * @version $Id$
+ *
*/
@Service( "repositoryScanner#default" )
public class DefaultRepositoryScanner
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
index a0f73512a..25150f8b5 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
@@ -48,7 +48,7 @@ import java.util.Map;
/**
* RepositoryContentConsumerUtil
*
- * @version $Id$
+ *
*/
@Service("repositoryContentConsumers")
public class RepositoryContentConsumers
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
index e627f0f55..6f5f1a111 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
@@ -31,7 +31,7 @@ import java.util.Map;
/**
* RepositoryScanStatistics - extension to the RepositoryContentStatistics model.
*
- * @version $Id$
+ *
*/
@XmlRootElement( name = "repositoryScanStatistics" )
public class RepositoryScanStatistics
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
index cf633ca42..f5db9657a 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
@@ -30,7 +30,7 @@ import java.util.Set;
/**
* RepositoryScanner
*
- * @version $Id$
+ *
*/
public interface RepositoryScanner
{
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
index 80a6fb730..4748e023a 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
@@ -44,7 +44,7 @@ import java.util.Map;
/**
* RepositoryScannerInstance
*
- * @version $Id$
+ *
*/
public class RepositoryScannerInstance
implements DirectoryWalkListener
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
index fda9f9fa7..543a85eb5 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
@@ -30,7 +30,7 @@ import java.util.Map;
/**
* ConsumerProcessFileClosure
*
- * @version $Id$
+ *
*/
public class ConsumerProcessFileClosure
implements Closure
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
index de2c06186..dbc1453b5 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
@@ -31,7 +31,7 @@ import java.util.Date;
/**
* TriggerBeginScanClosure
*
- * @version $Id$
+ *
*/
public class TriggerBeginScanClosure
implements Closure
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
index a294c1aa7..f73496fab 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
@@ -32,7 +32,7 @@ import java.util.List;
/**
* InvalidScanConsumer
*
- * @version $Id$
+ *
*/
public class InvalidScanConsumer
extends AbstractMonitoredConsumer
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
index 364e11c46..bb88c7195 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* ScanConsumer
*
- * @version $Id$
+ *
*/
public class KnownScanConsumer
extends AbstractMonitoredConsumer
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
index 76c0afeda..301d056f1 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
@@ -57,7 +57,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* RepositoryContentConsumersTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
index 2d6fe7168..fb5c87181 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
@@ -45,7 +45,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* RepositoryScannerTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } )
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
index 11069bf04..fbaf2ec47 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java
@@ -30,7 +30,7 @@ import java.util.List;
/**
* SampleKnownConsumer
*
- * @version $Id$
+ *
*/
public class SampleKnownConsumer
extends AbstractMonitoredConsumer
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
index a5ba4c5bd..e437aff90 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
@@ -35,7 +35,7 @@ import java.util.Map;
/**
* Abstract class for the TransactionEvents
*
- * @version $Id$
+ *
*/
public abstract class AbstractTransactionEvent
implements TransactionEvent
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java
index 52e9fc380..43594a7e5 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CopyFileEvent.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.digest.Digester;
/**
* Event to copy a file.
*
- * @version $Id$
+ *
*/
public class CopyFileEvent
extends AbstractTransactionEvent
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java
index 584c47c8c..797a03abb 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/CreateFileEvent.java
@@ -28,7 +28,7 @@ import org.codehaus.plexus.digest.Digester;
/**
* Event for creating a file from a string content.
*
- * @version $Id$
+ *
*/
public class CreateFileEvent
extends AbstractTransactionEvent
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/TransactionException.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/TransactionException.java
index 9cbdfe39c..64b6223b8 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/TransactionException.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/TransactionException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.transaction;
/**
* TransactionException
*
- * @version $Id$
+ *
*/
public class TransactionException
extends Exception
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java b/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java
index 7a73734fe..eceafc0f3 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/archiva/transaction/AbstractFileEventTest.java
@@ -34,7 +34,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
/**
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractFileEventTest
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java
index 54ea5aa17..37dd0a297 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/ElementTextListClosure.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* Gather the text from a collection of {@link Element}'s into a {@link List}
*
- * @version $Id$
+ *
*/
public class ElementTextListClosure
implements Closure
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntities.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntities.java
index a1ed95025..724ac9e78 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntities.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntities.java
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* LatinEntities - simple utility class to handle latin entity conversion.
*
- * @version $Id$
+ *
*/
public class LatinEntities
{
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
index f395ad290..388b661dc 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/LatinEntityResolutionReader.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
/**
* LatinEntityResolutionReader - Read a Character Stream.
*
- * @version $Id$
+ *
*/
public class LatinEntityResolutionReader
extends Reader
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLException.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLException.java
index 8557b4345..098cb38d6 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLException.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.ArchivaException;
/**
* XMLException
*
- * @version $Id$
+ *
*/
public class XMLException extends ArchivaException
{
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
index e77537987..3e5269bf9 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
@@ -46,7 +46,7 @@ import java.util.Map;
/**
* XMLReader - a set of common xml utility methods for reading content out of an xml file.
*
- * @version $Id$
+ *
*/
public class XMLReader
{
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLWriter.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLWriter.java
index 9ebfd861f..0f02ee44a 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLWriter.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLWriter.java
@@ -28,7 +28,7 @@ import java.io.Writer;
/**
* XMLWriter - Making writing XML files easier.
*
- * @version $Id$
+ *
*/
public class XMLWriter
{
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java
index cb03211c7..5f340053f 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/AbstractArchivaXmlTestCase.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
/**
* AbstractArchivaXmlTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractArchivaXmlTestCase
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java
index 253686254..c0575f9de 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntitiesTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
/**
* LatinEntitiesTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class LatinEntitiesTest
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
index 0fa4d42bd..20ada7d81 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
/**
* LatinEntityResolutionReaderTest
*
- * @version $Id$
+ *
*/
public class LatinEntityResolutionReaderTest
extends AbstractArchivaXmlTestCase
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java
index 0d2d0e7d0..12d2f451b 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLReaderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* XMLReaderTest
*
- * @version $Id$
+ *
*/
public class XMLReaderTest
extends AbstractArchivaXmlTestCase
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java
index 0b90ac9d5..fe7e7d062 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/XMLWriterTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* XMLWriterTest
*
- * @version $Id$
+ *
*/
public class XMLWriterTest
extends AbstractArchivaXmlTestCase
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
index 00bf3a1a7..13bd136d3 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
@@ -48,7 +48,7 @@ import java.util.Date;
/**
* ArchivaRepositoryScanningTaskExecutor
*
- * @version $Id$
+ *
*/
@Service( "taskExecutor#repository-scanning" )
public class ArchivaRepositoryScanningTaskExecutor
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
index d98b8b649..adb1c36de 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock;
/**
* ArchivaRepositoryScanningTaskExecutorPhase1Test
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
index 9a2885662..5fcc4b3f9 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
@@ -30,7 +30,7 @@ import java.util.Collection;
/**
* ArchivaRepositoryScanningTaskExecutorPhase1Test
*
- * @version $Id$
+ *
*/
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorPhase1Test
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
index 225d3a153..7c18e9d3a 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
@@ -36,7 +36,7 @@ import java.util.Date;
/**
* ArchivaRepositoryScanningTaskExecutorPhase2Test
*
- * @version $Id$
+ *
*/
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/AdminRepositoryConsumer.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/AdminRepositoryConsumer.java
index 2d34caf48..47405f579 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/AdminRepositoryConsumer.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/AdminRepositoryConsumer.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
/**
* AdminRepositoryConsumer
*
- * @version $Id$
+ *
*/
@XmlRootElement( name = "adminRepositoryConsumer" )
public class AdminRepositoryConsumer
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
index e222fbf5a..7bd92c0e1 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
@@ -29,7 +29,7 @@ import java.util.List;
/**
* AddAdminRepoConsumerClosure
*
- * @version $Id$
+ *
*/
public class AddAdminRepoConsumerClosure
implements Closure
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java
index 500ab7d5e..6cadd3da0 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AdminRepositoryConsumerComparator.java
@@ -26,7 +26,7 @@ import java.util.Comparator;
/**
* AdminRepositoryConsumerComparator
*
- * @version $Id$
+ *
*/
public class AdminRepositoryConsumerComparator
implements Comparator
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/AccessDeniedException.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/AccessDeniedException.java
index fe57169cf..18c39bdb4 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/AccessDeniedException.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/AccessDeniedException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.security;
/**
* AccessDeniedException
*
- * @version $Id$
+ *
*/
public class AccessDeniedException
extends ArchivaSecurityException
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaSecurityException.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaSecurityException.java
index 5d87d6b49..0388a6ddd 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaSecurityException.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaSecurityException.java
@@ -24,7 +24,7 @@ import org.apache.archiva.common.ArchivaException;
/**
* ArchivaSecurityException
*
- * @version $Id$
+ *
*/
public class ArchivaSecurityException
extends ArchivaException
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
index 0783d55d2..7e9760dff 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
@@ -34,7 +34,7 @@ import javax.inject.Named;
/**
* ArchivaStandardRolesCheck tests for the existance of expected / standard roles and permissions.
*
- * @version $Id$
+ *
*/
@Service("environmentCheck#archiva-required-roles")
public class ArchivaStandardRolesCheck
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java
index e45f36e41..c0850f12e 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaXworkUser.java
@@ -29,7 +29,7 @@ import org.apache.archiva.redback.users.User;
/**
* ArchivaXworkUser
*
- * @version $Id$
+ *
*/
public final class ArchivaXworkUser
{
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
index 063acd02f..2f50d3350 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
@@ -44,7 +44,7 @@ import java.util.List;
/**
* DefaultUserRepositories
*
- * @version $Id$
+ *
*/
@Service( "userRepositories" )
public class DefaultUserRepositories
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/PrincipalNotFoundException.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/PrincipalNotFoundException.java
index bc5ea07a7..44b450df2 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/PrincipalNotFoundException.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/PrincipalNotFoundException.java
@@ -22,7 +22,7 @@ package org.apache.archiva.security;
/**
* PrincipalNotFoundException
*
- * @version $Id$
+ *
*/
public class PrincipalNotFoundException
extends ArchivaSecurityException
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
index d116f4d32..6e3881218 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
@@ -26,7 +26,7 @@ import java.util.List;
/**
* UserRepositories
*
- * @version $Id$
+ *
*/
public interface UserRepositories
{
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java
index 3101798bf..585768f83 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java
+++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/DefaultUserRepositoriesTest.java
@@ -30,7 +30,7 @@ import java.util.List;
/**
* DefaultUserRepositoriesTest
*
- * @version $Id$
+ *
*/
public class DefaultUserRepositoriesTest
extends AbstractSecurityTest
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
index 52cde3742..f35e7b768 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
@@ -41,7 +41,7 @@ import java.util.concurrent.ExecutorService;
/**
* ArchivaStartup - the startup of all archiva features in a deterministic order.
*
- * @version $Id$
+ *
*/
public class ArchivaStartup
implements ServletContextListener
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java
index 343358f19..3547ee308 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
/**
* Banner
*
- * @version $Id$
+ *
*/
public class Banner
{
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
index 353101c5c..a4b27de15 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
@@ -51,7 +51,7 @@ import java.util.Map.Entry;
/**
* ConfigurationSynchronization
*
- * @version $Id$
+ *
*/
@Service
public class SecuritySynchronization
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
index f8b9dc075..ae0750a97 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* UserRepositories stub used for testing.
*
- * @version $Id$
+ *
*/
public class UserRepositoriesStub
implements UserRepositories
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 38bdb6003..63290698e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -46,7 +46,7 @@ import java.util.Map;
/**
* SecuritySystem stub used for testing.
*
- * @version $Id$
+ *
*/
public class SecuritySystemStub
implements SecuritySystem
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/LoginTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/LoginTest.java
index 0c888e03c..d0f50fb1d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/LoginTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/LoginTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
* Based on LoginTest of Emmanuel Venisse test.
*
* @author José Morales MartÃnez
- * @version $Id$
+ *
*/
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
index 66b2e2f79..73db410a7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java
@@ -33,7 +33,7 @@ import org.testng.annotations.Test;
* Based on LoginTest of Emmanuel Venisse test.
*
* @author José Morales MartÃnez
- * @version $Id$
+ *
*/
@Test( groups = { "login" }, dependsOnGroups = {"about"})
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/GlobalResults.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/GlobalResults.java
index ec00087db..ec52a4db2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/GlobalResults.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/GlobalResults.java
@@ -22,7 +22,7 @@ package org.apache.archiva.web.action;
/**
* GlobalResults - constants for global result definitions.
*
- * @version $Id$
+ *
*/
public class GlobalResults
{
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
index 868c8f6f8..bbe5b5fe8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java
@@ -39,7 +39,7 @@ import java.util.Map;
/**
* Shows system status information for the administrator.
*
- * @version $Id$
+ *
*/
@Controller( "systemStatus" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/AbstractAppearanceAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
index eca6b270e..3fab37576 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
@@ -29,7 +29,7 @@ import javax.inject.Inject;
/**
* AbstractAppearanceAction
*
- * @version $Id$
+ *
*/
public abstract class AbstractAppearanceAction
extends AbstractActionSupport
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java
index 8c6d31c01..4754fd9ce 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java
@@ -39,7 +39,7 @@ import java.util.Map;
/**
* AbstractProxyConnectorAction
*
- * @version $Id$
+ *
*/
public abstract class AbstractProxyConnectorAction
extends AbstractActionSupport
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
index fc8dd0c80..34abe41d3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java
@@ -44,7 +44,7 @@ import java.util.Map;
* AbstractProxyConnectorFormAction - generic fields and methods for either add or edit actions related with the
* Proxy Connector.
*
- * @version $Id$
+ *
*/
public abstract class AbstractProxyConnectorFormAction
extends AbstractProxyConnectorAction
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
index e8baacfcf..da877988c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Controller;
/**
* AddProxyConnectorAction
*
- * @version $Id$
+ *
*/
@Controller( "addProxyConnectorAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
index 5cc641710..7e2e1ceb0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Controller;
/**
* DeleteProxyConnectorAction
*
- * @version $Id$
+ *
*/
@Controller( "deleteProxyConnectorAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
index 1a9823e1e..a6e5b3ded 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Controller;
/**
* EditProxyConnectorAction
*
- * @version $Id$
+ *
*/
@Controller( "editProxyConnectorAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
index 71190708c..9f5461298 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
@@ -33,7 +33,7 @@ import java.util.Map;
/**
* ProxyConnectorsAction
*
- * @version $Id$
+ *
*/
@Controller( "proxyConnectorsAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
index 7aa28654a..80c17105d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java
@@ -30,7 +30,7 @@ import java.util.List;
/**
* SortProxyConnectorsAction -
*
- * @version $Id$
+ *
*/
@Controller( "sortProxyConnectorsAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
index f8ef4dc67..087945a78 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
@@ -39,7 +39,7 @@ import javax.inject.Inject;
/**
* ConfigureNetworkProxyAction
*
- * @version $Id$
+ *
*/
@Controller( "configureNetworkProxyAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
index f06e8ce44..f43083296 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java
@@ -37,7 +37,7 @@ import java.util.List;
/**
* NetworkProxiesAction
*
- * @version $Id$
+ *
*/
@Controller( "networkProxiesAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
index f3d34a960..3ae0a1436 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
@@ -24,7 +24,7 @@ package org.apache.archiva.web.action.admin.repositories;
*
* Place for all generic methods used in Managed Repository Administration.
*
- * @version $Id$
+ *
*/
public abstract class AbstractManagedRepositoriesAction
extends AbstractRepositoriesAdminAction
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
index e1a94f67d..b00461600 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRemoteRepositoriesAction.java
@@ -30,7 +30,7 @@ import java.util.List;
/**
* AbstractRemoteRepositoriesAction
*
- * @version $Id$
+ *
*/
public class AbstractRemoteRepositoriesAction
extends AbstractRepositoriesAdminAction
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java
index 94337c088..2a75d8d85 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java
@@ -37,7 +37,7 @@ import javax.inject.Inject;
* Base class for all repository administrative functions.
* This should be neutral to the type of action (add/edit/delete) and type of repo (managed/remote)
*
- * @version $Id$
+ *
*/
public abstract class AbstractRepositoriesAdminAction
extends AbstractActionSupport
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
index 2c94b6474..dff8eafea 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java
@@ -33,7 +33,7 @@ import java.io.File;
/**
* AddManagedRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "addManagedRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
index 4a2cd85bc..c6a4e4ea0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Controller;
/**
* AddRemoteRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "addRemoteRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
index b1bc69756..23f5d7602 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Controller;
/**
* DeleteManagedRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "deleteManagedRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java
index c70c25fe0..cca80a1a9 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Controller;
/**
* DeleteRemoteRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "deleteRemoteRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
index 0b5812a4c..47962ba43 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
@@ -33,7 +33,7 @@ import java.io.File;
/**
* AddManagedRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "editManagedRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
index eabba6b79..21cfb2743 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java
@@ -33,7 +33,7 @@ import javax.inject.Inject;
/**
* EditRemoteRepositoryAction
*
- * @version $Id$
+ *
*/
@Controller( "editRemoteRepositoryAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java
index 46c991604..a839e9102 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java
@@ -54,7 +54,7 @@ import java.util.Map;
/**
* Shows the Repositories Tab for the administrator.
*
- * @version $Id$
+ *
*/
@Controller( "repositoriesAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
index a48aa2172..059c1ca68 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java
@@ -50,7 +50,7 @@ import java.util.Map;
/**
* RepositoryScanningAction
*
- * @version $Id$
+ *
*/
@Controller( "repositoryScanningAction" )
@Scope( "prototype" )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
index cd7c2d586..2f3a12137 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/CopyPasteSnippetTag.java
@@ -36,7 +36,7 @@ import java.io.IOException;
/**
* CopyPasteSnippetTag
*
- * @version $Id$
+ *
*/
@StrutsTag(name = "copy-paste-snippet", tldBodyContent = "empty", tldTagClass = "org.apache.archiva.web.tags.CopyPasteSnippetTag", description = "Render a copy paste snippet for the provided object")
public class CopyPasteSnippetTag
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
index 481f84eb9..0a73834f8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* DependencyTree
*
- * @version $Id$
+ *
*/
@Service( "dependencyTree" )
public class DependencyTree
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
index 1d1433074..f97204fe8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
@@ -54,7 +54,7 @@ import javax.servlet.jsp.tagext.TryCatchFinally;
*
*
*
- * @version $Id$
+ *
*/
@StrutsTag(name = "dependency-tree", tldBodyContent = "JSP", tldTagClass = "org.apache.archiva.web.tags.DependencyTreeTag", description = "Render a dependency tree for the provided project.")
public class DependencyTreeTag
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/ExpressionTool.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/ExpressionTool.java
index b8876abef..cc083222f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/ExpressionTool.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/ExpressionTool.java
@@ -29,7 +29,7 @@ import javax.servlet.jsp.tagext.Tag;
/**
* ExpressionTool
*
- * @version $Id$
+ *
*/
public class ExpressionTool
{
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLink.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLink.java
index 71479c4b0..e1661eeae 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLink.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLink.java
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* GroupIdLink
*
- * @version $Id$
+ *
*/
public class GroupIdLink
extends Component
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
index 3660cde78..25791c992 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/GroupIdLinkTag.java
@@ -33,7 +33,7 @@ import org.apache.struts2.views.jsp.ComponentTagSupport;
/**
* GroupIdLink
*
- * @version $Id$
+ *
*/
@StrutsTag(name = "groupIdLink", tldBodyContent = "empty", tldTagClass = "org.apache.archiva.web.tags.GroupIdLinkTag", description = "Render a groupId as a set of Links")
public class GroupIdLinkTag
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/util/ContextUtils.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/util/ContextUtils.java
index 2594eb14c..914f440f3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/util/ContextUtils.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/util/ContextUtils.java
@@ -30,7 +30,7 @@ import javax.servlet.jsp.PageContext;
/**
* ContextUtils
*
- * @version $Id$
+ *
*/
public class ContextUtils
{
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java
index 819db1c86..94f137688 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractWebworkTestCase.java
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
/**
* AbstractWebworkTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public abstract class AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
index 9ac59722c..839c39c1c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
@@ -48,7 +48,7 @@ import org.junit.Test;
/**
* AddProxyConnectorActionTest
*
- * @version $Id$
+ *
*/
public class AddProxyConnectorActionTest
extends AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
index ded32ea66..8616d47f5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
/**
* DeleteProxyConnectorActionTest
*
- * @version $Id$
+ *
*/
public class DeleteProxyConnectorActionTest
extends AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
index 2f2a2a45e..76df7c6f3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
/**
* EditProxyConnectorActionTest
*
- * @version $Id$
+ *
*/
public class EditProxyConnectorActionTest
extends AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
index b6d042e05..f9d93a196 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
/**
* ProxyConnectorsActionTest
*
- * @version $Id$
+ *
*/
public class ProxyConnectorsActionTest
extends AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
index 5d23fc348..21469c692 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
/**
* SortProxyConnectorsActionTest
*
- * @version $Id$
+ *
*/
public class SortProxyConnectorsActionTest
extends AbstractWebworkTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
index 46622989c..15dd9f78c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
@@ -48,7 +48,7 @@ import org.junit.Test;
/**
* AddManagedRepositoryActionTest
*
- * @version $Id$
+ *
*/
public class AddManagedRepositoryActionTest
extends AbstractManagedRepositoryActionTest
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
index 5b279bacf..c51fd8bd8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
/**
* AddRemoteRepositoryActionTest
*
- * @version $Id$
+ *
*/
public class AddRemoteRepositoryActionTest
extends AbstractActionTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
index f38910b6b..33370b7b7 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.when;
/**
* DeleteManagedRepositoryActionTest
*
- * @version $Id$
+ *
*/
public class DeleteManagedRepositoryActionTest
extends AbstractActionTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
index f2e555cac..a0c2cde5c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
/**
* DeleteRemoteRepositoryActionTest
*
- * @version $Id$
+ *
*/
public class DeleteRemoteRepositoryActionTest
extends AbstractActionTestCase
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
index 8281c42c4..c5e062932 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
@@ -61,7 +61,7 @@ import org.junit.runner.RunWith;
/**
* EditManagedRepositoryActionTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class EditManagedRepositoryActionTest
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
index edf9d66b1..5208cd8fb 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith;
/**
* EditRemoteRepositoryActionTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class EditRemoteRepositoryActionTest
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
index 4844959a2..6f371aece 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
/**
* BannerTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class BannerTest
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java
index 838163379..2a21d22a0 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java
@@ -32,7 +32,7 @@ import org.junit.Before;
/**
* Abstract TestCase for RepositoryServlet Tests, Proxied, Get of Metadata.
*
- * @version $Id$
+ *
*/
public abstract class AbstractRepositoryServletProxiedMetadataTestCase
extends AbstractRepositoryServletProxiedTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
index 6a8864334..842a97dc3 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
@@ -43,7 +43,7 @@ import java.io.File;
/**
* AbstractRepositoryServletProxiedTestCase
*
- * @version $Id$
+ *
*/
public abstract class AbstractRepositoryServletProxiedTestCase
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index fe1cf8e10..ca3b58187 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -50,7 +50,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* AbstractRepositoryServletTestCase
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/repository-servlet-simple.xml" } )
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
index cd78dc0ea..38c3f743b 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Service;
* BypassSecuritySystem - used to bypass the security system for testing reasons and allow
* for every request to respond as success / true.
*
- * @version $Id$
+ *
*/
@Service("securitySystem#bypass")
public class BypassSecuritySystem
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java
index 0997b3c2b..f1b9dd54f 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java
@@ -31,7 +31,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* ArchivaMimeTypesTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
index 5f741acba..35830d3cf 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
@@ -32,7 +32,7 @@ import java.io.File;
/**
* RepositoryServletBrowseTest
*
- * @version $Id$
+ *
*/
public class RepositoryServletBrowseTest
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java
index 1bad73f90..0799bc5df 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
/**
* Deploy / Put Test cases for RepositoryServlet.
*
- * @version $Id$
+ *
*/
public class RepositoryServletDeployTest
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyMetadataTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyMetadataTest.java
index 3e1e13943..feaf0696e 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyMetadataTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyMetadataTest.java
@@ -30,7 +30,7 @@ import java.io.File;
/**
* RepositoryServletTest
*
- * @version $Id$
+ *
*/
public class RepositoryServletNoProxyMetadataTest
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
index c94ac4a34..cb4ded8a6 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
/**
* RepositoryServletTest
*
- * @version $Id$
+ *
*/
public class RepositoryServletNoProxyTest
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java
index d467f5e6b..d099d1e17 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* RepositoryServlet Tests, Proxied, Get of Metadata, exists on local managed repository only.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedMetadataLocalOnlyTest
extends AbstractRepositoryServletProxiedMetadataTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java
index bb405b0b7..8d2e67d33 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* RepositoryServlet Tests, Proxied, Get of Metadata, exists on remote repository only.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedMetadataRemoteOnlyTest
extends AbstractRepositoryServletProxiedMetadataTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
index 4735b69a0..bedcfc563 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
/**
* RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedPluginSnapshotPolicyTest
extends AbstractRepositoryServletProxiedTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
index 007e75ca7..bcf58f21c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
/**
* RepositoryServlet Tests, Proxied, Get of Release Artifacts, with varying policy settings.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedReleasePolicyTest
extends AbstractRepositoryServletProxiedTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java
index 2e4ada243..267c60d36 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
/**
* RepositoryServlet Tests, Proxied, Get of Snapshot Artifacts, with varying policy settings.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedSnapshotPolicyTest
extends AbstractRepositoryServletProxiedTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
index edf732907..cb5ff4400 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java
@@ -35,7 +35,7 @@ import java.util.ArrayList;
/**
* RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings.
*
- * @version $Id$
+ *
*/
public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
extends AbstractRepositoryServletProxiedTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
index 473d2b65d..af6fd019d 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java
@@ -66,7 +66,7 @@ import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
* RepositoryServletSecurityTest Test the flow of the authentication and authorization checks. This does not necessarily
* perform redback security checking.
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
index 9fb384d85..ea287cfcd 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
@@ -33,7 +33,7 @@ import java.io.File;
/**
* RepositoryServletTest
*
- * @version $Id$
+ *
*/
public class RepositoryServletTest
extends AbstractRepositoryServletTestCase
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedRepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedRepositoryServlet.java
index f6929df50..a4c821b61 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedRepositoryServlet.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedRepositoryServlet.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletConfig;
/**
* UnauthenticatedRepositoryServlet
*
- * @version $Id$
+ *
*/
public class UnauthenticatedRepositoryServlet
extends RepositoryServlet
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
index d39059e7c..30d5f00f8 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
@@ -32,7 +32,7 @@ import java.util.TimeZone;
/**
* AuditEvent
*
- * @version $Id$
+ *
*/
public class AuditEvent
implements MetadataFacet
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditListener.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditListener.java
index 81d596fa9..6e64d6ed8 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditListener.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditListener.java
@@ -22,7 +22,7 @@ package org.apache.archiva.audit;
/**
* AuditListener
*
- * @version $Id$
+ *
*/
public interface AuditListener
{
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
index 18c7f2867..62af11d33 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditLog.java
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Service;
/**
* AuditLog - Audit Log.
*
- * @version $Id$
+ *
*
*/
@Service("auditListener#logging")
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
index 0f2f47958..3ac8bec1f 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/Auditable.java
@@ -22,7 +22,7 @@ package org.apache.archiva.audit;
/**
* Auditable
*
- * @version $Id$
+ *
*/
public interface Auditable
{
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
index db464700a..0d9540ec8 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
@@ -35,7 +35,7 @@ import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
/**
* RepositoryMetadataReaderTest
*
- * @version $Id$
+ *
*/
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
public class MavenRepositoryMetadataReaderTest
diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index e75b00afd..40ffbff22 100644
--- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -58,7 +58,7 @@ import java.util.List;
*
* TODO: no need for this to be a scanner - we can just query the database / content repository to get a full list
*
- * @version $Id$
+ *
*/
@Service( "knownRepositoryContentConsumer#duplicate-artifacts" )
@Scope( "prototype" )
--
2.39.5