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 2017/04/07 10:02:04 UTC
activemq git commit: [AMQ-6630][AMQ-6493] fix feature and add
explicit 2.0 jms dep to karaf for the amqp client test
Repository: activemq
Updated Branches:
refs/heads/master 63b2e5c4e -> d42b51a78
[AMQ-6630][AMQ-6493] fix feature and add explicit 2.0 jms dep to karaf for the amqp client test
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d42b51a7
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d42b51a7
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d42b51a7
Branch: refs/heads/master
Commit: d42b51a78e975e6f55ad796b33c84738ccfb57ea
Parents: 63b2e5c
Author: gtully <ga...@gmail.com>
Authored: Fri Apr 7 11:01:51 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Fri Apr 7 11:01:51 2017 +0100
----------------------------------------------------------------------
.../apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java | 2 ++
activemq-karaf/src/main/resources/features.xml | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/d42b51a7/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
----------------------------------------------------------------------
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 7ab943a..11fc26f 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()
};
http://git-wip-us.apache.org/repos/asf/activemq/blob/d42b51a7/activemq-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 6b1e10b..5410aa0 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>