Update to recent Spring and ActiveMQ versions

Author: snicoll

SPR-9600/pom.xml

@@ -5,17 +5,30 @@
 	<artifactId>SPR-9600</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
+
+	<properties>
+		<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
+		<spring.version>4.0.5.RELEASE</spring.version>
+		<activemq.version>5.9.1</activemq.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>3.0.5.RELEASE</version>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jms</artifactId>
-			<version>3.0.5.RELEASE</version>
+			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
+			<version>${activemq.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.xbean</groupId>
 			<artifactId>xbean-spring</artifactId>
@@ -32,45 +45,7 @@
 			<version>4.8</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<version>5.3.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.osgi</groupId>
-					<artifactId>spring-osgi-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.activemq</groupId>
-					<artifactId>activemq-jaas</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.activemq.protobuf</groupId>
-					<artifactId>activemq-protobuf</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.activemq</groupId>
-					<artifactId>kahadb</artifactId>
-				</exclusion>				
-			</exclusions>
-		</dependency>		
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>spring-maven-snapshot</id>
-			<name>Springframework Maven Snapshot Repository</name>
-			<url>http://repo.springsource.org/snapshot</url>
-			<snapshots><enabled>true</enabled></snapshots>
-		</repository>
-	</repositories>
-	<properties>
-		<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -95,5 +70,13 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<repository>
+			<id>spring-maven-snapshot</id>
+			<name>Springframework Maven Snapshot Repository</name>
+			<url>http://repo.springsource.org/snapshot</url>
+			<snapshots><enabled>true</enabled></snapshots>
+		</repository>
+	</repositories>
 </project>
 

SPR-9600/src/main/resources/context.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:jms="http://www.springframework.org/schema/jms"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context.xsd
-           http://www.springframework.org/schema/jms 
-           http://www.springframework.org/schema/jms/spring-jms.xsd
-           http://activemq.apache.org/schema/core 
-           http://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd"
-	default-lazy-init="true">
+           http://www.springframework.org/schema/context/spring-context.xsd"
+	   default-lazy-init="true">
 
 	<context:annotation-config />
 	<context:component-scan base-package="org.springframework.issues" />
 
-	<amq:connectionFactory id="amqConnectionFactory"
-		brokerURL="tcp://127.0.0.1:6161?wireFormat.maxInactivityDuration=0" />
+
+	<bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+		<property name="brokerURL" value="tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0"/>
+	</bean>
 
 	<bean id="connectionFactory"
 		class="org.springframework.jms.connection.CachingConnectionFactory" destroy-method="destroy">