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 9b520d78a55858000848997eaa89abd7bc859be0 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Mar 19 09:25:15 2018 +0100 CAMEL-11430: Migrate to Spring Boot 2 - work in progress --- components/camel-spring-cloud-netflix/pom.xml | 18 +++++++++++++++++- components/camel-spring-cloud/pom.xml | 17 ++++++++++++++++- .../spring/cloud/CamelSpringCloudDiscoveryClient.java | 2 +- .../camel-spring-cloud-netflix-starter/pom.xml | 12 ++++++++++++ .../camel-spring-cloud-starter/pom.xml | 12 ++++++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml index 58c9df3..a219782 100644 --- a/components/camel-spring-cloud-netflix/pom.xml +++ b/components/camel-spring-cloud-netflix/pom.xml @@ -37,8 +37,24 @@ <label>spring,microservice</label> <camel.osgi.export.pkg/> + + <spring-cloud-commons-version>2.0.0.M7</spring-cloud-commons-version> + <spring-cloud-netflix-version>2.0.0.M7</spring-cloud-netflix-version> + <spring-cloud-ribbon-version>2.0.0.M2</spring-cloud-ribbon-version> </properties> + <!-- spring-cloud with support for spring boot 2 is not in maven central yet --> + <repositories> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/libs-milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -117,7 +133,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-ribbon</artifactId> - <version>${spring-cloud-netflix-version}</version> + <version>${spring-cloud-ribbon-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml index d5fc9e3..b8a48d1 100644 --- a/components/camel-spring-cloud/pom.xml +++ b/components/camel-spring-cloud/pom.xml @@ -37,8 +37,23 @@ <label>spring,microservice</label> <camel.osgi.export.pkg/> + + <spring-cloud-commons-version>2.0.0.M7</spring-cloud-commons-version> + <spring-cloud-ribbon-version>2.0.0.M2</spring-cloud-ribbon-version> </properties> + <!-- spring-cloud with support for spring boot 2 is not in maven central yet --> + <repositories> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/libs-milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -108,7 +123,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-ribbon</artifactId> - <version>${spring-cloud-netflix-version}</version> + <version>${spring-cloud-ribbon-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java index ee4aee4..725a986 100644 --- a/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java +++ b/components/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java @@ -45,7 +45,7 @@ public class CamelSpringCloudDiscoveryClient implements DiscoveryClient { return description; } - @Override + @Deprecated public ServiceInstance getLocalServiceInstance() { return this.localInstance; } diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml index 71f342a..59de1f4 100644 --- a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml @@ -58,4 +58,16 @@ </dependency> <!--END OF GENERATED CODE--> </dependencies> + <!--START OF GENERATED CODE--> + <repositories> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/libs-milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <!--END OF GENERATED CODE--> </project> diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml index 6027461..4421e92 100644 --- a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml @@ -50,4 +50,16 @@ </dependency> <!--END OF GENERATED CODE--> </dependencies> + <!--START OF GENERATED CODE--> + <repositories> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/libs-milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <!--END OF GENERATED CODE--> </project> -- To stop receiving notification emails like this one, please contact [email protected].
