You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/11/28 10:36:34 UTC

camel git commit: CAMEL-10521 - Camel-Rabbitmq: Support RabbitMQ AMQP client 4.x

Repository: camel
Updated Branches:
  refs/heads/master 9364f1949 -> 478e2ea87


CAMEL-10521 - Camel-Rabbitmq: Support RabbitMQ AMQP client 4.x


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/478e2ea8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/478e2ea8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/478e2ea8

Branch: refs/heads/master
Commit: 478e2ea876338256cfe2d591aa40e30cf07d5a51
Parents: 9364f19
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 28 11:32:11 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 28 11:32:33 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java  | 2 +-
 .../camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml     | 2 +-
 parent/pom.xml                                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/478e2ea8/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index a9a53dc..d6c083c 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -198,7 +198,7 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
         assertEquals(ConnectionFactory.DEFAULT_FRAME_MAX, connectionFactory.getRequestedFrameMax());
         assertEquals(ConnectionFactory.DEFAULT_HEARTBEAT, connectionFactory.getRequestedHeartbeat());
         assertFalse(connectionFactory.isSSL());
-        assertFalse(connectionFactory.isAutomaticRecoveryEnabled());
+        assertTrue(connectionFactory.isAutomaticRecoveryEnabled());
         assertEquals(5000, connectionFactory.getNetworkRecoveryInterval());
         assertTrue(connectionFactory.isTopologyRecoveryEnabled());
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/478e2ea8/components/camel-rabbitmq/src/test/resources/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/test/resources/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml b/components/camel-rabbitmq/src/test/resources/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml
index b4688c7..86b6814 100644
--- a/components/camel-rabbitmq/src/test/resources/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml
+++ b/components/camel-rabbitmq/src/test/resources/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest-context.xml
@@ -40,4 +40,4 @@
         </route>
     </camelContext>
     <!-- END SNIPPET: example -->
-</beans>
\ No newline at end of file
+</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/478e2ea8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6feeafa..ef8007f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -494,7 +494,7 @@
     <quartz-version-range>[1.8,2)</quartz-version-range>
     <quartz2-version>2.2.3</quartz2-version>
     <quickfixj-version>1.6.2</quickfixj-version>
-    <rabbitmq-amqp-client-version>3.6.6</rabbitmq-amqp-client-version>
+    <rabbitmq-amqp-client-version>4.0.0</rabbitmq-amqp-client-version>
     <reflections-bundle-version>0.9.10_3</reflections-bundle-version>
     <regexp-bundle-version>1.4_1</regexp-bundle-version>
     <rest-assured-version>3.0.1</rest-assured-version>