Index: kernel-impl/pom.xml
===================================================================
--- kernel-impl/pom.xml	(revision 107945)
+++ kernel-impl/pom.xml	(working copy)
@@ -136,6 +136,10 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
     <dependency>
@@ -148,7 +152,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
Index: kernel-private/pom.xml
===================================================================
--- kernel-private/pom.xml	(revision 107945)
+++ kernel-private/pom.xml	(working copy)
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.kernel</groupId>
Index: pom.xml
===================================================================
--- pom.xml	(revision 107945)
+++ pom.xml	(working copy)
@@ -516,11 +516,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.0</version>
-            </dependency>
             <!-- shared/lib -->
             <!-- 3rd party APIs/Implementations -->
             <dependency>
@@ -647,19 +642,39 @@
                 <version>1.6.1</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
+    <dependency>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-core</artifactId>
+        <version>1.7.2</version>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate</artifactId>
+        <version>3.2.7.ga</version>
+        <scope>provided</scope>
+        <exclusions>
+            <exclusion>
+                <!-- Due to artifact now being ehcache-core eclipse:eclipse was including both copies of the JAR in the project. -->
                 <groupId>net.sf.ehcache</groupId>
                 <artifactId>ehcache</artifactId>
-                <version>1.6.1</version>
-                <scope>provided</scope>
-            </dependency>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <!-- needed by Ehcache -->
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.4.2</version>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.4.2</version>
+        <scope>provided</scope>
+    </dependency>
             <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate</artifactId>
-                <version>3.2.7.ga</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>1.8.0.10</version>
Index: deploy/assembly/pom.xml
===================================================================
--- deploy/assembly/pom.xml	(revision 107945)
+++ deploy/assembly/pom.xml	(working copy)
@@ -131,15 +131,32 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <scope>compile</scope>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-core</artifactId>
+        <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <scope>compile</scope>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate</artifactId>
+        <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
+        <!-- needed by Ehcache -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
     <dependency>
       <groupId>jdbc</groupId>
       <artifactId>jdbc2_0-stdext</artifactId>
Index: deploy/shared/pom.xml
===================================================================
--- deploy/shared/pom.xml	(revision 107945)
+++ deploy/shared/pom.xml	(working copy)
@@ -74,14 +74,20 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <scope>compile</scope>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache-core</artifactId>
+        <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <scope>compile</scope>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate</artifactId>
+        <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>jdbc</groupId>
Index: deploy/common/pom.xml
===================================================================
--- deploy/common/pom.xml	(revision 107945)
+++ deploy/common/pom.xml	(working copy)
@@ -38,5 +38,16 @@
       <artifactId>commons-logging</artifactId>
       <scope>compile</scope>
     </dependency>
+        <!-- needed by Ehcache -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>compile</scope>
+        </dependency>
   </dependencies>
 </project>