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

https://issues.apache.org/jira/browse/AMQ-6493 

Ensure the proper versions of dependencies for Qpid JMS are brought in
for the test.
(cherry picked from commit c239bf01a9)
This commit is contained in:
Timothy Bish 2016-11-01 15:18:21 -04:00
parent fc3206864d
commit 0c280fed60
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/**
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@ -23,12 +23,10 @@ import java.util.concurrent.Callable;
import javax.jms.Connection;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@ -38,44 +36,23 @@ public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest {
@Configuration
public static Option[] configure() {
Option[] configure = configure("activemq");
Option[] configure = configure("activemq", "activemq-amqp-client");
Option[] configuredOptions = configureBrokerStart(configure);
return configuredOptions;
}
@Before
public void setUpBundle() {
installWrappedBundle(CoreOptions.wrappedBundle(CoreOptions.mavenBundle(
"io.netty", "netty-all").version(
getArtifactVersion("io.netty", "netty-all")).getURL().toString()
+ "$Bundle-SymbolicName=qpid-jms-client"));
installWrappedBundle(CoreOptions.wrappedBundle(CoreOptions.mavenBundle(
"org.apache.qpid", "proton-j").version(
getArtifactVersion("org.apache.qpid", "proton-j")).getURL()));
installWrappedBundle(CoreOptions.wrappedBundle(CoreOptions.mavenBundle(
"org.apache.qpid", "qpid-jms-client").version(
getArtifactVersion("org.apache.qpid", "qpid-jms-client")).getURL()));
}
@Override
protected Connection getConnection() throws Throwable {
setUpBundle();
withinReason(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
assertTrue("qpid jms client bundle installed", verifyBundleInstalled("qpid-jms-client"));
assertTrue("qpid jms client bundle installed", verifyBundleInstalled("org.apache.qpid.jms.client"));
return true;
}
});
String amqpURI = "amqp://localhost:" + AMQP_PORT;
JmsConnectionFactory factory = new JmsConnectionFactory(amqpURI);

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

@ -59,5 +59,15 @@
<bundle>mvn:org.apache.activemq/activemq-blueprint/${project.version}</bundle>
</feature>
</features>
<feature name="activemq-amqp-client" version="${pom.version}" description="ActiveMQ AMQP protocol client libraries">
<bundle>mvn:io.netty/netty-common/${qpid-jms-netty-version}</bundle>
<bundle>mvn:io.netty/netty-transport/${qpid-jms-netty-version}</bundle>
<bundle>mvn:io.netty/netty-buffer/${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-handler/${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>
</features>

2
pom.xml
View File

@ -103,6 +103,8 @@
<zookeeper-version>3.4.6</zookeeper-version>
<qpid-proton-version>0.15.0</qpid-proton-version>
<qpid-jms-version>0.11.1</qpid-jms-version>
<qpid-jms-netty-version>4.0.41.Final</qpid-jms-netty-version>
<qpid-jms-proton-version>0.14.0</qpid-jms-proton-version>
<netty-all-version>4.0.41.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
<rome-version>1.0</rome-version>