Skip to content
Permalink
Browse files
Refactoring ehcache module
  • Loading branch information
effrafax committed Nov 18, 2019
1 parent d5a9a52 commit 6b5426052c1a3021e5087a6f46008f0d380ac1c3
Showing 9 changed files with 194 additions and 61 deletions.
12 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>
@@ -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( ) )
{
@@ -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>

0 comments on commit 6b54260

Please sign in to comment.