diff --git a/pom.xml b/pom.xml
index 34377780..771a3f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,11 +558,6 @@
                 <scope>provided</scope>
             </dependency>
             <!-- Transport dependendencies -->
-            <dependency>
-                <groupId>activemq</groupId>
-                <artifactId>activemq</artifactId>
-                <version>2.1</version>
-            </dependency>
             <dependency>
                 <groupId>commons-httpclient</groupId>
                 <artifactId>commons-httpclient</artifactId>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 3cdd6c0a..bc36483e 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -36,6 +36,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -101,10 +105,16 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>4.1.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.1.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>