This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/cloud-native by this push:
new b2d5e64 change pom version to 2.7.5-cloudnative-SNAPSHOT
new 20c2b1d Merge remote-tracking branch 'origin/cloud-native' into
cloud-native
b2d5e64 is described below
commit b2d5e64ca08e7ca757dfa89e7b321382d1f0830b
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Thu Aug 29 09:23:17 2019 +0800
change pom version to 2.7.5-cloudnative-SNAPSHOT
---
dubbo-all/pom.xml | 30 ++++++++++++++++++++++
dubbo-dependencies-bom/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index bbacb73..93b13d0 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -274,6 +274,16 @@
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -449,6 +459,16 @@
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -498,6 +518,16 @@
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8cd3ca8..3c5b432 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -159,7 +159,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <revision>2.7.4-SNAPSHOT</revision>
+ <revision>2.7.5-cloudnative-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 49f4a56..2fb9cf2 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.7.4-SNAPSHOT</revision>
+ <revision>2.7.5-cloudnative-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/pom.xml b/pom.xml
index e93d6eb..52d24ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<rat.skip>true</rat.skip>
- <revision>2.7.4-SNAPSHOT</revision>
+ <revision>2.7.5-cloudnative-SNAPSHOT</revision>
</properties>
<modules>
