Index: assembly/src/main/descriptors/common-bin.xml
===================================================================
--- assembly/src/main/descriptors/common-bin.xml	(revision 651619)
+++ assembly/src/main/descriptors/common-bin.xml	(working copy)
@@ -144,7 +144,8 @@
         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
-        <include>org.springframework:spring</include>
+        <include>org.springframework:spring-core</include>
+        <include>org.springframework:spring-beans</include>
         <include>xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
       </includes>
Index: assembly/pom.xml
===================================================================
--- assembly/pom.xml	(revision 651619)
+++ assembly/pom.xml	(working copy)
@@ -180,13 +180,8 @@
        <artifactId>xbean-spring</artifactId>
        <optional>true</optional>
     </dependency>
-    
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <optional>false</optional>
     </dependency>
@@ -434,4 +429,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>
Index: activemq-web-console/pom.xml
===================================================================
--- activemq-web-console/pom.xml	(revision 651619)
+++ activemq-web-console/pom.xml	(working copy)
@@ -165,12 +165,7 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
@@ -261,4 +256,4 @@
   <properties>
     <jetty.port>8080</jetty.port>
   </properties>
-</project>
\ No newline at end of file
+</project>
Index: pom.xml
===================================================================
--- pom.xml	(revision 651619)
+++ pom.xml	(working copy)
@@ -452,6 +452,19 @@
       <!-- Optional Spring Support -->
       <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>
+      <!--
+      <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
         <version>${spring-version}</version>
         <optional>true</optional>
@@ -490,6 +503,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+      -->
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
Index: activemq-xmpp/pom.xml
===================================================================
--- activemq-xmpp/pom.xml	(revision 651619)
+++ activemq-xmpp/pom.xml	(working copy)
@@ -156,14 +156,7 @@
       <artifactId>geronimo-stax-api_1.0_spec</artifactId>
       <version>1.0.1</version>
     </dependency>
-
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <!--<version>2.0</version>-->
-    </dependency>
-
-    <dependency>
       <groupId>jivesoftware</groupId>
       <artifactId>smack</artifactId>
       <version>1.5.0</version>
@@ -266,4 +259,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
Index: activemq-optional/pom.xml
===================================================================
--- activemq-optional/pom.xml	(revision 651619)
+++ activemq-optional/pom.xml	(working copy)
@@ -48,7 +48,7 @@
     
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>aopalliance</groupId>
@@ -157,4 +157,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
Index: activemq-core/pom.xml
===================================================================
--- activemq-core/pom.xml	(revision 651619)
+++ activemq-core/pom.xml	(working copy)
@@ -123,11 +123,6 @@
       <artifactId>xbean-spring</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.derby</groupId>
@@ -367,6 +362,9 @@
             <include>**/*Test.*</include>
           </includes>
           <excludes>
+            <exclude>**/perf/SimpleDurableTopicTest.*</exclude>
+          </excludes>
+          <excludes>
 
             <!-- These tests run too slow to execute as part of the unit tests -->
             <exclude>**/TransactionNotStartedErrorTest.*</exclude>
Index: activemq-web-demo/pom.xml
===================================================================
--- activemq-web-demo/pom.xml	(revision 651619)
+++ activemq-web-demo/pom.xml	(working copy)
@@ -97,12 +97,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- For Spring servlet -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-
     <!--  for custom XML parsing -->
     <dependency>
       <groupId>org.apache.xbean</groupId>
@@ -136,4 +130,4 @@
   <properties>
     <jetty.port>8080</jetty.port>
   </properties>
-</project>
\ No newline at end of file
+</project>
Index: activemq-ra/pom.xml
===================================================================
--- activemq-ra/pom.xml	(revision 651619)
+++ activemq-ra/pom.xml	(working copy)
@@ -41,10 +41,6 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
 <!--
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -140,4 +136,4 @@
   </build>
 
 
-</project>
\ No newline at end of file
+</project>
Index: activemq-console/pom.xml
===================================================================
--- activemq-console/pom.xml	(revision 651619)
+++ activemq-console/pom.xml	(working copy)
@@ -50,11 +50,6 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
-        
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>commons-pool</groupId>
@@ -93,4 +88,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
Index: activemq-jpa-store/pom.xml
===================================================================
--- activemq-jpa-store/pom.xml	(revision 651619)
+++ activemq-jpa-store/pom.xml	(working copy)
@@ -69,13 +69,13 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
       <optional>true</optional>
     </dependency>
 
Index: activemq-fileserver/pom.xml
===================================================================
--- activemq-fileserver/pom.xml	(revision 651619)
+++ activemq-fileserver/pom.xml	(working copy)
@@ -94,12 +94,6 @@
       <artifactId>jetty</artifactId>
     </dependency>
 
-    <!-- For Spring servlet -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-
     <!-- used for testing -->
     <dependency>
       <groupId>junit</groupId>
@@ -111,4 +105,4 @@
   <properties>
     <jetty.port>8080</jetty.port>
   </properties>
-</project>
\ No newline at end of file
+</project>