You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/09/09 19:29:09 UTC
[1/2] activemq-artemis git commit: Version upgrades
Repository: activemq-artemis
Updated Branches:
refs/heads/master 909fbd720 -> abed0cd5b
Version upgrades
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/46d3f4ab
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/46d3f4ab
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/46d3f4ab
Branch: refs/heads/master
Commit: 46d3f4abcc05d6eef124e15fc840b4899988b9b5
Parents: 909fbd7
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 9 09:10:10 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 9 14:49:33 2016 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 7 +++++++
pom.xml | 22 ++++++++++----------
tests/integration-tests/pom.xml | 6 +++---
3 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46d3f4ab/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index b66b802..018e82d 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -77,6 +77,7 @@ import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.BrokerSubscriptionInfo;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.ConnectionControl;
import org.apache.activemq.command.ConnectionError;
@@ -904,6 +905,12 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
}
@Override
+ public Response processBrokerSubscriptionInfo(BrokerSubscriptionInfo brokerSubscriptionInfo) throws Exception {
+ // TBD
+ return null;
+ }
+
+ @Override
public Response processAddProducer(ProducerInfo info) throws Exception {
SessionId sessionId = info.getProducerId().getParentId();
ConnectionState cs = getState();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46d3f4ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b1ec97..b6032ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,22 +69,22 @@
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
- <activemq5-version>5.12.0</activemq5-version>
+ <activemq5-version>5.14.0</activemq5-version>
<apache.derby.version>10.11.1.1</apache.derby.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.collections.version>3.2.2</commons.collections.version>
- <fuse.mqtt.client.version>1.10</fuse.mqtt.client.version>
- <guava.version>18.0</guava.version>
+ <fuse.mqtt.client.version>1.14</fuse.mqtt.client.version>
+ <guava.version>19.0</guava.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
- <jetty.version>9.3.10.v20160621</jetty.version>
+ <jetty.version>9.4.0.M1</jetty.version>
<jgroups.version>3.6.9.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
- <netty.version>4.0.39.Final</netty.version>
- <proton.version>0.12.2</proton.version>
- <resteasy.version>3.0.17.Final</resteasy.version>
- <slf4j.version>1.7.12</slf4j.version>
- <qpid.jms.version>0.9.0</qpid.jms.version>
- <johnzon.version>0.9.4</johnzon.version>
+ <netty.version>4.0.41.Final</netty.version>
+ <proton.version>0.14.0</proton.version>
+ <resteasy.version>3.0.19.Final</resteasy.version>
+ <slf4j.version>1.7.21</slf4j.version>
+ <qpid.jms.version>0.11.0</qpid.jms.version>
+ <johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<activemq.version.versionName>${project.version}</activemq.version.versionName>
@@ -522,7 +522,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>8.0.23</version>
+ <version>8.5.5</version>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46d3f4ab/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 5dff95c..57b9171 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -28,9 +28,9 @@
<properties>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
- <karaf.version>4.0.3</karaf.version>
- <pax.exam.version>4.7.0</pax.exam.version>
- <vertx.version>2.1.2</vertx.version>
+ <karaf.version>4.0.6</karaf.version>
+ <pax.exam.version>4.9.1</pax.exam.version>
+ <vertx.version>2.1.6</vertx.version>
<vertx.testtools.version>2.0.3-final</vertx.testtools.version>
</properties>
[2/2] activemq-artemis git commit: This closes #766
Posted by cl...@apache.org.
This closes #766
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/abed0cd5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/abed0cd5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/abed0cd5
Branch: refs/heads/master
Commit: abed0cd5b931923131b7ee5c04e5b2a3289fb4d7
Parents: 909fbd7 46d3f4a
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 9 15:28:56 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 9 15:28:56 2016 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 7 +++++++
pom.xml | 22 ++++++++++----------
tests/integration-tests/pom.xml | 6 +++---
3 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------