You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/04/11 08:14:37 UTC

[camel] 25/41: Align spring-cloud-commons, spring-cloud-netflix and spring-cloud-consul version with Finchley.M9 release train

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7aa10ad0c2536e07aa1e996b554faee354dec56e
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Mon Mar 26 09:09:16 2018 -0400

    Align spring-cloud-commons, spring-cloud-netflix and spring-cloud-consul version with Finchley.M9 release train
---
 components/camel-spring-cloud-netflix/pom.xml              | 14 +++++++++-----
 components/camel-spring-cloud/pom.xml                      |  8 ++++----
 .../consumer/pom.xml                                       |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml
index a219782..c2a1b6a 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -38,9 +38,8 @@
 
     <camel.osgi.export.pkg/>
 
-    <spring-cloud-commons-version>2.0.0.M7</spring-cloud-commons-version>
-    <spring-cloud-netflix-version>2.0.0.M7</spring-cloud-netflix-version>
-    <spring-cloud-ribbon-version>2.0.0.M2</spring-cloud-ribbon-version>
+    <spring-cloud-commons-version>2.0.0.M9</spring-cloud-commons-version>
+    <spring-cloud-netflix-version>2.0.0.M8</spring-cloud-netflix-version>
   </properties>
 
   <!-- spring-cloud with support for spring boot 2 is not in maven central yet -->
@@ -68,6 +67,11 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-netflix-ribbon</artifactId>
+      <version>${spring-cloud-netflix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-netflix-core</artifactId>
       <version>${spring-cloud-netflix-version}</version>
     </dependency>
@@ -132,8 +136,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-ribbon</artifactId>
-      <version>${spring-cloud-ribbon-version}</version>
+      <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+      <version>${spring-cloud-netflix-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml
index b8a48d1..74b1281 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -38,8 +38,8 @@
 
     <camel.osgi.export.pkg/>
 
-    <spring-cloud-commons-version>2.0.0.M7</spring-cloud-commons-version>
-    <spring-cloud-ribbon-version>2.0.0.M2</spring-cloud-ribbon-version>
+    <spring-cloud-commons-version>2.0.0.M9</spring-cloud-commons-version>
+    <spring-cloud-netflix-version>2.0.0.M8</spring-cloud-netflix-version>
   </properties>
 
   <!-- spring-cloud with support for spring boot 2 is not in maven central yet -->
@@ -122,8 +122,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-ribbon</artifactId>
-      <version>${spring-cloud-ribbon-version}</version>
+      <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+      <version>${spring-cloud-netflix-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index 202b7f8..889526b 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -39,7 +39,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <spring.boot-version>${spring-boot-version}</spring.boot-version>
-    <spring.cloud-version>2.0.0.M6</spring.cloud-version>
+    <spring.cloud-version>2.0.0.M7</spring.cloud-version>
   </properties>
 
   <dependencyManagement>

-- 
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.