diff --git a/pom.xml b/pom.xml
index e1c1d7f153c12a9c691c6cbada2141dc788f2a8f..cdd9cb10ad0f95e72b0bea7111e25ffde79d464f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
 		<org.infinispan.version>6.0.2.Final</org.infinispan.version>
 		<lucene.version>4.8.0</lucene.version>
 		<version.selenium>2.43.1</version.selenium>
+		<activemq.version>5.11.1</activemq.version>
 
 	    <!-- properties for testing and Q&A -->
 	    <!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->
@@ -391,6 +392,16 @@
 					<groupId>org.postgresql</groupId>
 					<artifactId>postgresql</artifactId>
 					<version>${org.postgresql.version}</version>
+					<exclusions>
+						<exclusion>
+							<groupId>com.github.dblock.waffle</groupId>
+							<artifactId>waffle-jna</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-simple</artifactId>
+						</exclusion>
+					</exclusions>
 				</dependency>
 		
 				<dependency>
@@ -400,41 +411,34 @@
 				</dependency>
 				<dependency>
 					<groupId>org.apache.activemq</groupId>
-					<artifactId>activemq-core</artifactId>
-					<version>5.3.2</version>
+					<artifactId>activemq-client</artifactId>
+					<version>${activemq.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.activemq</groupId>
+					<artifactId>activemq-broker</artifactId>
+					<version>${activemq.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.activemq</groupId>
+					<artifactId>activemq-spring</artifactId>
+					<version>${activemq.version}</version>
 					<exclusions>
 						<exclusion>
-							<groupId>backport-util-concurrent</groupId>
-							<artifactId>backport-util-concurrent</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>javax.activation</groupId>
-							<artifactId>activation</artifactId>
-						</exclusion>
-						<!-- fxdiff: FXOLAT-243  clean up the dependencies of ActiveMQ -->
-						<exclusion>
-							<groupId>org.springframework.osgi</groupId>
-							<artifactId>spring-osgi-core</artifactId>
+							<groupId>org.apache.xbean</groupId>
+							<artifactId>xbean-spring</artifactId>
 						</exclusion>
 						<exclusion>
 							<groupId>org.apache.activemq</groupId>
-							<artifactId>kahadb</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>org.osgi</groupId>
-							<artifactId>org.osgi.core</artifactId>
+							<artifactId>activemq-pool</artifactId>
 						</exclusion>
 						<exclusion>
 							<groupId>org.apache.geronimo.specs</groupId>
-							<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>commons-logging</groupId>
-							<artifactId>commons-logging-api</artifactId>
+							<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
 						</exclusion>
 						<exclusion>
-							<groupId>commons-logging</groupId>
-							<artifactId>commons-logging</artifactId>
+							<groupId>commons-pool</groupId>
+							<artifactId>commons-pool</artifactId>
 						</exclusion>
 					</exclusions>
 				</dependency>
@@ -846,6 +850,16 @@
 								<groupId>org.postgresql</groupId>
 								<artifactId>postgresql</artifactId>
 								<version>${org.postgresql.version}</version>
+								<exclusions>
+									<exclusion>
+										<groupId>com.github.dblock.waffle</groupId>
+										<artifactId>waffle-jna</artifactId>
+									</exclusion>
+									<exclusion>
+										<groupId>org.slf4j</groupId>
+										<artifactId>slf4j-simple</artifactId>
+									</exclusion>
+								</exclusions>
 							</dependency>
 						</dependencies>
 	
@@ -1578,42 +1592,37 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<version>5.3.2</version>
+			<artifactId>activemq-client</artifactId>
+			<version>${activemq.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-broker</artifactId>
+			<version>${activemq.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-spring</artifactId>
+			<version>${activemq.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
-					<groupId>backport-util-concurrent</groupId>
-					<artifactId>backport-util-concurrent</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>activation</artifactId>
-				</exclusion>
-				<!-- fxdiff: FXOLAT-243  clean up the dependencies of ActiveMQ -->
-				<exclusion>
-					<groupId>org.springframework.osgi</groupId>
-					<artifactId>spring-osgi-core</artifactId>
+					<groupId>org.apache.xbean</groupId>
+					<artifactId>xbean-spring</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.apache.activemq</groupId>
-					<artifactId>kahadb</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.core</artifactId>
+					<artifactId>activemq-pool</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.apache.geronimo.specs</groupId>
-					<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+					<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
+					<groupId>commons-pool</groupId>
+					<artifactId>commons-pool</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -1655,6 +1664,7 @@
 			<version>3.2.1</version>
 		</dependency>
 		<dependency>
+			<!-- Used by at least commons-fileupload, webdriver -->
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>