You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2014/01/09 15:47:25 UTC

git commit: https://issues.apache.org/jira/browse/AMQ-4741 - move to .26-SNAPSHOT for qpid jms and reinstate factory.setSyncPublish - amqp tests all pass with that which is smashing

Updated Branches:
  refs/heads/trunk a33a4e769 -> efb988655


https://issues.apache.org/jira/browse/AMQ-4741 - move to .26-SNAPSHOT for qpid jms and reinstate factory.setSyncPublish - amqp tests all pass with that which is smashing


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

Branch: refs/heads/trunk
Commit: efb988655cbad639bba5e83475310ee702f501ee
Parents: a33a4e7
Author: gtully <ga...@gmail.com>
Authored: Thu Jan 9 14:46:48 2014 +0000
Committer: gtully <ga...@gmail.com>
Committed: Thu Jan 9 14:46:48 2014 +0000

----------------------------------------------------------------------
 .../java/org/apache/activemq/transport/amqp/JMSClientTest.java    | 3 +--
 pom.xml                                                           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/efb98865/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
index 30287f2..4002ef2 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
@@ -553,8 +553,7 @@ public class JMSClientTest extends AmqpTestSupport {
     private Connection createConnection(String clientId, boolean syncPublish) throws JMSException {
 
         final ConnectionFactoryImpl factory = new ConnectionFactoryImpl("localhost", port, "admin", "password");
-        // seems to require unreleased .026
-        // factory.setSyncPublish(syncPublish);
+        factory.setSyncPublish(syncPublish);
 
         final Connection connection = factory.createConnection();
         if (clientId != null && !clientId.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/activemq/blob/efb98865/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dedf65c..1e1edd1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.5</zookeeper-version>
     <qpid-proton-version>0.5</qpid-proton-version>
-    <qpid-jms-version>0.24</qpid-jms-version>
+    <qpid-jms-version>0.26-SNAPSHOT</qpid-jms-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.5.1-2</saxon-version>