Index: course-management/cm-impl/hibernate-impl/hibernate/project.xml
===================================================================
--- course-management/cm-impl/hibernate-impl/hibernate/project.xml	(revision 22565)
+++ course-management/cm-impl/hibernate-impl/hibernate/project.xml	(working copy)
@@ -87,9 +87,9 @@
 		-->
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: course-management/cm-impl/hibernate-impl/hibernate/pom.xml
===================================================================
--- course-management/cm-impl/hibernate-impl/hibernate/pom.xml	(revision 22565)
+++ course-management/cm-impl/hibernate-impl/hibernate/pom.xml	(working copy)
@@ -97,9 +97,9 @@
 		-->
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+      <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: course-management/cm-impl/hibernate-impl/impl/project.xml
===================================================================
--- course-management/cm-impl/hibernate-impl/impl/project.xml	(revision 22565)
+++ course-management/cm-impl/hibernate-impl/impl/project.xml	(working copy)
@@ -134,9 +134,9 @@
 		-->
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: course-management/cm-impl/hibernate-impl/impl/pom.xml
===================================================================
--- course-management/cm-impl/hibernate-impl/impl/pom.xml	(revision 22565)
+++ course-management/cm-impl/hibernate-impl/impl/pom.xml	(working copy)
@@ -154,9 +154,9 @@
 		-->
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+		<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: course-management/cm-impl/.classpath
===================================================================
--- course-management/cm-impl/.classpath	(revision 22565)
+++ course-management/cm-impl/.classpath	(working copy)
@@ -20,7 +20,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.3.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/authz-api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/site-api"/>
Index: db/db-impl/pack/project.xml
===================================================================
--- db/db-impl/pack/project.xml	(revision 22565)
+++ db/db-impl/pack/project.xml	(working copy)
@@ -101,9 +101,9 @@
 		</dependency>
 	
 		<dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.2.4</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 			<properties>
 				<!-- deploy dependency jar to "shared", "common" or "server": use <war.bundle>true</war.bundle> to include in war -->
 				<deploy.target>shared</deploy.target>
Index: db/db-impl/pack/pom.xml
===================================================================
--- db/db-impl/pack/pom.xml	(revision 22565)
+++ db/db-impl/pack/pom.xml	(working copy)
@@ -85,9 +85,9 @@
     </dependency>
     <dependency>
       
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.2.4</version>
+      <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 <!--properties:  deploy.target: shared -->
       <scope>provided</scope>
     </dependency>
Index: gradebook/app/sakai-tool/pom.xml
===================================================================
--- gradebook/app/sakai-tool/pom.xml	(revision 22565)
+++ gradebook/app/sakai-tool/pom.xml	(working copy)
@@ -205,9 +205,9 @@
     </dependency>
     <dependency>
 
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: gradebook/app/project.xml
===================================================================
--- gradebook/app/project.xml	(revision 22565)
+++ gradebook/app/project.xml	(working copy)
@@ -166,9 +166,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: gradebook/app/standalone-app/pom.xml
===================================================================
--- gradebook/app/standalone-app/pom.xml	(revision 22565)
+++ gradebook/app/standalone-app/pom.xml	(working copy)
@@ -190,9 +190,9 @@
     </dependency>
     <dependency>
 
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: gradebook/app/business/pom.xml
===================================================================
--- gradebook/app/business/pom.xml	(revision 22565)
+++ gradebook/app/business/pom.xml	(working copy)
@@ -180,9 +180,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+      <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: gradebook/app/ui/pom.xml
===================================================================
--- gradebook/app/ui/pom.xml	(revision 22565)
+++ gradebook/app/ui/pom.xml	(working copy)
@@ -186,9 +186,9 @@
     </dependency>
     <dependency>
 
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: gradebook/service/impl/project.xml
===================================================================
--- gradebook/service/impl/project.xml	(revision 22565)
+++ gradebook/service/impl/project.xml	(working copy)
@@ -117,9 +117,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: gradebook/service/impl/pom.xml
===================================================================
--- gradebook/service/impl/pom.xml	(revision 22565)
+++ gradebook/service/impl/pom.xml	(working copy)
@@ -171,9 +171,9 @@
     </dependency>
     <dependency>
 
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: jobscheduler/scheduler-component-shared/project.xml
===================================================================
--- jobscheduler/scheduler-component-shared/project.xml	(revision 22565)
+++ jobscheduler/scheduler-component-shared/project.xml	(working copy)
@@ -104,9 +104,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>0.9</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: jobscheduler/scheduler-component-shared/pom.xml
===================================================================
--- jobscheduler/scheduler-component-shared/pom.xml	(revision 22565)
+++ jobscheduler/scheduler-component-shared/pom.xml	(working copy)
@@ -108,9 +108,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>0.9</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: master/project.properties
===================================================================
--- master/project.properties	(revision 22565)
+++ master/project.properties	(working copy)
@@ -40,3 +40,9 @@
 
 sakai.pluto.version=1.1.1
 
+# The Ehcache version we are using
+sakai.ehcache.groupId=net.sf.ehcache
+sakai.ehcache.artifactId=ehcache
+sakai.ehcache.version=1.2.4
+
+
Index: metaobj/metaobj-impl/component/project.xml
===================================================================
--- metaobj/metaobj-impl/component/project.xml	(revision 22565)
+++ metaobj/metaobj-impl/component/project.xml	(working copy)
@@ -122,9 +122,9 @@
       </dependency>
 
       <dependency>
-         <groupId>ehcache</groupId>
-         <artifactId>ehcache</artifactId>
-         <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
 
       <dependency>
Index: metaobj/metaobj-impl/component/pom.xml
===================================================================
--- metaobj/metaobj-impl/component/pom.xml	(revision 22565)
+++ metaobj/metaobj-impl/component/pom.xml	(working copy)
@@ -117,9 +117,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: metaobj/metaobj-impl/api-impl/project.xml
===================================================================
--- metaobj/metaobj-impl/api-impl/project.xml	(revision 22565)
+++ metaobj/metaobj-impl/api-impl/project.xml	(working copy)
@@ -152,9 +152,9 @@
       </dependency>
 
       <dependency>
-         <groupId>ehcache</groupId>
-         <artifactId>ehcache</artifactId>
-         <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
 
       <dependency>
Index: metaobj/metaobj-impl/api-impl/pom.xml
===================================================================
--- metaobj/metaobj-impl/api-impl/pom.xml	(revision 22565)
+++ metaobj/metaobj-impl/api-impl/pom.xml	(working copy)
@@ -169,9 +169,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: metaobj/metaobj-api/api/project.xml
===================================================================
--- metaobj/metaobj-api/api/project.xml	(revision 22565)
+++ metaobj/metaobj-api/api/project.xml	(working copy)
@@ -117,9 +117,9 @@
       </dependency>
 
       <dependency>
-         <groupId>ehcache</groupId>
-         <artifactId>ehcache</artifactId>
-         <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
 
       <dependency>
Index: metaobj/metaobj-api/api/pom.xml
===================================================================
--- metaobj/metaobj-api/api/pom.xml	(revision 22565)
+++ metaobj/metaobj-api/api/pom.xml	(working copy)
@@ -127,9 +127,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: metaobj/metaobj-tool/tool/project.xml
===================================================================
--- metaobj/metaobj-tool/tool/project.xml	(revision 22565)
+++ metaobj/metaobj-tool/tool/project.xml	(working copy)
@@ -122,9 +122,9 @@
       </dependency>
 
       <dependency>
-         <groupId>ehcache</groupId>
-         <artifactId>ehcache</artifactId>
-         <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
 
       <dependency>
Index: metaobj/metaobj-tool/tool/pom.xml
===================================================================
--- metaobj/metaobj-tool/tool/pom.xml	(revision 22565)
+++ metaobj/metaobj-tool/tool/pom.xml	(working copy)
@@ -113,9 +113,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: metaobj/metaobj-util/tool-lib/project.xml
===================================================================
--- metaobj/metaobj-util/tool-lib/project.xml	(revision 22565)
+++ metaobj/metaobj-util/tool-lib/project.xml	(working copy)
@@ -149,9 +149,9 @@
       </dependency>
 
       <dependency>
-         <groupId>ehcache</groupId>
-         <artifactId>ehcache</artifactId>
-         <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
 
       <dependency>
Index: metaobj/metaobj-util/tool-lib/pom.xml
===================================================================
--- metaobj/metaobj-util/tool-lib/pom.xml	(revision 22565)
+++ metaobj/metaobj-util/tool-lib/pom.xml	(working copy)
@@ -154,9 +154,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: msgcntr/.classpath
===================================================================
--- msgcntr/.classpath	(revision 22565)
+++ msgcntr/.classpath	(working copy)
@@ -17,7 +17,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.9.jar"/>
Index: osp/integration/component/.classpath
===================================================================
--- osp/integration/component/.classpath	(revision 22565)
+++ osp/integration/component/.classpath	(working copy)
@@ -33,7 +33,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/integration/component/project.xml
===================================================================
--- osp/integration/component/project.xml	(revision 22565)
+++ osp/integration/component/project.xml	(working copy)
@@ -152,9 +152,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/integration/component/pom.xml
===================================================================
--- osp/integration/component/pom.xml	(revision 22565)
+++ osp/integration/component/pom.xml	(working copy)
@@ -145,9 +145,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/integration/api-impl/.classpath
===================================================================
--- osp/integration/api-impl/.classpath	(revision 22565)
+++ osp/integration/api-impl/.classpath	(working copy)
@@ -33,7 +33,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/integration/api-impl/project.xml
===================================================================
--- osp/integration/api-impl/project.xml	(revision 22565)
+++ osp/integration/api-impl/project.xml	(working copy)
@@ -266,9 +266,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/integration/api-impl/pom.xml
===================================================================
--- osp/integration/api-impl/pom.xml	(revision 22565)
+++ osp/integration/api-impl/pom.xml	(working copy)
@@ -297,9 +297,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/integration/api/.classpath
===================================================================
--- osp/integration/api/.classpath	(revision 22565)
+++ osp/integration/api/.classpath	(working copy)
@@ -29,7 +29,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/integration/api/project.xml
===================================================================
--- osp/integration/api/project.xml	(revision 22565)
+++ osp/integration/api/project.xml	(working copy)
@@ -201,9 +201,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/integration/api/pom.xml
===================================================================
--- osp/integration/api/pom.xml	(revision 22565)
+++ osp/integration/api/pom.xml	(working copy)
@@ -228,9 +228,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/common/tool-lib/project.xml
===================================================================
--- osp/common/tool-lib/project.xml	(revision 22565)
+++ osp/common/tool-lib/project.xml	(working copy)
@@ -236,9 +236,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/common/tool-lib/pom.xml
===================================================================
--- osp/common/tool-lib/pom.xml	(revision 22565)
+++ osp/common/tool-lib/pom.xml	(working copy)
@@ -247,9 +247,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/common/component/.classpath
===================================================================
--- osp/common/component/.classpath	(revision 22565)
+++ osp/common/component/.classpath	(working copy)
@@ -33,7 +33,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/common/component/project.xml
===================================================================
--- osp/common/component/project.xml	(revision 22565)
+++ osp/common/component/project.xml	(working copy)
@@ -120,9 +120,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/common/component/pom.xml
===================================================================
--- osp/common/component/pom.xml	(revision 22565)
+++ osp/common/component/pom.xml	(working copy)
@@ -115,9 +115,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/common/api-impl/.classpath
===================================================================
--- osp/common/api-impl/.classpath	(revision 22565)
+++ osp/common/api-impl/.classpath	(working copy)
@@ -33,7 +33,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/common/api-impl/project.xml
===================================================================
--- osp/common/api-impl/project.xml	(revision 22565)
+++ osp/common/api-impl/project.xml	(working copy)
@@ -230,9 +230,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/common/api-impl/pom.xml
===================================================================
--- osp/common/api-impl/pom.xml	(revision 22565)
+++ osp/common/api-impl/pom.xml	(working copy)
@@ -260,9 +260,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/common/api/.classpath
===================================================================
--- osp/common/api/.classpath	(revision 22565)
+++ osp/common/api/.classpath	(working copy)
@@ -29,7 +29,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/common/api/project.xml
===================================================================
--- osp/common/api/project.xml	(revision 22565)
+++ osp/common/api/project.xml	(working copy)
@@ -171,9 +171,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/common/api/pom.xml
===================================================================
--- osp/common/api/pom.xml	(revision 22565)
+++ osp/common/api/pom.xml	(working copy)
@@ -196,9 +196,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/common/tool/project.xml
===================================================================
--- osp/common/tool/project.xml	(revision 22565)
+++ osp/common/tool/project.xml	(working copy)
@@ -199,9 +199,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/common/tool/pom.xml
===================================================================
--- osp/common/tool/pom.xml	(revision 22565)
+++ osp/common/tool/pom.xml	(working copy)
@@ -169,9 +169,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/migration/component/project.xml
===================================================================
--- osp/migration/component/project.xml	(revision 22565)
+++ osp/migration/component/project.xml	(working copy)
@@ -119,9 +119,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/migration/component/pom.xml
===================================================================
--- osp/migration/component/pom.xml	(revision 22565)
+++ osp/migration/component/pom.xml	(working copy)
@@ -115,9 +115,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/migration/api-impl/project.xml
===================================================================
--- osp/migration/api-impl/project.xml	(revision 22565)
+++ osp/migration/api-impl/project.xml	(working copy)
@@ -68,9 +68,9 @@
     </dependency>
 
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
 
     <dependency>
Index: osp/migration/api-impl/pom.xml
===================================================================
--- osp/migration/api-impl/pom.xml	(revision 22565)
+++ osp/migration/api-impl/pom.xml	(working copy)
@@ -78,9 +78,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/migration/api/project.xml
===================================================================
--- osp/migration/api/project.xml	(revision 22565)
+++ osp/migration/api/project.xml	(working copy)
@@ -69,9 +69,9 @@
     </dependency>
 
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
 
     <dependency>
Index: osp/migration/api/pom.xml
===================================================================
--- osp/migration/api/pom.xml	(revision 22565)
+++ osp/migration/api/pom.xml	(working copy)
@@ -78,9 +78,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/reports/components/project.xml
===================================================================
--- osp/reports/components/project.xml	(revision 22565)
+++ osp/reports/components/project.xml	(working copy)
@@ -139,9 +139,9 @@
         </dependency>
         
         <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.1</version>
+            <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
         </dependency>       
 
       <dependency>
Index: osp/reports/components/pom.xml
===================================================================
--- osp/reports/components/pom.xml	(revision 22565)
+++ osp/reports/components/pom.xml	(working copy)
@@ -133,9 +133,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/.classpath
===================================================================
--- osp/.classpath	(revision 22565)
+++ osp/.classpath	(working copy)
@@ -82,7 +82,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.3.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jstl/jars/jstl-1.1.2.jar"/>
Index: osp/wizard/tool-lib/project.xml
===================================================================
--- osp/wizard/tool-lib/project.xml	(revision 22565)
+++ osp/wizard/tool-lib/project.xml	(working copy)
@@ -114,9 +114,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/wizard/tool-lib/pom.xml
===================================================================
--- osp/wizard/tool-lib/pom.xml	(revision 22565)
+++ osp/wizard/tool-lib/pom.xml	(working copy)
@@ -120,9 +120,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/wizard/component/project.xml
===================================================================
--- osp/wizard/component/project.xml	(revision 22565)
+++ osp/wizard/component/project.xml	(working copy)
@@ -134,9 +134,9 @@
         </dependency>
         
         <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.1</version>
+            <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
         </dependency>       
 
       <dependency>
Index: osp/wizard/component/pom.xml
===================================================================
--- osp/wizard/component/pom.xml	(revision 22565)
+++ osp/wizard/component/pom.xml	(working copy)
@@ -135,9 +135,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/wizard/api-impl/project.xml
===================================================================
--- osp/wizard/api-impl/project.xml	(revision 22565)
+++ osp/wizard/api-impl/project.xml	(working copy)
@@ -191,9 +191,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/wizard/api-impl/pom.xml
===================================================================
--- osp/wizard/api-impl/pom.xml	(revision 22565)
+++ osp/wizard/api-impl/pom.xml	(working copy)
@@ -211,9 +211,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/wizard/api/project.xml
===================================================================
--- osp/wizard/api/project.xml	(revision 22565)
+++ osp/wizard/api/project.xml	(working copy)
@@ -141,9 +141,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/wizard/api/pom.xml
===================================================================
--- osp/wizard/api/pom.xml	(revision 22565)
+++ osp/wizard/api/pom.xml	(working copy)
@@ -169,9 +169,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/portal/api-impl/project.xml
===================================================================
--- osp/portal/api-impl/project.xml	(revision 22565)
+++ osp/portal/api-impl/project.xml	(working copy)
@@ -98,9 +98,9 @@
       </dependency>
 
      <dependency>
-       <groupId>ehcache</groupId>
-       <artifactId>ehcache</artifactId>
-       <version>1.1</version>
+       <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
      </dependency>
 
       <dependency>
Index: osp/portal/api-impl/pom.xml
===================================================================
--- osp/portal/api-impl/pom.xml	(revision 22565)
+++ osp/portal/api-impl/pom.xml	(working copy)
@@ -112,9 +112,9 @@
      </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/portal/api/project.xml
===================================================================
--- osp/portal/api/project.xml	(revision 22565)
+++ osp/portal/api/project.xml	(working copy)
@@ -57,9 +57,9 @@
       </dependency>
 
      <dependency>
-       <groupId>ehcache</groupId>
-       <artifactId>ehcache</artifactId>
-       <version>1.1</version>
+       <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
      </dependency>
 
       <dependency>
Index: osp/portal/api/pom.xml
===================================================================
--- osp/portal/api/pom.xml	(revision 22565)
+++ osp/portal/api/pom.xml	(working copy)
@@ -64,9 +64,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/warehouse/components/project.xml
===================================================================
--- osp/warehouse/components/project.xml	(revision 22565)
+++ osp/warehouse/components/project.xml	(working copy)
@@ -101,9 +101,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/warehouse/components/pom.xml
===================================================================
--- osp/warehouse/components/pom.xml	(revision 22565)
+++ osp/warehouse/components/pom.xml	(working copy)
@@ -103,9 +103,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/warehouse/api-impl/project.xml
===================================================================
--- osp/warehouse/api-impl/project.xml	(revision 22565)
+++ osp/warehouse/api-impl/project.xml	(working copy)
@@ -177,9 +177,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/warehouse/api-impl/pom.xml
===================================================================
--- osp/warehouse/api-impl/pom.xml	(revision 22565)
+++ osp/warehouse/api-impl/pom.xml	(working copy)
@@ -223,9 +223,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/warehouse/api/project.xml
===================================================================
--- osp/warehouse/api/project.xml	(revision 22565)
+++ osp/warehouse/api/project.xml	(working copy)
@@ -63,9 +63,9 @@
     </dependency>
 
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
 
       <dependency>
Index: osp/warehouse/api/pom.xml
===================================================================
--- osp/warehouse/api/pom.xml	(revision 22565)
+++ osp/warehouse/api/pom.xml	(working copy)
@@ -71,9 +71,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/glossary/tool-lib/project.xml
===================================================================
--- osp/glossary/tool-lib/project.xml	(revision 22565)
+++ osp/glossary/tool-lib/project.xml	(working copy)
@@ -148,9 +148,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/glossary/tool-lib/pom.xml
===================================================================
--- osp/glossary/tool-lib/pom.xml	(revision 22565)
+++ osp/glossary/tool-lib/pom.xml	(working copy)
@@ -154,9 +154,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/glossary/component/project.xml
===================================================================
--- osp/glossary/component/project.xml	(revision 22565)
+++ osp/glossary/component/project.xml	(working copy)
@@ -131,9 +131,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/glossary/component/pom.xml
===================================================================
--- osp/glossary/component/pom.xml	(revision 22565)
+++ osp/glossary/component/pom.xml	(working copy)
@@ -129,9 +129,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/glossary/api-impl/project.xml
===================================================================
--- osp/glossary/api-impl/project.xml	(revision 22565)
+++ osp/glossary/api-impl/project.xml	(working copy)
@@ -157,9 +157,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/glossary/api-impl/pom.xml
===================================================================
--- osp/glossary/api-impl/pom.xml	(revision 22565)
+++ osp/glossary/api-impl/pom.xml	(working copy)
@@ -169,9 +169,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/glossary/api/project.xml
===================================================================
--- osp/glossary/api/project.xml	(revision 22565)
+++ osp/glossary/api/project.xml	(working copy)
@@ -87,9 +87,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/glossary/api/pom.xml
===================================================================
--- osp/glossary/api/pom.xml	(revision 22565)
+++ osp/glossary/api/pom.xml	(working copy)
@@ -99,9 +99,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/glossary/tool/project.xml
===================================================================
--- osp/glossary/tool/project.xml	(revision 22565)
+++ osp/glossary/tool/project.xml	(working copy)
@@ -194,9 +194,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+ <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/glossary/tool/pom.xml
===================================================================
--- osp/glossary/tool/pom.xml	(revision 22565)
+++ osp/glossary/tool/pom.xml	(working copy)
@@ -186,9 +186,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/matrix/component/project.xml
===================================================================
--- osp/matrix/component/project.xml	(revision 22565)
+++ osp/matrix/component/project.xml	(working copy)
@@ -125,9 +125,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/matrix/component/pom.xml
===================================================================
--- osp/matrix/component/pom.xml	(revision 22565)
+++ osp/matrix/component/pom.xml	(working copy)
@@ -122,9 +122,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/matrix/api-impl/project.xml
===================================================================
--- osp/matrix/api-impl/project.xml	(revision 22565)
+++ osp/matrix/api-impl/project.xml	(working copy)
@@ -179,9 +179,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/matrix/api-impl/pom.xml
===================================================================
--- osp/matrix/api-impl/pom.xml	(revision 22565)
+++ osp/matrix/api-impl/pom.xml	(working copy)
@@ -197,9 +197,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/matrix/api/.classpath
===================================================================
--- osp/matrix/api/.classpath	(revision 22565)
+++ osp/matrix/api/.classpath	(working copy)
@@ -29,7 +29,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar">
   </classpathentry>
Index: osp/matrix/api/project.xml
===================================================================
--- osp/matrix/api/project.xml	(revision 22565)
+++ osp/matrix/api/project.xml	(working copy)
@@ -111,9 +111,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/matrix/api/pom.xml
===================================================================
--- osp/matrix/api/pom.xml	(revision 22565)
+++ osp/matrix/api/pom.xml	(working copy)
@@ -127,9 +127,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/matrix/tool/project.xml
===================================================================
--- osp/matrix/tool/project.xml	(revision 22565)
+++ osp/matrix/tool/project.xml	(working copy)
@@ -236,9 +236,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/matrix/tool/pom.xml
===================================================================
--- osp/matrix/tool/pom.xml	(revision 22565)
+++ osp/matrix/tool/pom.xml	(working copy)
@@ -226,9 +226,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/presentation/tool-lib/project.xml
===================================================================
--- osp/presentation/tool-lib/project.xml	(revision 22565)
+++ osp/presentation/tool-lib/project.xml	(working copy)
@@ -161,9 +161,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/presentation/tool-lib/pom.xml
===================================================================
--- osp/presentation/tool-lib/pom.xml	(revision 22565)
+++ osp/presentation/tool-lib/pom.xml	(working copy)
@@ -162,9 +162,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/presentation/api-impl/project.xml
===================================================================
--- osp/presentation/api-impl/project.xml	(revision 22565)
+++ osp/presentation/api-impl/project.xml	(working copy)
@@ -203,9 +203,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/presentation/api-impl/pom.xml
===================================================================
--- osp/presentation/api-impl/pom.xml	(revision 22565)
+++ osp/presentation/api-impl/pom.xml	(working copy)
@@ -225,9 +225,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/presentation/api/project.xml
===================================================================
--- osp/presentation/api/project.xml	(revision 22565)
+++ osp/presentation/api/project.xml	(working copy)
@@ -123,9 +123,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/presentation/api/pom.xml
===================================================================
--- osp/presentation/api/pom.xml	(revision 22565)
+++ osp/presentation/api/pom.xml	(working copy)
@@ -141,9 +141,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: osp/presentation/tool/project.xml
===================================================================
--- osp/presentation/tool/project.xml	(revision 22565)
+++ osp/presentation/tool/project.xml	(working copy)
@@ -337,9 +337,9 @@
     </dependency>
     
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     
       <dependency>
Index: osp/presentation/tool/pom.xml
===================================================================
--- osp/presentation/tool/pom.xml	(revision 22565)
+++ osp/presentation/tool/pom.xml	(working copy)
@@ -303,9 +303,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: profile/components/project.xml
===================================================================
--- profile/components/project.xml	(revision 22565)
+++ profile/components/project.xml	(working copy)
@@ -61,9 +61,9 @@
             <version>3.0</version>
         </dependency>
         <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.1</version>
+            <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
         </dependency>
         <dependency>
             <groupId>${sakai.hibernate.groupId}</groupId>
Index: profile/components/pom.xml
===================================================================
--- profile/components/pom.xml	(revision 22565)
+++ profile/components/pom.xml	(working copy)
@@ -85,9 +85,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: profile/common-composite-component/project.xml
===================================================================
--- profile/common-composite-component/project.xml	(revision 22565)
+++ profile/common-composite-component/project.xml	(working copy)
@@ -156,9 +156,9 @@
       </dependency>
       
       <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
       
       <dependency>
Index: profile/common-composite-component/pom.xml
===================================================================
--- profile/common-composite-component/pom.xml	(revision 22565)
+++ profile/common-composite-component/pom.xml	(working copy)
@@ -172,9 +172,9 @@
       </dependency>
       
       <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       </dependency>
       
       <dependency>
Index: roster/components/project.xml
===================================================================
--- roster/components/project.xml	(revision 22565)
+++ roster/components/project.xml	(working copy)
@@ -61,9 +61,9 @@
             <version>3.0</version>
         </dependency>
         <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.1</version>
+            <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
         </dependency>
         <dependency>
             <groupId>${sakai.hibernate.groupId}</groupId>
Index: roster/components/pom.xml
===================================================================
--- roster/components/pom.xml	(revision 22565)
+++ roster/components/pom.xml	(working copy)
@@ -85,9 +85,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: rwiki/rwiki-impl/.classpath
===================================================================
--- rwiki/rwiki-impl/.classpath	(revision 22565)
+++ rwiki/rwiki-impl/.classpath	(working copy)
@@ -14,7 +14,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/rwiki-util"/>
 	<classpathentry kind="var" path="MAVEN_REPO/fop/jars/fop-20070301.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.hibernate/jars/hibernate-3.1.3.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-mock-1.2.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/avalon-framework/jars/avalon-framework-impl-4.2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/avalon-framework/jars/avalon-framework-api-4.2.0.jar"/>
Index: rwiki/rwiki-impl/impl/project.xml
===================================================================
--- rwiki/rwiki-impl/impl/project.xml	(revision 22565)
+++ rwiki/rwiki-impl/impl/project.xml	(working copy)
@@ -191,9 +191,9 @@
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
Index: rwiki/rwiki-impl/impl/pom.xml
===================================================================
--- rwiki/rwiki-impl/impl/pom.xml	(revision 22565)
+++ rwiki/rwiki-impl/impl/pom.xml	(working copy)
@@ -258,9 +258,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
Index: sam/project.xml.standalone
===================================================================
--- sam/project.xml.standalone	(revision 22565)
+++ sam/project.xml.standalone	(working copy)
@@ -307,9 +307,9 @@
 			</properties>
 		</dependency>
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 			<properties>
 				<war.bundle>standalone</war.bundle>
 			</properties>
Index: sam/samigo-app/project.xml
===================================================================
--- sam/samigo-app/project.xml	(revision 22565)
+++ sam/samigo-app/project.xml	(working copy)
@@ -476,9 +476,9 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <properties>
         <war.bundle>standalone</war.bundle>
       </properties>
Index: sam/samigo-app/pom.xml
===================================================================
--- sam/samigo-app/pom.xml	(revision 22565)
+++ sam/samigo-app/pom.xml	(working copy)
@@ -431,9 +431,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 <!--properties:  war.bundle: standalone -->
       <scope>provided</scope>
     </dependency>
Index: sam/samigo-services/project.xml
===================================================================
--- sam/samigo-services/project.xml	(revision 22565)
+++ sam/samigo-services/project.xml	(working copy)
@@ -267,9 +267,9 @@
       <version>1.4</version>
     </dependency>
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     <dependency>
       <groupId>fop</groupId>
Index: sam/samigo-services/pom.xml
===================================================================
--- sam/samigo-services/pom.xml	(revision 22565)
+++ sam/samigo-services/pom.xml	(working copy)
@@ -342,9 +342,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: sam/.classpath
===================================================================
--- sam/.classpath	(revision 22565)
+++ sam/.classpath	(working copy)
@@ -35,7 +35,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/commons-resources/jars/commons-resources-0.1-dev.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-validator/jars/commons-validator-1.0.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/fop/jars/fop-0.20.5.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.hibernate/jars/hibernate-3.1.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jaxen/jars/jaxen-1.0-FCS-full.jar"/>
Index: sam/samigo-hibernate/project.xml
===================================================================
--- sam/samigo-hibernate/project.xml	(revision 22565)
+++ sam/samigo-hibernate/project.xml	(working copy)
@@ -251,9 +251,9 @@
       <version>1.4</version>
     </dependency>
     <dependency>
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
     </dependency>
     <dependency>
       <groupId>fop</groupId>
Index: sam/samigo-hibernate/pom.xml
===================================================================
--- sam/samigo-hibernate/pom.xml	(revision 22565)
+++ sam/samigo-hibernate/pom.xml	(working copy)
@@ -328,9 +328,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: sections/sections-app/project.xml
===================================================================
--- sections/sections-app/project.xml	(revision 22565)
+++ sections/sections-app/project.xml	(working copy)
@@ -197,9 +197,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: sections/sections-app/pom.xml
===================================================================
--- sections/sections-app/pom.xml	(revision 22565)
+++ sections/sections-app/pom.xml	(working copy)
@@ -204,9 +204,9 @@
 	</dependency>
 	<dependency>
 		
-		<groupId>ehcache</groupId>
-		<artifactId>ehcache</artifactId>
-		<version>1.1</version>
+		<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		<scope>provided</scope>
 	</dependency>
 	<dependency>
Index: sections/sections-impl/sakai/model/project.xml
===================================================================
--- sections/sections-impl/sakai/model/project.xml	(revision 22565)
+++ sections/sections-impl/sakai/model/project.xml	(working copy)
@@ -105,9 +105,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: sections/sections-impl/sakai/model/pom.xml
===================================================================
--- sections/sections-impl/sakai/model/pom.xml	(revision 22565)
+++ sections/sections-impl/sakai/model/pom.xml	(working copy)
@@ -119,9 +119,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: sections/sections-impl/sakai/impl/project.xml
===================================================================
--- sections/sections-impl/sakai/impl/project.xml	(revision 22565)
+++ sections/sections-impl/sakai/impl/project.xml	(working copy)
@@ -135,9 +135,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: sections/sections-impl/sakai/impl/pom.xml
===================================================================
--- sections/sections-impl/sakai/impl/pom.xml	(revision 22565)
+++ sections/sections-impl/sakai/impl/pom.xml	(working copy)
@@ -159,9 +159,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: sections/sections-impl/standalone/project.xml
===================================================================
--- sections/sections-impl/standalone/project.xml	(revision 22565)
+++ sections/sections-impl/standalone/project.xml	(working copy)
@@ -87,9 +87,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.1</version>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
 		</dependency>
 
 		<dependency>
Index: sections/sections-impl/standalone/pom.xml
===================================================================
--- sections/sections-impl/standalone/pom.xml	(revision 22565)
+++ sections/sections-impl/standalone/pom.xml	(working copy)
@@ -105,9 +105,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: sections/sections-impl/integration-support/project.xml
===================================================================
--- sections/sections-impl/integration-support/project.xml	(revision 22565)
+++ sections/sections-impl/integration-support/project.xml	(working copy)
@@ -111,9 +111,9 @@
         </dependency>
 
         <dependency>
-            <groupId>ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.1</version>
+            <groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
         </dependency>
 
         <dependency>
Index: sections/sections-impl/integration-support/pom.xml
===================================================================
--- sections/sections-impl/integration-support/pom.xml	(revision 22565)
+++ sections/sections-impl/integration-support/pom.xml	(working copy)
@@ -115,9 +115,9 @@
     </dependency>
     <dependency>
       
-      <groupId>ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.1</version>
+<groupId>${sakai.ehcache.groupId}</groupId>
+      <artifactId>${sakai.ehcache.artifactId}</artifactId>
+      <version>${sakai.ehcache.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>