From 0edb0a75ef0ed73ff9bb3267520bae5b79885e1c Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 22 Nov 2013 03:38:58 +0000
Subject: [PATCH] use last ehcache 2.7.4

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1544405 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-base/archiva-policies/pom.xml           |  2 +-
 .../src/main/resources/META-INF/spring-context.xml  |  1 -
 archiva-modules/archiva-web/archiva-webapp/pom.xml  |  2 +-
 .../src/main/webapp/WEB-INF/applicationContext.xml  | 13 +++++++++++++
 pom.xml                                             |  8 ++++----
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 632d9a3d3..648ea823d 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index 71a6db2d9..30fd74acc 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -50,7 +50,6 @@
 
     <jaxrs:providers>
       <ref bean="jsonProvider"/>
-
       <ref bean="authenticationInterceptor#rest"/>
       <ref bean="permissionInterceptor#rest"/>
       <ref bean="archivaRestServiceExceptionMapper"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index bef5f7150..0c380db43 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -663,7 +663,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 2dc48280b..fc07339ff 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -303,4 +303,17 @@
   -->
   <!-- END SNIPPET: jcr-location -->
 
+  <!--
+
+  <bean class="org.apache.sirona.spring.BeanNameMonitoringAutoProxyCreator">
+    <property name="beanNames">
+      <list>
+        <value>Default**</value>
+        <value>**#rest</value>
+        <value>**#default</value>
+      </list>
+    </property>
+  </bean>
+  -->
+
 </beans>
diff --git a/pom.xml b/pom.xml
index 1b2c7e12c..58c25c9f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     <maven.indexer.version>5.1.1</maven.indexer.version>
     <wagon.version>2.5</wagon.version>
     <redback.version>2.2-SNAPSHOT</redback.version>
-    <redback.cache.version>2.1</redback.cache.version>
+    <redback.cache.version>2.2-SNAPSHOT</redback.cache.version>
     <redback.quartz.version>2.0</redback.quartz.version>
     <redback.registry.version>2.1</redback.registry.version>
     <redback.spring-utils.version>2.0</redback.spring-utils.version>
@@ -1498,8 +1498,8 @@
 
       <dependency>
         <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-core</artifactId>
-        <version>2.6.6</version>
+        <artifactId>ehcache</artifactId>
+        <version>2.7.4</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -1601,7 +1601,7 @@
                     <exclude>com.google.code.atinject:atinject</exclude>
                     <exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude>
                     <exclude>org.codehaus.plexus.cache:plexus-cache-ehcache</exclude>
-                    <exclude>net.sf.ehcache:ehcache</exclude>
+                    <exclude>net.sf.ehcache:ehcache-core</exclude>
                     <exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude>
                     <exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
                     <exclude>org.codehaus.plexus:plexus-taskqueue</exclude>
-- 
2.39.5