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/09/09 14:19:01 UTC
[08/14] camel git commit: CAMEL-11756: camel-spring-boot2 - Work in
progress
CAMEL-11756: camel-spring-boot2 - Work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5990d2f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5990d2f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5990d2f
Branch: refs/heads/boot2
Commit: c5990d2f1a2505577a8258b5378cfb91d37aa7be
Parents: cb70f53
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 9 13:44:50 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 9 13:44:50 2017 +0200
----------------------------------------------------------------------
components/camel-spring-boot/pom.xml | 7 ++++---
components/camel-spring-boot2/pom.xml | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c5990d2f/components/camel-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index a6090c4..b5d1e8f 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -43,20 +43,20 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <optional>true</optional>
<version>${spring-boot-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
<version>${spring-boot-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>
- <optional>true</optional>
<version>${spring-boot-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -73,6 +73,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot-version}</version>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c5990d2f/components/camel-spring-boot2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot2/pom.xml b/components/camel-spring-boot2/pom.xml
index b8c0898..59762aa 100644
--- a/components/camel-spring-boot2/pom.xml
+++ b/components/camel-spring-boot2/pom.xml
@@ -39,6 +39,7 @@
<camel.osgi.export.pkg/>
+ <!-- spring boot 2 uses newer versions of these -->
<spring-version>5.0.0.RC3</spring-version>
<jackson2-version>2.9.1</jackson2-version>
@@ -48,20 +49,20 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <optional>true</optional>
<version>${spring-boot2-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
<version>${spring-boot2-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>
- <optional>true</optional>
<version>${spring-boot2-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>