Return-Path: 
 <commits-return-11236-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B40B610843
	for <apmail-archiva-commits-archive@www.apache.org>;
 Fri, 22 Nov 2013 03:38:58 +0000 (UTC)
Received: (qmail 24436 invoked by uid 500); 22 Nov 2013 03:38:54 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 24360 invoked by uid 500); 22 Nov 2013 03:38:49 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 24352 invoked by uid 99); 22 Nov 2013 03:38:48 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Nov 2013 03:38:48 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Nov 2013 03:38:45 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 481E22388B1B;
	Fri, 22 Nov 2013 03:38:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1544402 - in /archiva/redback/redback-core/trunk: ./
 redback-keys/redback-keys-providers/redback-keys-cached/
 redback-rbac/redback-rbac-providers/redback-rbac-cached/
 redback-rbac/redback-rbac-providers/redback-rbac-ldap/ redback-users/red...
Date: Fri, 22 Nov 2013 03:38:24 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131122033824.481E22388B1B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: olamy
Date: Fri Nov 22 03:38:23 2013
New Revision: 1544402

URL: http://svn.apache.org/r1544402
Log:
upgrade ehcache version

Modified:
    archiva/redback/redback-core/trunk/pom.xml
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml

Modified: archiva/redback/redback-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Fri Nov 22 03:38:23 2013
@@ -332,17 +332,17 @@
       <dependency>
         <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-api</artifactId>
-        <version>2.1</version>
+        <version>2.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-ehcache</artifactId>
-        <version>2.1</version>
+        <version>2.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-core</artifactId>
-        <version>2.6.5</version>
+        <artifactId>ehcache</artifactId>
+        <version>2.7.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.redback.components</groupId>
@@ -761,7 +761,7 @@
                     <exclude>org.codehaus.plexus:plexus-jdo2</exclude>
                     <exclude>org.codehaus.plexus:plexus-apacheds</exclude>
                     <exclude>org.codehaus.plexus:plexus-velocity</exclude>
-                    <exclude>net.sf.ehcache:ehcache</exclude>
+                    <exclude>net.sf.ehcache:ehcache-core</exclude>
                     <exclude>velocity:velocity</exclude>
                     <exclude>stax:stax-api</exclude>
                   </excludes>

Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml Fri Nov 22 03:38:23 2013
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
     </dependency>    
     <dependency>
       <groupId>org.apache.archiva.redback</groupId>

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml Fri Nov 22 03:38:23 2013
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
     </dependency>     
     <dependency>
       <groupId>org.springframework</groupId>

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml Fri Nov 22 03:38:23 2013
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
     </dependency>     
     <dependency>
       <groupId>org.springframework</groupId>

Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml Fri Nov 22 03:38:23 2013
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
     </dependency>     
     <dependency>
       <groupId>org.springframework</groupId>