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 03779d8fd2a18b2f284873e2331139dcdf8c6975
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Mar 17 16:31:49 2018 +0100
CAMEL-11430: Migrate to Spring Boot 2 - work in progress
---
components/camel-spring-boot/pom.xml | 4 +---
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/components/camel-spring-boot/pom.xml
b/components/camel-spring-boot/pom.xml
index 8d57400..3f94497 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -37,8 +37,6 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
- <!-- spring boot 1 uses spring 4 -->
- <spring-version>${spring4-version}</spring-version>
</properties>
<dependencies>
@@ -56,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator</artifactId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
<optional>true</optional>
<version>${spring-boot-version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index a8375e7..bccb2b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -636,7 +636,7 @@
<splunk-version>1.6.4.0_1</splunk-version>
<spring-batch-version>3.0.9.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.8.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>1.5.11.RELEASE</spring-boot-version>
+ <spring-boot-version>2.0.0.RELEASE</spring-boot-version>
<!-- use same version of spring-cloud 1.3.x -->
<spring-cloud-commons-version>1.3.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.4.4.RELEASE</spring-cloud-netflix-version>
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
