Repository: qpid-jms Updated Branches: refs/heads/master 21df136af -> 86594f612
QPIDJMS-200 Update to ActiveMQ 5.14.0 and enable WebSocket tests Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/86594f61 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/86594f61 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/86594f61 Branch: refs/heads/master Commit: 86594f6129c646358bc0c4db8fa5cf4204aff99c Parents: 21df136 Author: Timothy Bish <[email protected]> Authored: Mon Aug 8 10:42:27 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Mon Aug 8 10:42:27 2016 -0400 ---------------------------------------------------------------------- pom.xml | 2 +- .../src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java | 2 -- .../src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/86594f61/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd268d0..7a7d695 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ <slf4j-version>1.7.21</slf4j-version> <geronimo-jms-1-1-spec-version>1.1.1</geronimo-jms-1-1-spec-version> <!-- Test Dependency Versions for this Project --> - <activemq-version>5.13.4</activemq-version> + <activemq-version>5.14.0</activemq-version> <junit-version>4.12</junit-version> <fuse-joram-tests-version>1.0</fuse-joram-tests-version> <jetty-version>9.2.13.v20150730</jetty-version> http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/86594f61/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java index eaa30dd..c362c33 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java @@ -28,7 +28,6 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory; /** * Test connections can be established to remote peers via WebSockets */ -@Ignore("Until a release with WS support for AMQP is ready") public class JmsWSConnectionTest { protected static final Logger LOG = LoggerFactory.getLogger(JmsWSConnectionTest.class); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/86594f61/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java index 022d40c..4e3b183 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSSConnectionTest.java @@ -32,7 +32,6 @@ import org.apache.qpid.jms.transports.TransportSslOptions; import org.apache.qpid.jms.transports.TransportSupport; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +39,6 @@ import org.slf4j.LoggerFactory; /** * Test connections can be established to remote peers via secure WebSockets */ -@Ignore("Until a release with WS support for AMQP is ready") public class JmsWSSConnectionTest { protected static final Logger LOG = LoggerFactory.getLogger(JmsWSSConnectionTest.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
