remove @version $Id$

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1357910 13f79535-47bb-0310-9956-ffa450edef68

35 files changed, 33 insertions, 35 deletions

diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
index d76036806..562441da4 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
@@ -35,7 +35,7 @@ import org.apache.archiva.redback.integration.interceptor.SecureActionException;
  * AbstractSecurityAction
  * 
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public abstract class AbstractSecurityAction
     extends RedbackActionSupport
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
index 478a1825c..a7791efda 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractUserCredentialsAction.java
@@ -45,7 +45,7 @@ import java.util.Map;
  * AbstractUserCredentialsAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public abstract class AbstractUserCredentialsAction
     extends AbstractSecurityAction
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
index 9d7f80897..cf30f48ad 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
  * AccountAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-account" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
index b2242394e..ea6fade89 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
@@ -52,7 +52,7 @@ import java.util.Date;
  *
  * @author Jesse McConnell <jmcconnell@apache.org>
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-login" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
index e2daf81d9..7abd00a18 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
@@ -35,7 +35,7 @@ import javax.inject.Named;
  * LogoutAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-logout" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
index c913b77d4..5ac26e713 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * PasswordAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-password" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
index e686277c2..b6cdb4dbf 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordResetAction.java
@@ -41,7 +41,7 @@ import java.util.Arrays;
  * PasswordResetAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-password-reset" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
index 4615355cd..e35e02a27 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RegisterAction.java
@@ -42,7 +42,7 @@ import java.util.Arrays;
  * RegisterAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-register" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
index 0c7b84029..f21e0d2d2 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Controller;
  * SecurityRedirectAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-redirect" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
index eab88a148..5903a3e5b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
  * AbstractAdminUserCredentialsAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public abstract class AbstractAdminUserCredentialsAction
     extends AbstractUserCredentialsAction
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
index fe12f83f3..9173a1c16 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AddAdminUserAction.java
@@ -50,7 +50,7 @@ import java.util.Date;
  * AddAdminUserAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-admin-account" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
index 3af427c4d..f8242a7c3 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Controller;
  * AdminConsoleAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller("redback-admin-console")
 @Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
index 15bd4c5d7..74b7eff84 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
@@ -53,7 +53,7 @@ import java.util.Set;
  * AssignmentsAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller("redback-assignments")
 @Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
index 925ac0a74..77a6924e3 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
@@ -45,7 +45,7 @@ import java.util.Map;
  * EditRoleAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-role-edit" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
index 77d75de43..2253b5cf9 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
@@ -41,7 +41,7 @@ import java.util.List;
  * OperationsAction:
  *
  * @author Jesse McConnell <jmcconnell@apache.org>
- * @version $Id$
+ *
  */
 @Controller( "redback-operations" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
index 806036e21..8f5d0d156 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
@@ -43,7 +43,7 @@ import java.util.List;
  * PermissionsAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-permissions" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
index b413e1ba0..dc86e8e89 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Controller;
  * ReportAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller("redback-report")
 @Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
index 8ab53582d..bd3c6832e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
@@ -40,7 +40,7 @@ import java.util.List;
  * OperationsAction:
  *
  * @author Jesse McConnell <jmcconnell@apache.org>
- * @version $Id$
+ *
  */
 @Controller( "redback-resources" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
index 74bd8caa0..07d16aa3a 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
@@ -44,7 +44,7 @@ import java.util.List;
  * RoleCreateAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-role-create" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
index 282efe835..938236c1e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
@@ -35,7 +35,7 @@ import javax.inject.Inject;
  * RolesAction
  *
  * @author <a href="mailto:jmcconnell@apache.org">Jesse McConnell</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-role-model" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
index 414f70ee8..92272d0e9 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
@@ -37,7 +37,7 @@ import java.util.List;
  * RolesAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-roles" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
index 76422e894..4f67651eb 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
@@ -46,7 +46,7 @@ import java.util.Set;
  * SystemInfoAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-sysinfo" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
index 83d46b74b..158b5f963 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Controller;
  * UserCreateAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller("redback-admin-user-create")
 @Scope("prototype")
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
index 2f8d4e7a8..13a867d0e 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
@@ -45,7 +45,7 @@ import java.util.Arrays;
  * UserDeleteAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-admin-user-delete" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
index b50600291..b9728c9f5 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
@@ -54,7 +54,7 @@ import java.util.List;
  * UserEditAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-admin-user-edit" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
index 6ce6ef8ba..b50a97ab9 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * UserListAction
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redback-admin-user-list" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
index 53ebc174c..21ef7ea07 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
@@ -34,7 +34,7 @@ import com.opensymphony.xwork2.config.entities.PackageConfig;
  * AbstractXworkConfigurationCheck
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public class AbstractXworkConfigurationCheck
 {
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
index 583d13599..21472a33f 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
@@ -42,7 +42,7 @@ import com.opensymphony.xwork2.config.ConfigurationManager;
  * </p>
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  * 
  * TODO: Address comment below and add back in the component declaration
  *
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
index dd40493d8..28905f2de 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
@@ -36,7 +36,7 @@ import java.util.List;
  * EnvironmentCheckInterceptor
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redbackEnvironmentCheckInterceptor" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
index b77c04949..798087585 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
@@ -52,7 +52,7 @@ import java.util.Properties;
  * EnvironmentCheckInterceptor
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Controller( "redbackForceAdminUserInterceptor" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
index 5bd7e1df8..9454c963b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
@@ -47,7 +47,7 @@ import java.util.List;
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @author Jesse McConnell <jesse@codehaus.org>
- * @version $Id$
+ *
  */
 @Controller( "redbackSecureActionInterceptor" )
 @Scope( "prototype" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
index 0552dc4b3..3964ee168 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Controller;
  * SecurityExternalResult
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @SuppressWarnings( "serial" )
 @Controller( "securityExternalResult" )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
index 84d127944..1600451ea 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
@@ -30,7 +30,7 @@ import org.junit.runners.JUnit4;
  * SystemInfoActionTest
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @RunWith( JUnit4.class )
 public class SystemInfoActionTest
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
index f8c814c61..073769c13 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
@@ -32,7 +32,6 @@ import javax.inject.Named;
 /**
  *
  * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
- * @version $Id: CustomInterceptorTest.java 1310448 2012-04-06 16:23:16Z olamy $
  */
 @RunWith( SpringJUnit4ClassRunner.class )
 @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
index 049ef6ae3..8421e149b 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 
 /**
  * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
- * @version $Id: MockComponentImpl.java 1310448 2012-04-06 16:23:16Z olamy $
  */
 @Service
 public class MockComponentImpl