mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 07:25:44 +01:00
update ehcache to version 2.5.1
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -431,7 +431,7 @@
|
|||||||
<servlet.version>2.5</servlet.version>
|
<servlet.version>2.5</servlet.version>
|
||||||
<guice.version>3.0</guice.version>
|
<guice.version>3.0</guice.version>
|
||||||
<jersey.version>1.11</jersey.version>
|
<jersey.version>1.11</jersey.version>
|
||||||
<ehcache.version>2.4.6</ehcache.version>
|
<ehcache.version>2.5.1</ehcache.version>
|
||||||
<freemarker.version>2.3.18</freemarker.version>
|
<freemarker.version>2.3.18</freemarker.version>
|
||||||
<jetty.version>7.5.4.v20111024</jetty.version>
|
<jetty.version>7.5.4.v20111024</jetty.version>
|
||||||
<logback.version>1.0.0</logback.version>
|
<logback.version>1.0.0</logback.version>
|
||||||
|
|||||||
@@ -71,6 +71,17 @@ public class EhCacheManager implements CacheManager
|
|||||||
new net.sf.ehcache.CacheManager(EhCacheManager.class.getResource(CONFIG));
|
new net.sf.ehcache.CacheManager(EhCacheManager.class.getResource(CONFIG));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This constructor is only for unit tests
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @param cacheManager
|
||||||
|
*/
|
||||||
|
public EhCacheManager(net.sf.ehcache.CacheManager cacheManager)
|
||||||
|
{
|
||||||
|
this.cacheManager = cacheManager;
|
||||||
|
}
|
||||||
|
|
||||||
//~--- methods --------------------------------------------------------------
|
//~--- methods --------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class EhCacheTest
|
|||||||
@Before
|
@Before
|
||||||
public void before()
|
public void before()
|
||||||
{
|
{
|
||||||
cm = new EhCacheManager();
|
cm = new EhCacheManager(net.sf.ehcache.CacheManager.create());
|
||||||
cache = cm.getCache(String.class, String.class, "test");
|
cache = cm.getCache(String.class, String.class, "test");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -283,7 +283,8 @@ public class ChainAuthenticationManagerTest extends AbstractTestBase
|
|||||||
//~--- fields ---------------------------------------------------------------
|
//~--- fields ---------------------------------------------------------------
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
private CacheManager cacheManager = new EhCacheManager();
|
private CacheManager cacheManager =
|
||||||
|
new EhCacheManager(net.sf.ehcache.CacheManager.create());
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
private ChainAuthenticatonManager manager;
|
private ChainAuthenticatonManager manager;
|
||||||
|
|||||||
Reference in New Issue
Block a user