Merge pull request sakaiproject#1903 from bjones86/SAK-30483

SAK-30483 ehcache 2.6.6 no longer in maven repo
talk2viren · Mar 10, 2016 · 81fd8bd · 81fd8bd
2 parents 52d1ae5 + 51b8367
commit 81fd8bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -172,7 +172,7 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-core</artifactId>
-      <version>2.6.6</version>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -113,7 +113,7 @@
         <version>3.2.3</version>
         <scope>provided</scope>
       </dependency>
-      <!-- centralize the versions for distributed ehcache - MUST match ehcache-core 2.6.6 -->
+      <!-- centralize the versions for distributed ehcache -->
       <dependency>
         <groupId>org.terracotta</groupId>
         <artifactId>terracotta-toolkit-1.6-runtime</artifactId>
@@ -123,7 +123,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-terracotta</artifactId>
-        <version>2.6.6</version>
+        <version>${sakai.ehcache.version}</version>
         <scope>provided</scope>
       </dependency>
       <!-- Java 8 Maven Artifact -->

diff --git a/master/pom.xml b/master/pom.xml
@@ -88,7 +88,7 @@
     <sakai.commons-math.version>2.2</sakai.commons-math.version>
     <sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
     <sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
-    <sakai.ehcache.version>2.6.6</sakai.ehcache.version>
+    <sakai.ehcache.version>2.6.11</sakai.ehcache.version>
     <sakai.elasticsearch.version>1.7.2</sakai.elasticsearch.version>
     <sakai.hibernate.groupId>org.hibernate</sakai.hibernate.groupId>
     <sakai.hibernate.artifactId>hibernate-core</sakai.hibernate.artifactId>
@@ -570,7 +570,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>2.6.6</version>
+        <version>${sakai.ehcache.version}</version>
         <scope>provided</scope>
       </dependency>
       <!-- needed by Ehcache (and jackrabbit) -->