From d42b51a78e975e6f55ad796b33c84738ccfb57ea Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Fri, 7 Apr 2017 11:01:51 +0100
Subject: [PATCH] [AMQ-6630][AMQ-6493] fix feature and add explicit 2.0 jms dep
 to karaf for the amqp client test

---
 .../activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java     | 2 ++
 activemq-karaf/src/main/resources/features.xml                  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
index 7ab943a946..11fc26f509 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
@@ -21,6 +21,7 @@ import javax.jms.Connection;
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Test;
 import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 
 public class ActiveMQAMQPBrokerFeatureTest extends AbstractFeatureTest {
@@ -30,6 +31,7 @@ public class ActiveMQAMQPBrokerFeatureTest extends AbstractFeatureTest {
     public static Option[] configure() {
         return new Option[] //
         {
+         CoreOptions.mavenBundle("org.apache.geronimo.specs","geronimo-jms_2.0_spec").version("1.0-alpha-2"),
          configure("activemq", "activemq-amqp-client"), //
          configureBrokerStart()
         };
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 6b1e10bffa..5410aa0317 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -66,6 +66,7 @@
       <bundle>mvn:io.netty/netty-codec/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-codec-http/${qpid-jms-netty-version}</bundle>
       <bundle>mvn:io.netty/netty-handler/${netty-all-version}</bundle>
+      <bundle>mvn:io.netty/netty-resolver/${netty-all-version}</bundle>
       <bundle>mvn:org.apache.qpid/proton-j/${qpid-jms-proton-version}</bundle>
       <bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-version}</bundle>
     </feature>