camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/4] camel git commit: CAMEL-11769: camel-spring-cloud to work with Spring Boot 2 as we need to use spring cloud 2.x
Date Mon, 11 Sep 2017 18:01:28 GMT
Repository: camel
Updated Branches:
  refs/heads/boot2 1ce30623f -> 36220ef46


CAMEL-11769: camel-spring-cloud to work with Spring Boot 2 as we need to use spring cloud
2.x


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

Branch: refs/heads/boot2
Commit: 65919b6d4ddcbce5026fe9892bafa338d4af920d
Parents: 1ce3062
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Sep 11 18:50:22 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Sep 11 18:50:22 2017 +0200

----------------------------------------------------------------------
 components/camel-spring-cloud-netflix/pom.xml       |  6 ++++++
 parent/pom.xml                                      |  4 ++++
 .../spring-boot-dm/camel-starter-parent/pom.xml     | 16 ++++++++++++----
 3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/65919b6d/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 cc10d14..e524ba6 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -121,6 +121,12 @@
       <version>${spring-boot-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>${rxjava-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/camel/blob/65919b6d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3f8121c..2391134 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5364,9 +5364,13 @@
     <profile>
       <id>spring-boot2</id>
       <properties>
+        <!-- spring-boot -->
         <spring-boot-version>${spring-boot2-version}</spring-boot-version>
         <spring-version>${spring5-version}</spring-version>
         <jackson2-version>2.9.1</jackson2-version>
+        <!-- spring-cloud -->
+        <spring-cloud-commons-version>2.0.0.M2</spring-cloud-commons-version>
+        <spring-cloud-netflix-version>2.0.0.M2</spring-cloud-netflix-version>
       </properties>
        <repositories>
         <repository>

http://git-wip-us.apache.org/repos/asf/camel/blob/65919b6d/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
index 74eb462..523f511 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
@@ -34,8 +34,13 @@
   <name>Camel :: Platforms :: Spring-Boot :: Dependency Management :: Starter Parent</name>
 
   <properties>
-    <spring-boot2-version>2.0.0.M3</spring-boot2-version>
-    <spring5-version>5.0.0.RC3</spring5-version>
+    <!-- spring-boot -->
+    <spring-boot-version>2.0.0.M3</spring-boot-version>
+    <spring-version>5.0.0.RC3</spring-version>
+    <jackson2-version>2.9.1</jackson2-version>
+    <!-- spring-cloud -->
+    <spring-cloud-commons-version>2.0.0.M2</spring-cloud-commons-version>
+    <spring-cloud-netflix-version>2.0.0.M2</spring-cloud-netflix-version>
   </properties>
 
   <dependencies>
@@ -180,9 +185,12 @@
     <profile>
       <id>spring-boot2</id>
       <properties>
-        <spring-boot-version>${spring-boot2-version}</spring-boot-version>
-        <spring-version>${spring5-version}</spring-version>
+        <spring-boot-version>2.0.0.M3</spring-boot-version>
+        <spring-version>5.0.0.RC3</spring-version>
         <jackson2-version>2.9.1</jackson2-version>
+        <!-- spring-cloud -->
+        <spring-cloud-commons-version>2.0.0.M2</spring-cloud-commons-version>
+        <spring-cloud-netflix-version>2.0.0.M2</spring-cloud-netflix-version>
       </properties>
        <repositories>
         <repository>


Mime
View raw message