Update ActiveMQ
diff --git a/modules/samples/transport/jms-sample/jmsService/pom.xml b/modules/samples/transport/jms-sample/jmsService/pom.xml
index ebadaa9..bac6918 100644
--- a/modules/samples/transport/jms-sample/jmsService/pom.xml
+++ b/modules/samples/transport/jms-sample/jmsService/pom.xml
@@ -12,8 +12,8 @@
<plugins>
<plugin>
<groupId>org.apache.activemq.tooling</groupId>
- <artifactId>maven-activemq-plugin</artifactId>
- <version>5.1.0</version>
+ <artifactId>activemq-maven-plugin</artifactId>
+ <version>5.16.0</version>
<configuration>
<fork>true</fork>
</configuration>
@@ -30,14 +30,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>activemq-broker</artifactId>
+ <version>5.16.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/modules/transport/jms/pom.xml b/modules/transport/jms/pom.xml
index 64a2376..93c22bd 100644
--- a/modules/transport/jms/pom.xml
+++ b/modules/transport/jms/pom.xml
@@ -137,16 +137,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.1.0</version>
- <scope>test</scope>
- <exclusions>
- <!-- We want to choose the JAF implementation ourselves -->
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>activemq-broker</artifactId>
+ <version>5.16.0</version>
</dependency>
<dependency>
diff --git a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
index c7feb6b..4d6f620 100644
--- a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
+++ b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/ActiveMQTestEnvironment.java
@@ -27,7 +27,6 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.tests.Setup;
import org.apache.axis2.transport.testkit.tests.TearDown;
@@ -43,8 +42,7 @@
private void setUp() throws Exception {
broker = new BrokerService();
broker.setBrokerName(BROKER_NAME);
- broker.setDataDirectory("target/activemq-data");
- broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
+ broker.setPersistent(false);
broker.start();
connectionFactory = new ActiveMQConnectionFactory("vm://" + BROKER_NAME);
}
