Repository: camel Updated Branches: refs/heads/master 7d5436d0d -> 940334b67
CAMEL-9429: Upgrade to ActiveMQ 5.13.1. Thanks to Dejan for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c11b6c10 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c11b6c10 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c11b6c10 Branch: refs/heads/master Commit: c11b6c10d0f962ca81d895b6c87c9af697422c47 Parents: 7d5436d Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 11 10:24:48 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 11 11:43:27 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/jms/CamelJmsTestHelper.java | 2 ++ .../resources/org/apache/camel/component/jms/remoting/spring.xml | 2 ++ .../src/main/resources/camel-client-remoting.xml | 1 + .../camel-example-spring-jms/src/main/resources/camel-client.xml | 1 + parent/pom.xml | 2 +- 5 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c11b6c10/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java index 121f905..ac36c9a 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java @@ -68,6 +68,7 @@ public final class CamelJmsTestHelper { if (maximumRedeliveries != null) { connectionFactory.getRedeliveryPolicy().setMaximumRedeliveries(maximumRedeliveries); } + connectionFactory.setTrustAllPackages(true); return connectionFactory; } @@ -95,6 +96,7 @@ public final class CamelJmsTestHelper { connectionFactory.setOptimizeAcknowledge(true); connectionFactory.setOptimizedMessageDispatch(true); connectionFactory.setAlwaysSessionAsync(false); + connectionFactory.setTrustAllPackages(true); return connectionFactory; } } http://git-wip-us.apache.org/repos/asf/camel/blob/c11b6c10/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml index 5675da4..653ec2d 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/remoting/spring.xml @@ -41,7 +41,9 @@ <property name="connectionFactory"> <bean class="org.apache.activemq.spring.ActiveMQConnectionFactory"> <property name="brokerURL" value="vm://localhost?broker.persistent=false&broker.useJmx=false"/> + <property name="trustAllPackages" value="true"/> </bean> </property> </bean> + </beans> http://git-wip-us.apache.org/repos/asf/camel/blob/c11b6c10/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml b/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml index 2e02425..5a3a754 100644 --- a/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml +++ b/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml @@ -43,6 +43,7 @@ <!-- Camel JMSProducer to be able to send messages to a remote Active MQ server --> <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> <property name="brokerURL" value="tcp://localhost:${tcp.port}"/> + <property name="trustAllPackages" value="true"/> </bean> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/c11b6c10/examples/camel-example-spring-jms/src/main/resources/camel-client.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-jms/src/main/resources/camel-client.xml b/examples/camel-example-spring-jms/src/main/resources/camel-client.xml index 729cce3..59f882e 100644 --- a/examples/camel-example-spring-jms/src/main/resources/camel-client.xml +++ b/examples/camel-example-spring-jms/src/main/resources/camel-client.xml @@ -41,6 +41,7 @@ <!-- Camel JMSProducer to be able to send messages to a remote Active MQ server --> <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent"> <property name="brokerURL" value="tcp://localhost:${tcp.port}"/> + <property name="trustAllPackages" value="true"/> </bean> <!-- END SNIPPET: e3 --> http://git-wip-us.apache.org/repos/asf/camel/blob/c11b6c10/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 273f865..93c4db2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -35,7 +35,7 @@ <!-- dependency versions --> <abdera-version>1.1.3</abdera-version> <!-- Note that activemq dependency is only used for testing! --> - <activemq-version>5.12.1</activemq-version> + <activemq-version>5.13.1</activemq-version> <ahc-version>1.9.33</ahc-version> <ant-bundle-version>1.7.0_6</ant-bundle-version> <antlr-bundle-version>3.5.2_1</antlr-bundle-version>
