[servicecomb-pack] branch master updated: SCB-1541 Set the dependency of OpenFeign core scope to be provided (#579)

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e1d885  SCB-1541 Set the dependency of OpenFeign core scope to be provided (#579)
2e1d885 is described below

commit 2e1d885197e97db78ce0a5a2dfce22a80bc313fd
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Tue Oct 22 22:29:31 2019 +0800

    SCB-1541 Set the dependency of OpenFeign core scope to be provided (#579)
---
 omega/omega-transport/omega-transport-feign/pom.xml | 4 +++-
 pom.xml                                             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/omega/omega-transport/omega-transport-feign/pom.xml b/omega/omega-transport/omega-transport-feign/pom.xml
index bf232ab..9d91cc3 100644
--- a/omega/omega-transport/omega-transport-feign/pom.xml
+++ b/omega/omega-transport/omega-transport-feign/pom.xml
@@ -32,7 +32,9 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>9.5.1</version>
+            <version>${openfeign.version}</version>
+            <!-- here we don't specify the feign version, it should work with feign runtime -->
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 8690733..b79c2f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
     <zookeeper.version>3.4.13</zookeeper.version>
     <kafka.version>2.1.1</kafka.version>
     <hystrix.version>1.5.12</hystrix.version>
+    <openfeign.version>9.5.1</openfeign.version>
   </properties>
 
   <name>ServiceComb Saga</name>