From c441e3a66caede2236ce5936d329dd7772e470e4 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Sat, 26 Jan 2013 00:41:48 +0000
Subject: [PATCH] Almost all the amqp joram tests are passing with the QPID
 0.20 client.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438797 13f79535-47bb-0310-9956-ffa450edef68
---
 .../transport/amqp/joram/JoramJmsTest.java     | 18 +++++++-----------
 pom.xml                                        |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
index 2874ad7221..ff17d29b43 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsTest.java
@@ -53,22 +53,18 @@ public class JoramJmsTest extends TestCase {
 
         // TODO: Fix these tests..
         if (false) {
-            // Fails due to https://issues.apache.org/jira/browse/QPID-4454
-            suite.addTestSuite(MessageHeaderTest.class);
+            // Fails due to
             // https://issues.apache.org/jira/browse/PROTON-154
             suite.addTestSuite(TopicSessionTest.class);
         }
 
-        // TODO: enable once QPID 0.20 is released
-        if(false) {
-            suite.addTestSuite(QueueBrowserTest.class);
-            suite.addTestSuite(MessageTypeTest.class);
-            suite.addTestSuite(UnifiedSessionTest.class);
-            suite.addTestSuite(TemporaryTopicTest.class);
-            suite.addTestSuite(TopicConnectionTest.class);
-        }
-
         // Passing tests
+        suite.addTestSuite(MessageHeaderTest.class);
+        suite.addTestSuite(QueueBrowserTest.class);
+        suite.addTestSuite(MessageTypeTest.class);
+        suite.addTestSuite(UnifiedSessionTest.class);
+        suite.addTestSuite(TemporaryTopicTest.class);
+        suite.addTestSuite(TopicConnectionTest.class);
         suite.addTestSuite(SelectorSyntaxTest.class);
         suite.addTestSuite(QueueSessionTest.class);
         suite.addTestSuite(SelectorTest.class);
diff --git a/pom.xml b/pom.xml
index 2eed65009f..befb2122c5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
     <org.osgi.core-version>4.3.1</org.osgi.core-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <qpid-proton-version>99.0.0-fuse-SNAPSHOT</qpid-proton-version>
-    <qpid-jms-version>0.18</qpid-jms-version>
+    <qpid-jms-version>0.20</qpid-jms-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.4</saxon-version>