@@ -81,17 +81,6 @@ | |||
<groupId>org.springframework</groupId> | |||
<artifactId>spring-context</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>test</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-storage-fs</artifactId> |
@@ -135,7 +135,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<groupId>org.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -18,7 +18,6 @@ package org.apache.archiva.maven.proxy; | |||
* under the License. | |||
*/ | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
@@ -188,8 +187,6 @@ public abstract class AbstractProxyTestCase | |||
delegate.setDelegate( wagonMock ); | |||
CacheManager.getInstance().clearAll(); | |||
log.info( "\n.\\ {}() \\._________________________________________\n", name ); | |||
} | |||
@@ -255,7 +255,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<groupId>org.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -20,7 +20,6 @@ package org.apache.archiva.security; | |||
*/ | |||
import junit.framework.TestCase; | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.redback.rbac.RBACManager; | |||
@@ -172,6 +171,5 @@ public abstract class AbstractSecurityTest | |||
} | |||
userAssignment.setRoleIds( new ArrayList( Arrays.asList( "guest" ) ) ); | |||
rbacManager.saveUserAssignment( userAssignment ); | |||
CacheManager.getInstance().clearAll(); | |||
} | |||
} |
@@ -430,7 +430,7 @@ | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<groupId>org.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> |
@@ -188,11 +188,6 @@ | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.commons</groupId> | |||
<artifactId>commons-lang3</artifactId> |
@@ -25,7 +25,6 @@ import com.gargoylesoftware.htmlunit.WebClient; | |||
import com.gargoylesoftware.htmlunit.WebRequest; | |||
import com.gargoylesoftware.htmlunit.WebResponse; | |||
import junit.framework.TestCase; | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
@@ -218,8 +217,6 @@ public abstract class AbstractRepositoryServletTestCase | |||
// } | |||
// } | |||
CacheManager.getInstance().clearAll(); | |||
} | |||
@@ -21,7 +21,6 @@ package org.apache.archiva.webdav; | |||
import junit.framework.TestCase; | |||
import net.sf.ehcache.CacheManager; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
@@ -159,8 +158,6 @@ public class RepositoryServletSecurityTest | |||
saveConfiguration( archivaConfiguration ); | |||
CacheManager.getInstance().clearAll(); | |||
servletAuth = mock( ServletAuthenticator.class ); | |||
@@ -921,6 +921,11 @@ | |||
<version>${modelmapper.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<version>${ehcache.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-codec</groupId> | |||
<artifactId>commons-codec</artifactId> |