You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sh...@apache.org on 2017/12/26 01:07:39 UTC

ignite git commit: IGNITE-7296: Update RocketMQ dependencies to 4.2.0. - Fixes #3281.

Repository: ignite
Updated Branches:
  refs/heads/master a0c197bdf -> 69493158d


IGNITE-7296: Update RocketMQ dependencies to 4.2.0. - Fixes #3281.

Signed-off-by: shroman <rs...@yahoo.com>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69493158
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69493158
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69493158

Branch: refs/heads/master
Commit: 69493158d1bfa31b248c15abce0a677b401810cb
Parents: a0c197b
Author: shroman <rs...@yahoo.com>
Authored: Tue Dec 26 10:07:29 2017 +0900
Committer: shroman <rs...@yahoo.com>
Committed: Tue Dec 26 10:07:29 2017 +0900

----------------------------------------------------------------------
 modules/rocketmq/pom.xml | 16 +++++++++++++++-
 parent/pom.xml           |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/69493158/modules/rocketmq/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rocketmq/pom.xml b/modules/rocketmq/pom.xml
index ca47620..9e63109 100644
--- a/modules/rocketmq/pom.xml
+++ b/modules/rocketmq/pom.xml
@@ -20,7 +20,8 @@
 <!--
     POM file.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -43,8 +44,15 @@
 
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>${rocketmq.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-namesrv</artifactId>
             <version>${rocketmq.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -52,6 +60,12 @@
             <artifactId>rocketmq-broker</artifactId>
             <version>${rocketmq.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-tcnative</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/69493158/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 97983dd..9b2386f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -95,7 +95,7 @@
         <osgi.core.version>5.0.0</osgi.core.version>
         <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
         <paho.version>1.0.2</paho.version>
-        <rocketmq.version>4.1.0-incubating</rocketmq.version>
+        <rocketmq.version>4.2.0</rocketmq.version>
         <scala210.jline.version>2.10.4</scala210.jline.version>
         <scala210.library.version>2.10.4</scala210.library.version>
         <scala211.library.version>2.11.7</scala211.library.version>