You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/11/01 19:19:15 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6493
Repository: activemq
Updated Branches:
refs/heads/master a6e35a651 -> c239bf01a
https://issues.apache.org/jira/browse/AMQ-6493
Ensure the proper versions of dependencies for Qpid JMS are brought in
for the test.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c239bf01
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c239bf01
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c239bf01
Branch: refs/heads/master
Commit: c239bf01a9f643fd217ee10efc5992105694b125
Parents: a6e35a6
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Nov 1 15:18:21 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Nov 1 15:19:05 2016 -0400
----------------------------------------------------------------------
.../itest/ActiveMQAMQPBrokerFeatureTest.java | 29 ++------------------
activemq-karaf/src/main/resources/features.xml | 14 ++++++++--
pom.xml | 2 ++
3 files changed, 17 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c239bf01/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 88c1d85..5c6c85d 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
@@ -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);
http://git-wip-us.apache.org/repos/asf/activemq/blob/c239bf01/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 0765770..6b1e10b 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -20,7 +20,7 @@
<features name="activemq-${project.version}">
- <repository>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core</repository>
+ <repository>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core</repository>
<!-- Starts the broker with default configuration -->
<feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}" resolver="(obr)" start-level="50">
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq/blob/c239bf01/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10dabc9..f43bf47 100755
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,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>