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 2017/07/31 10:52:28 UTC
[2/4] camel git commit: align spring-cloud versions
align spring-cloud versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74f7e7b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74f7e7b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74f7e7b0
Branch: refs/heads/master
Commit: 74f7e7b00a14b6aa4063bd39d623ef3849c51d6d
Parents: 4af3604
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 31 12:44:56 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 31 12:44:56 2017 +0200
----------------------------------------------------------------------
components/camel-spring-cloud-netflix/pom.xml | 5 +++++
components/camel-spring-cloud/pom.xml | 5 +++++
parent/pom.xml | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/components/camel-spring-cloud-netflix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml
index e5327a5..cc10d14 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ <version>${spring-cloud-commons-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<version>${spring-cloud-netflix-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/components/camel-spring-cloud/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml
index 7b39607..d9faf51 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -47,6 +47,11 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ <version>${spring-cloud-commons-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
<version>${spring-cloud-commons-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/74f7e7b0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6d7ab4d..a1f198f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -611,8 +611,9 @@
<spring-batch-version>3.0.8.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.5.6.RELEASE</spring-boot-version>
+ <!-- use same version of spring-cloud 1.x. -->
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
- <spring-cloud-netflix-version>1.3.2.RELEASE</spring-cloud-netflix-version>
+ <spring-cloud-netflix-version>1.2.7.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.11.6.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.8.6.RELEASE</spring-data-redis-version>