Refactoring ehcache module

apache · Nov 18, 2019 · 6b54260 · 6b54260
1 parent d5a9a52
commit 6b54260
Show file tree

Hide file tree

Showing 9 changed files with 194 additions and 61 deletions.
diff --git a/pom.xml b/pom.xml
@@ -115,6 +115,18 @@
         <version>${log4j.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-slf4j-impl</artifactId>
+        <version>${log4j.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>${log4j.version}</version>
+        <scope>test</scope>
+      </dependency>
       <!-- spring -->
       <dependency>
         <groupId>org.springframework</groupId>

diff --git a/...ing-cache-api/src/main/java/org/apache/archiva/components/cache/factory/CacheFactory.java b/...ing-cache-api/src/main/java/org/apache/archiva/components/cache/factory/CacheFactory.java
@@ -40,6 +40,8 @@
  */
 public class CacheFactory
 {
+    public static final String PROP_FILE = "META-INF/archiva-cache.properties";
+
     static class CacheFactoryHolder
     {
         static CacheFactory instance = new CacheFactory( );
@@ -64,7 +66,7 @@ private CacheFactory( )
                 classLoader = ClassLoader.getSystemClassLoader( );
             }
 
-            Enumeration cachePropResources = classLoader.getResources( "META-INF/plexus-cache.properties" );
+            Enumeration cachePropResources = classLoader.getResources( PROP_FILE );
 
             if ( cachePropResources.hasMoreElements( ) )
             {

diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>2.7.5</version>
+      <version>2.10.6</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -67,6 +67,21 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jcl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>