From 31869b91d19f50f26052128d4a4afe9a2fb47970 Mon Sep 17 00:00:00 2001 From: Martin Schreier Date: Wed, 5 Jan 2022 18:12:45 +0100 Subject: [PATCH] Switching to new ehcache version --- archiva-modules/archiva-base/archiva-policies/pom.xml | 11 ----------- .../archiva-maven/archiva-maven-proxy/pom.xml | 2 +- .../archiva/maven/proxy/AbstractProxyTestCase.java | 3 --- archiva-modules/archiva-web/archiva-security/pom.xml | 2 +- .../apache/archiva/security/AbstractSecurityTest.java | 2 -- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 5 ----- .../webdav/AbstractRepositoryServletTestCase.java | 3 --- .../archiva/webdav/RepositoryServletSecurityTest.java | 3 --- pom.xml | 5 +++++ 10 files changed, 8 insertions(+), 30 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 5252b4aa0..59a7642af 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -81,17 +81,6 @@ org.springframework spring-context - - net.sf.ehcache - ehcache - test - - - commons-logging - commons-logging - - - org.apache.archiva archiva-storage-fs diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index 1e0ef5db9..611964236 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -135,7 +135,7 @@ - net.sf.ehcache + org.ehcache ehcache test diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java index 156f188ce..ae3589333 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/AbstractProxyTestCase.java @@ -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 ); } diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index e84139a5c..d2484a08e 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -255,7 +255,7 @@ - net.sf.ehcache + org.ehcache ehcache test diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java index d877c69f1..550745d20 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java @@ -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(); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 8f1a21620..44d6fa531 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -430,7 +430,7 @@ - net.sf.ehcache + org.ehcache ehcache runtime diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 747293b41..426d86e93 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -188,11 +188,6 @@ jakarta.inject jakarta.inject-api - - net.sf.ehcache - ehcache - runtime - org.apache.commons commons-lang3 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 de7351408..dd699581d 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 @@ -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(); - } 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 bba326e65..48ce7f04b 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 @@ -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 ); diff --git a/pom.xml b/pom.xml index 3885563fb..bb0fde3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -921,6 +921,11 @@ ${modelmapper.version} + + org.ehcache + ehcache + ${ehcache.version} + commons-codec commons-codec