one move for all remaining override annotation

26 files changed, 244 insertions, 0 deletions

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java
index 47ae4bf6e..9d23b7733 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java
@@ -29,6 +29,7 @@ import org.apache.archiva.webdav.util.RepositoryPathUtil;
 public class ArchivaDavLocatorFactory
     implements DavLocatorFactory
 {
+    @Override
     public DavResourceLocator createResourceLocator( String prefix, String href )
     {
         // build prefix string and remove all prefixes from the given href.
@@ -56,11 +57,13 @@ public class ArchivaDavLocatorFactory
         return new ArchivaDavResourceLocator( b.toString(), Text.unescape( href ), repository, this );
     }
 
+    @Override
     public DavResourceLocator createResourceLocator( String prefix, String workspacePath, String resourcePath )
     {
         return createResourceLocator( prefix, workspacePath, resourcePath, true );
     }
 
+    @Override
     public DavResourceLocator createResourceLocator( String prefix, String workspacePath, String path,
                                                      boolean isResourcePath )
     {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index f4061cb61..6961d2206 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -143,32 +143,38 @@ public class ArchivaDavResource
         this.principal = principal;
     }
 
+    @Override
     public String getComplianceClass()
     {
         return COMPLIANCE_CLASS;
     }
 
+    @Override
     public String getSupportedMethods()
     {
         return METHODS;
     }
 
+    @Override
     public boolean exists()
     {
         return localResource.exists();
     }
 
+    @Override
     public boolean isCollection()
     {
         return localResource.isDirectory();
     }
 
+    @Override
     public String getDisplayName()
     {
         String resPath = getResourcePath();
         return ( resPath != null ) ? Text.getName( resPath ) : resPath;
     }
 
+    @Override
     public DavResourceLocator getLocator()
     {
         return locator;
@@ -179,21 +185,25 @@ public class ArchivaDavResource
         return localResource;
     }
 
+    @Override
     public String getResourcePath()
     {
         return locator.getResourcePath();
     }
 
+    @Override
     public String getHref()
     {
         return locator.getHref( isCollection() );
     }
 
+    @Override
     public long getModificationTime()
     {
         return localResource.lastModified();
     }
 
+    @Override
     public void spool( OutputContext outputContext )
         throws IOException
     {
@@ -237,26 +247,31 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public DavPropertyName[] getPropertyNames()
     {
         return getProperties().getPropertyNames();
     }
 
+    @Override
     public DavProperty getProperty( DavPropertyName name )
     {
         return getProperties().get( name );
     }
 
+    @Override
     public DavPropertySet getProperties()
     {
         return initProperties();
     }
 
+    @Override
     public void setProperty( DavProperty property )
         throws DavException
     {
     }
 
+    @Override
     public void removeProperty( DavPropertyName propertyName )
         throws DavException
     {
@@ -269,12 +284,14 @@ public class ArchivaDavResource
     }
 
     @SuppressWarnings ("unchecked")
+    @Override
     public MultiStatusResponse alterProperties( List changeList )
         throws DavException
     {
         return null;
     }
 
+    @Override
     public DavResource getCollection()
     {
         DavResource parent = null;
@@ -299,6 +316,7 @@ public class ArchivaDavResource
         return parent;
     }
 
+    @Override
     public void addMember( DavResource resource, InputContext inputContext )
         throws DavException
     {
@@ -359,6 +377,7 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public DavResourceIterator getMembers()
     {
         List<DavResource> list = new ArrayList<>();
@@ -391,6 +410,7 @@ public class ArchivaDavResource
         return new DavResourceIteratorImpl( list );
     }
 
+    @Override
     public void removeMember( DavResource member )
         throws DavException
     {
@@ -449,6 +469,7 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public void move( DavResource destination )
         throws DavException
     {
@@ -483,6 +504,7 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public void copy( DavResource destination, boolean shallow )
         throws DavException
     {
@@ -522,16 +544,19 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public boolean isLockable( Type type, Scope scope )
     {
         return Type.WRITE.equals( type ) && Scope.EXCLUSIVE.equals( scope );
     }
 
+    @Override
     public boolean hasLock( Type type, Scope scope )
     {
         return getLock( type, scope ) != null;
     }
 
+    @Override
     public ActiveLock getLock( Type type, Scope scope )
     {
         ActiveLock lock = null;
@@ -542,12 +567,14 @@ public class ArchivaDavResource
         return lock;
     }
 
+    @Override
     public ActiveLock[] getLocks()
     {
         ActiveLock writeLock = getLock( Type.WRITE, Scope.EXCLUSIVE );
         return ( writeLock != null ) ? new ActiveLock[]{ writeLock } : new ActiveLock[0];
     }
 
+    @Override
     public ActiveLock lock( LockInfo lockInfo )
         throws DavException
     {
@@ -563,6 +590,7 @@ public class ArchivaDavResource
         return lock;
     }
 
+    @Override
     public ActiveLock refreshLock( LockInfo lockInfo, String lockToken )
         throws DavException
     {
@@ -582,6 +610,7 @@ public class ArchivaDavResource
         return lock;
     }
 
+    @Override
     public void unlock( String lockToken )
         throws DavException
     {
@@ -600,16 +629,19 @@ public class ArchivaDavResource
         }
     }
 
+    @Override
     public void addLockManager( LockManager lockManager )
     {
         this.lockManager = lockManager;
     }
 
+    @Override
     public DavResourceFactory getFactory()
     {
         return factory;
     }
 
+    @Override
     public DavSession getSession()
     {
         return session;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
index 070d93687..b252fe302 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
@@ -209,6 +209,7 @@ public class ArchivaDavResourceFactory
         // no op
     }
 
+    @Override
     public DavResource createResource( final DavResourceLocator locator, final DavServletRequest request,
                                        final DavServletResponse response )
         throws DavException
@@ -718,6 +719,7 @@ public class ArchivaDavResourceFactory
         return resource;
     }
 
+    @Override
     public DavResource createResource( final DavResourceLocator locator, final DavSession davSession )
         throws DavException
     {
@@ -840,16 +842,19 @@ public class ArchivaDavResourceFactory
         }
     }
 
+    @Override
     public void addAuditListener( AuditListener listener )
     {
         this.auditListeners.add( listener );
     }
 
+    @Override
     public void clearAuditListeners()
     {
         this.auditListeners.clear();
     }
 
+    @Override
     public void removeAuditListener( AuditListener listener )
     {
         this.auditListeners.remove( listener );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java
index 3c7d34573..c1be855cd 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java
@@ -78,41 +78,49 @@ public class ArchivaDavResourceLocator
         this.resourcePath = path;
     }
 
+    @Override
     public String getRepositoryId()
     {
         return repositoryId;
     }
 
+    @Override
     public String getPrefix()
     {
         return prefix;
     }
 
+    @Override
     public String getResourcePath()
     {
         return resourcePath;
     }
 
+    @Override
     public String getWorkspacePath()
     {
         return "";
     }
 
+    @Override
     public String getWorkspaceName()
     {
         return "";
     }
 
+    @Override
     public boolean isSameWorkspace( DavResourceLocator locator )
     {
         return isSameWorkspace( locator.getWorkspaceName() );
     }
 
+    @Override
     public boolean isSameWorkspace( String workspaceName )
     {
         return getWorkspaceName().equals( workspaceName );
     }
 
+    @Override
     public String getHref( boolean isCollection )
     {
         // avoid doubled trailing '/' for the root item
@@ -120,16 +128,19 @@ public class ArchivaDavResourceLocator
         return href + suffix;
     }
 
+    @Override
     public boolean isRootLocation()
     {
         return "/".equals( resourcePath );
     }
 
+    @Override
     public DavLocatorFactory getFactory()
     {
         return davLocatorFactory;
     }
 
+    @Override
     public String getRepositoryPath()
     {
         return getResourcePath();
@@ -140,6 +151,7 @@ public class ArchivaDavResourceLocator
      *
      * @return the hash code
      */
+    @Override
     public int hashCode()
     {
         return href.hashCode();
@@ -152,6 +164,7 @@ public class ArchivaDavResourceLocator
      * @param obj the object to compare to
      * @return <code>true</code> if the 2 objects are equal; <code>false</code> otherwise
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( obj instanceof DavResourceLocator )
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java
index f0521e78c..ecab3d869 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java
@@ -29,26 +29,31 @@ public class ArchivaDavSession
 {
     private final Set<String> lockTokens = new HashSet<String>();
 
+    @Override
     public void addLockToken( String token )
     {
         lockTokens.add( token );
     }
 
+    @Override
     public String[] getLockTokens()
     {
         return lockTokens.toArray( new String[lockTokens.size()] );
     }
 
+    @Override
     public void removeLockToken( String token )
     {
         lockTokens.remove( token );
     }
 
+    @Override
     public void removeReference( Object reference )
     {
         throw new UnsupportedOperationException( "Not supported yet." );
     }
 
+    @Override
     public void addReference( Object reference )
     {
         throw new UnsupportedOperationException( "Not supported yet." );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java
index 3735e4119..ac1554335 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java
@@ -49,6 +49,7 @@ public class ArchivaDavSessionProvider
         this.httpAuth = httpAuth;
     }
 
+    @Override
     public boolean attachSession( WebdavRequest request )
         throws DavException
     {
@@ -95,6 +96,7 @@ public class ArchivaDavSessionProvider
         }
     }
 
+    @Override
     public void releaseSession( WebdavRequest request )
     {
         request.setDavSession( null );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java
index c84dc7b49..cb81e8561 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java
@@ -84,6 +84,7 @@ public class ArchivaVirtualDavResource
         this.properties = new DavPropertySet();
     }
 
+    @Override
     public void spool( OutputContext outputContext )
         throws IOException
     {
@@ -105,11 +106,13 @@ public class ArchivaVirtualDavResource
         }
     }
 
+    @Override
     public void addLockManager( LockManager arg0 )
     {
 
     }
 
+    @Override
     public void addMember( DavResource arg0, InputContext arg1 )
         throws DavException
     {
@@ -117,6 +120,7 @@ public class ArchivaVirtualDavResource
     }
 
     @SuppressWarnings( "unchecked" )
+    @Override
     public MultiStatusResponse alterProperties( List arg0 )
         throws DavException
     {
@@ -129,113 +133,134 @@ public class ArchivaVirtualDavResource
         return null;
     }
 
+    @Override
     public void copy( DavResource arg0, boolean arg1 )
         throws DavException
     {
 
     }
 
+    @Override
     public boolean exists()
     {
         // localResources are already filtered (all files in the list are already existing)
         return true;
     }
 
+    @Override
     public ActiveLock getLock( Type arg0, Scope arg1 )
     {
         return null;
     }
 
+    @Override
     public ActiveLock[] getLocks()
     {
         return null;
     }
 
+    @Override
     public DavResourceIterator getMembers()
     {
         return null;
     }
 
+    @Override
     public String getSupportedMethods()
     {
         return METHODS;
     }
 
+    @Override
     public long getModificationTime()
     {
         return 0;
     }
 
+    @Override
     public boolean hasLock( Type arg0, Scope arg1 )
     {
         return false;
     }
 
+    @Override
     public boolean isCollection()
     {
         return true;
     }
 
+    @Override
     public boolean isLockable( Type arg0, Scope arg1 )
     {
         return false;
     }
 
+    @Override
     public ActiveLock lock( LockInfo arg0 )
         throws DavException
     {
         return null;
     }
 
+    @Override
     public void move( DavResource arg0 )
         throws DavException
     {
 
     }
 
+    @Override
     public ActiveLock refreshLock( LockInfo arg0, String arg1 )
         throws DavException
     {
         return null;
     }
 
+    @Override
     public void removeMember( DavResource arg0 )
         throws DavException
     {
 
     }
 
+    @Override
     public void unlock( String arg0 )
         throws DavException
     {
 
     }
 
+    @Override
     public String getComplianceClass()
     {
         return COMPLIANCE_CLASS;
     }
 
+    @Override
     public DavResourceLocator getLocator()
     {
         return locator;
     }
 
+    @Override
     public String getResourcePath()
     {
         return locator.getResourcePath();
     }
 
+    @Override
     public String getHref()
     {
         return locator.getHref( isCollection() );
     }
 
+    @Override
     public DavResourceFactory getFactory()
     {
         return factory;
     }
 
+    @Override
     public String getDisplayName()
     {
         String resPath = getResourcePath();
@@ -243,38 +268,45 @@ public class ArchivaVirtualDavResource
         return ( resPath != null ) ? Text.getName( resPath ) : resPath;
     }
 
+    @Override
     public DavSession getSession()
     {
         return null;
     }
 
+    @Override
     public DavPropertyName[] getPropertyNames()
     {
         return getProperties().getPropertyNames();
     }
 
+    @Override
     public DavProperty getProperty( DavPropertyName name )
     {
         initProperties();
         return properties.get( name );
     }
 
+    @Override
     public DavPropertySet getProperties()
     {
         initProperties();
         return properties;
     }
 
+    @Override
     public void setProperty( DavProperty property )
         throws DavException
     {
     }
 
+    @Override
     public void removeProperty( DavPropertyName propertyName )
         throws DavException
     {
     }
 
+    @Override
     public DavResource getCollection()
     {
         DavResource parent = null;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
index 5e31dffcd..4b43a6037 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java
@@ -76,6 +76,7 @@ public class RepositoryServlet
 
     private final Object reloadLock = new Object();
 
+    @Override
     public void init( ServletConfig servletConfig )
         throws ServletException
     {
@@ -211,6 +212,7 @@ public class RepositoryServlet
         log.info( "initServers done in {} ms", (end - start) );
     }
 
+    @Override
     public void configurationEvent( ConfigurationEvent event )
     {
         if ( event.getType() == ConfigurationEvent.SAVED )
@@ -257,6 +259,7 @@ public class RepositoryServlet
         return configuration;
     }
 
+    @Override
     protected boolean isPreconditionValid( final WebdavRequest request, final DavResource davResource )
     {
         // check for read or write access to the resource when resource-based permission is implemented
@@ -264,36 +267,43 @@ public class RepositoryServlet
         return true;
     }
 
+    @Override
     public DavSessionProvider getDavSessionProvider()
     {
         return sessionProvider;
     }
 
+    @Override
     public void setDavSessionProvider( final DavSessionProvider davSessionProvider )
     {
         this.sessionProvider = davSessionProvider;
     }
 
+    @Override
     public DavLocatorFactory getLocatorFactory()
     {
         return locatorFactory;
     }
 
+    @Override
     public void setLocatorFactory( final DavLocatorFactory davLocatorFactory )
     {
         locatorFactory = davLocatorFactory;
     }
 
+    @Override
     public DavResourceFactory getResourceFactory()
     {
         return resourceFactory;
     }
 
+    @Override
     public void setResourceFactory( final DavResourceFactory davResourceFactory )
     {
         resourceFactory = davResourceFactory;
     }
 
+    @Override
     public String getAuthenticateHeaderValue()
     {
         throw new UnsupportedOperationException();
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java
index 450044876..8571821d6 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/TemporaryGroupIndexSessionCleaner.java
@@ -47,6 +47,7 @@ public class TemporaryGroupIndexSessionCleaner
 
     public static final String TEMPORARY_INDEX_SESSION_KEY = TemporaryGroupIndexSessionCleaner.class.getName();
 
+    @Override
     public void sessionCreated( HttpSessionEvent httpSessionEvent )
     {
         // ensure the map is here to avoid NPE
@@ -64,6 +65,7 @@ public class TemporaryGroupIndexSessionCleaner
         }
     }
 
+    @Override
     public void sessionDestroyed( HttpSessionEvent httpSessionEvent )
     {
         Map<String, TemporaryGroupIndex> tempFilesPerKey =
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
index 8fe7a6c29..fc30e0d51 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
@@ -34,156 +34,186 @@ import java.util.List;
 public class TestMetadataRepository
     implements MetadataRepository
 {
+    @Override
     public ProjectMetadata getProject( String repoId, String namespace, String projectId )
     {
         return null;
     }
 
+    @Override
     public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
                                                      String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getArtifactVersions( String repoId, String namespace, String projectId,
                                                    String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<ProjectVersionReference> getProjectReferences( String repoId, String namespace, String projectId,
                                                                      String projectVersion )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getRootNamespaces( String repoId )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getNamespaces( String repoId, String namespace )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getProjects( String repoId, String namespace )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getProjectVersions( String repoId, String namespace, String projectId )
     {
         return null;
     }
 
+    @Override
     public void updateProject( String repoId, ProjectMetadata project )
     {
     }
 
+    @Override
     public void updateArtifact( String repoId, String namespace, String projectId, String projectVersion,
                                 ArtifactMetadata artifactMeta )
     {
 
     }
 
+    @Override
     public void updateProjectVersion( String repoId, String namespace, String projectId,
                                       ProjectVersionMetadata versionMetadata )
     {
 
     }
 
+    @Override
     public void updateNamespace( String repoId, String namespace )
     {
 
     }
 
+    @Override
     public List<String> getMetadataFacets( String repodId, String facetId )
     {
         return Collections.emptyList();
     }
 
+    @Override
     public MetadataFacet getMetadataFacet( String repositoryId, String facetId, String name )
     {
         return null;
     }
 
+    @Override
     public void addMetadataFacet( String repositoryId, MetadataFacet metadataFacet )
     {
 
     }
 
+    @Override
     public void removeMetadataFacets( String repositoryId, String facetId )
     {
 
     }
 
+    @Override
     public void removeMetadataFacet( String repoId, String facetId, String name )
     {
 
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifactsByDateRange( String repoId, Date startTime, Date endTime )
     {
         return null;
     }
 
+    @Override
     public Collection<String> getRepositories()
     {
         return null;
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifactsByChecksum( String repoId, String checksum )
     {
         return null;
     }
 
+    @Override
     public void removeArtifact( String repositoryId, String namespace, String project, String version, String id )
     {
 
     }
 
+    @Override
     public void removeRepository( String repoId )
     {
 
     }
 
+    @Override
     public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId,
                                                       String projectVersion )
     {
         return null;
     }
 
+    @Override
     public void save()
     {
 
     }
 
+    @Override
     public void close()
     {
 
     }
 
+    @Override
     public void revert()
     {
 
     }
 
+    @Override
     public boolean canObtainAccess( Class<?> aClass )
     {
         return false;
     }
 
+    @Override
     public <T>T obtainAccess( Class<T> aClass )
     {
         return null;
     }
 
+    @Override
     public List<ArtifactMetadata> getArtifacts( String repositoryId )
     {
         return null;
     }
 
+    @Override
     public void removeArtifact( String repositoryId, String namespace, String project, String version,
                                 MetadataFacet metadataFacet )
         throws MetadataRepositoryException
@@ -191,30 +221,35 @@ public class TestMetadataRepository
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeArtifact( ArtifactMetadata artifactMetadata, String baseVersion )
         throws MetadataRepositoryException
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeNamespace( String repositoryId, String namespace )
         throws MetadataRepositoryException
     {
 
     }
 
+    @Override
     public void removeProjectVersion( String repoId, String namespace, String projectId, String projectVersion )
         throws MetadataRepositoryException
     {
 
     }
 
+    @Override
     public void removeProject( String repositoryId, String namespace, String projectId )
         throws MetadataRepositoryException
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean hasMetadataFacet( String repositoryId, String facetId )
         throws MetadataRepositoryException
     {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
index 93a4e5ce5..03be76a86 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
@@ -27,6 +27,7 @@ public class TestRepositorySessionFactory
 {
     private MetadataResolver resolver;
 
+    @Override
     public RepositorySession createSession()
     {
         return new RepositorySession( new TestMetadataRepository(), resolver );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java
index 0734e2cd3..b58cee62e 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/repository/audit/TestAuditListener.java
@@ -35,6 +35,7 @@ public class TestAuditListener
 
     private List<AuditEvent> events = new ArrayList<>();
 
+    @Override
     public void auditEvent( AuditEvent event )
     {
         events.add( event );
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 a80a1b85c..58ce852a3 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
@@ -243,6 +243,7 @@ public abstract class AbstractRepositoryServletProxiedMetadataTestCase
 //    }
 
     @Before
+    @Override
     public void tearDown()
         throws Exception
     {
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 9fea3a979..311a83f34 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
@@ -111,6 +111,7 @@ public abstract class AbstractRepositoryServletTestCase
     }
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -569,6 +570,7 @@ public abstract class AbstractRepositoryServletTestCase
     {
         MockHttpServletResponse response = new MockHttpServletResponse()
         {
+            @Override
             public String getContentAsString()
                 throws UnsupportedEncodingException
             {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
index 5290a9f1a..ddd0c087c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
@@ -121,6 +121,7 @@ public class ArchivaDavResourceFactoryTest
 
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -206,6 +207,7 @@ public class ArchivaDavResourceFactoryTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
@@ -617,6 +619,7 @@ public class ArchivaDavResourceFactoryTest
             super( applicationContext, plexusSisuBridge, archivaConfiguration );
         }
 
+        @Override
         protected boolean isAuthorized( DavServletRequest request, String repositoryId )
             throws DavException
         {
@@ -631,6 +634,7 @@ public class ArchivaDavResourceFactoryTest
             }
         }
 
+        @Override
         protected String getActivePrincipal( DavServletRequest request )
         {
             return "guest";
@@ -640,6 +644,7 @@ public class ArchivaDavResourceFactoryTest
     class OverridingRepositoryProxyConnectors
         extends DefaultRepositoryProxyConnectors
     {
+        @Override
         public File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath )
         {
             File target = new File( repository.getRepoRoot(), logicalPath );
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java
index 52d4c3731..b657c082b 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java
@@ -105,215 +105,256 @@ public class ArchivaDavSessionProviderTest
         implements HttpServletRequest
     {
 
+        @Override
         public boolean authenticate( HttpServletResponse httpServletResponse )
             throws IOException, ServletException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public void login( String s, String s1 )
             throws ServletException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public void logout()
             throws ServletException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Collection<Part> getParts()
             throws IOException, ServletException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Part getPart( String s )
             throws IOException, ServletException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public ServletContext getServletContext()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public AsyncContext startAsync()
             throws IllegalStateException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public AsyncContext startAsync( ServletRequest servletRequest, ServletResponse servletResponse )
             throws IllegalStateException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isAsyncStarted()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isAsyncSupported()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public AsyncContext getAsyncContext()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public DispatcherType getDispatcherType()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Object getAttribute( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Enumeration getAttributeNames()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getCharacterEncoding()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public int getContentLength()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getContentType()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public ServletInputStream getInputStream()
             throws IOException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getLocalAddr()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getLocalName()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public int getLocalPort()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Locale getLocale()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Enumeration getLocales()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getParameter( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Map getParameterMap()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Enumeration getParameterNames()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String[] getParameterValues( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getProtocol()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public BufferedReader getReader()
             throws IOException
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRealPath( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRemoteAddr()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRemoteHost()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public int getRemotePort()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public RequestDispatcher getRequestDispatcher( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getScheme()
         {
             return "";
         }
 
+        @Override
         public String getServerName()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public int getServerPort()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isSecure()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public void removeAttribute( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public void setAttribute( String arg0, Object arg1 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public void setCharacterEncoding( String arg0 )
             throws UnsupportedEncodingException
         {
@@ -321,126 +362,151 @@ public class ArchivaDavSessionProviderTest
         }
 
 
+        @Override
         public String getAuthType()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getContextPath()
         {
             return "/";
         }
 
+        @Override
         public Cookie[] getCookies()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public long getDateHeader( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getHeader( String arg0 )
         {
             return "";
         }
 
+        @Override
         public Enumeration getHeaderNames()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Enumeration getHeaders( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public int getIntHeader( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getMethod()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getPathInfo()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getPathTranslated()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getQueryString()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRemoteUser()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRequestURI()
         {
             return "/";
         }
 
+        @Override
         public StringBuffer getRequestURL()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getRequestedSessionId()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public String getServletPath()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public HttpSession getSession( boolean arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public HttpSession getSession()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public Principal getUserPrincipal()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isRequestedSessionIdFromCookie()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isRequestedSessionIdFromURL()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isRequestedSessionIdFromUrl()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isRequestedSessionIdValid()
         {
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public boolean isUserInRole( String arg0 )
         {
             throw new UnsupportedOperationException( "Not supported yet." );
@@ -450,12 +516,14 @@ public class ArchivaDavSessionProviderTest
     private class ServletAuthenticatorMock
         implements ServletAuthenticator
     {
+        @Override
         public boolean isAuthenticated( HttpServletRequest arg0, AuthenticationResult arg1 )
             throws AuthenticationException, AccountLockedException, MustChangePasswordException
         {
             return true;
         }
 
+        @Override
         public boolean isAuthorized( HttpServletRequest request, SecuritySession securitySession, String repositoryId,
                                      String permission )
             throws AuthorizationException, UnauthorizedException
@@ -463,6 +531,7 @@ public class ArchivaDavSessionProviderTest
             return true;
         }
 
+        @Override
         public boolean isAuthorized( String principal, String repoId, String permission )
             throws UnauthorizedException
         {
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 7eefdd65e..a8587718b 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
@@ -60,6 +60,7 @@ public class BypassSecuritySystem
         bypassUserManager = new MemoryUserManager();
     }
     
+    @Override
     public SecuritySession authenticate( AuthenticationDataSource source )
         throws AuthenticationException, UserNotFoundException, AccountLockedException
     {
@@ -67,48 +68,57 @@ public class BypassSecuritySystem
         return new DefaultSecuritySession( result );
     }
 
+    @Override
     public AuthorizationResult authorize( SecuritySession session, String permission )
         throws AuthorizationException
     {
         return new AuthorizationResult( true, session.getUser(), null );
     }
 
+    @Override
     public AuthorizationResult authorize( SecuritySession session, String permission, String resource )
         throws AuthorizationException
     {
         return new AuthorizationResult( true, session.getUser(), null );
     }
 
+    @Override
     public String getAuthenticatorId()
     {
         return "bypass-authenticator";
     }
 
+    @Override
     public String getAuthorizerId()
     {
         return "bypass-authorizer";
     }
 
+    @Override
     public KeyManager getKeyManager()
     {
         return bypassKeyManager;
     }
 
+    @Override
     public UserSecurityPolicy getPolicy()
     {
         return bypassPolicy;
     }
 
+    @Override
     public String getUserManagementId()
     {
         return "bypass-managementid";
     }
 
+    @Override
     public UserManager getUserManager()
     {
         return bypassUserManager;
     }
 
+    @Override
     public boolean isAuthenticated( AuthenticationDataSource source )
         throws AuthenticationException, UserNotFoundException, AccountLockedException
     {
@@ -116,6 +126,7 @@ public class BypassSecuritySystem
         return true;
     }
 
+    @Override
     public boolean isAuthorized( SecuritySession session, String permission )
         throws AuthorizationException
     {
@@ -123,6 +134,7 @@ public class BypassSecuritySystem
         return true;
     }
 
+    @Override
     public boolean isAuthorized( SecuritySession session, String permission, String resource )
         throws AuthorizationException
     {
@@ -130,6 +142,7 @@ public class BypassSecuritySystem
         return true;
     }
 
+    @Override
     public boolean userManagerReadOnly()
     {
         return true;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
index f0d6deb9f..e8e8b63a8 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
@@ -99,6 +99,7 @@ public class DavResourceTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
@@ -316,6 +317,7 @@ public class DavResourceTest
     private class RootContextDavResourceFactory
         implements DavResourceFactory
     {
+        @Override
         public DavResource createResource( DavResourceLocator locator, DavServletRequest request,
                                            DavServletResponse response )
             throws DavException
@@ -323,6 +325,7 @@ public class DavResourceTest
             throw new UnsupportedOperationException( "Not supported yet." );
         }
 
+        @Override
         public DavResource createResource( DavResourceLocator locator, DavSession session )
             throws DavException
         {
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 121b4e170..e183c0753 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
@@ -41,6 +41,7 @@ public class RepositoryServletNoProxyTest
 {
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
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 d099d1e17..9b0654b7c 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
@@ -40,6 +40,7 @@ public class RepositoryServletProxiedMetadataLocalOnlyTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
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 8d2e67d33..dd5da4535 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
@@ -41,6 +41,7 @@ public class RepositoryServletProxiedMetadataRemoteOnlyTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java
index 500727c9b..af3204016 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java
@@ -53,6 +53,7 @@ public class RepositoryServletProxiedPassthroughTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
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 9267086da..72d1328c7 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
@@ -41,6 +41,7 @@ public class RepositoryServletProxiedSnapshotPolicyTest
 {
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -50,6 +51,7 @@ public class RepositoryServletProxiedSnapshotPolicyTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
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 7e7a78396..0c3219de9 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
@@ -48,6 +48,7 @@ public class RepositoryServletProxiedTimestampedSnapshotPolicyTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
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 507d7bebd..e040e000a 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
@@ -107,6 +107,7 @@ public class RepositoryServletSecurityTest
     ApplicationContext applicationContext;
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
index 57037fd5f..079828fbe 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
@@ -65,6 +65,7 @@ public class MavenIndexerCleaner
     }
 
 
+    @Override
     public void contextInitialized( ServletContextEvent servletContextEvent )
     {
         try
@@ -82,6 +83,7 @@ public class MavenIndexerCleaner
         }
     }
 
+    @Override
     public void contextDestroyed( ServletContextEvent servletContextEvent )
     {
         try