Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-6630][AMQ-6493] fix feature and add explicit 2.0 jms dep to karaf for the amqp client test

This commit is contained in:
gtully 2017-04-07 11:01:51 +01:00
parent 63b2e5c4ea
commit d42b51a78e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
View File

@ -21,6 +21,7 @@ import javax.jms.Connection;
import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Test; import org.junit.Test;
import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.Option;
public class ActiveMQAMQPBrokerFeatureTest extends AbstractFeatureTest { public class ActiveMQAMQPBrokerFeatureTest extends AbstractFeatureTest {
@ -30,6 +31,7 @@ public class ActiveMQAMQPBrokerFeatureTest extends AbstractFeatureTest {
public static Option[] configure() { public static Option[] configure() {
return new Option[] // return new Option[] //
{ {
CoreOptions.mavenBundle("org.apache.geronimo.specs","geronimo-jms_2.0_spec").version("1.0-alpha-2"),
configure("activemq", "activemq-amqp-client"), // configure("activemq", "activemq-amqp-client"), //
configureBrokerStart() configureBrokerStart()
}; };

1
activemq-karaf/src/main/resources/features.xml
View File

@ -66,6 +66,7 @@
<bundle>mvn:io.netty/netty-codec/${qpid-jms-netty-version}</bundle> <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-codec-http/${qpid-jms-netty-version}</bundle>
<bundle>mvn:io.netty/netty-handler/${netty-all-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/proton-j/${qpid-jms-proton-version}</bundle>
<bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-version}</bundle> <bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-version}</bundle>
</feature> </feature>