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/01/07 09:25:57 UTC
[camel] branch boot2 updated: update to spring boot 2 M7 and spring
5 release
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch boot2
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/boot2 by this push:
new 082fb5a update to spring boot 2 M7 and spring 5 release
082fb5a is described below
commit 082fb5aa0ef9b1249d7b3793bff0d632b89af74c
Author: Benoit Meriaux <bm...@octo.com>
AuthorDate: Sat Jan 6 16:12:29 2018 +0100
update to spring boot 2 M7 and spring 5 release
---
components/camel-spring-boot2/pom.xml | 2 +-
.../boot/actuate/endpoint/CamelRouteControllerEndpoint.java | 3 +--
.../spring/boot/actuate/endpoint/CamelRoutesEndpoint.java | 3 +--
pom.xml | 10 +++++-----
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/components/camel-spring-boot2/pom.xml b/components/camel-spring-boot2/pom.xml
index 94e8ecc..4e93dde 100644
--- a/components/camel-spring-boot2/pom.xml
+++ b/components/camel-spring-boot2/pom.xml
@@ -43,7 +43,7 @@
<camel.osgi.export.pkg/>
<!-- spring boot 2 uses newer versions of these -->
- <spring-version>5.0.0.RC3</spring-version>
+ <spring-version>${spring5-version}</spring-version>
<jackson2-version>2.9.1</jackson2-version>
</properties>
diff --git a/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java b/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
index 16e21d0..3e5d11f 100644
--- a/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
+++ b/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.boot.actuate.endpoint;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.spi.RouteController;
-import org.springframework.boot.actuate.endpoint.DefaultEnablement;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
@@ -30,7 +29,7 @@ import java.util.stream.Collectors;
/**
* {@link Endpoint} to expose {@link RouteController} information.
*/
-@Endpoint(id = "camelroutecontroller", defaultEnablement = DefaultEnablement.ENABLED)
+@Endpoint(id = "camelroutecontroller", enableByDefault = true)
public class CamelRouteControllerEndpoint {
private CamelContext camelContext;
diff --git a/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index cf95354..dc90045 100644
--- a/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++ b/components/camel-spring-boot2/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -25,7 +25,6 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.StatefulService;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.spi.RouteError;
-import org.springframework.boot.actuate.endpoint.DefaultEnablement;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.Selector;
@@ -40,7 +39,7 @@ import java.util.stream.Collectors;
/**
* {@link Endpoint} to expose {@link org.apache.camel.Route} information.
*/
-@Endpoint(id = "camelroutes", defaultEnablement = DefaultEnablement.ENABLED)
+@Endpoint(id = "camelroutes", enableByDefault = true)
public class CamelRoutesEndpoint {
private CamelContext camelContext;
diff --git a/pom.xml b/pom.xml
index ec755a7..49a8cf1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -521,7 +521,7 @@
<minimal-json-version>0.9.4</minimal-json-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>0.0.15</mockwebserver-version>
- <mockito-version>1.10.19</mockito-version>
+ <mockito-version>2.12.0</mockito-version>
<mongo-java-driver-version>3.5.0</mongo-java-driver-version>
<mongo-java-driver32-version>3.2.2</mongo-java-driver32-version>
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
@@ -650,7 +650,7 @@
<spring-batch-bundle-version>3.0.8.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.5.7.RELEASE</spring-boot-version>
<spring-boot1-version>1.5.7.RELEASE</spring-boot1-version>
- <spring-boot2-version>2.0.0.M4</spring-boot2-version>
+ <spring-boot2-version>2.0.0.M7</spring-boot2-version>
<!-- use same version of spring-cloud 1.2.x -->
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.3.4.RELEASE</spring-cloud-netflix-version>
@@ -677,7 +677,7 @@
<spring42-version>4.2.9.RELEASE</spring42-version>
<spring43-version>4.3.10.RELEASE</spring43-version>
<spring4-version>4.3.10.RELEASE</spring4-version>
- <spring5-version>5.0.0.RC4</spring5-version>
+ <spring5-version>5.0.2.RELEASE</spring5-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>4.2.3.RELEASE</spring-security-version>
<spring-security-bundle-version>4.2.3.RELEASE_1</spring-security-bundle-version>
@@ -1524,8 +1524,8 @@
<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>
+ <spring-cloud-commons-version>2.0.0.M5</spring-cloud-commons-version>
+ <spring-cloud-netflix-version>2.0.0.M5</spring-cloud-netflix-version>
</properties>
<repositories>
<repository>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].