CAMEL-10222: Updated examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ccb201a2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ccb201a2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ccb201a2 Branch: refs/heads/master Commit: ccb201a2fa0827e1b008e499e0b801158ff798f3 Parents: 02d0f68 Author: Nicola Ferraro <[email protected]> Authored: Tue Sep 20 09:52:45 2016 +0200 Committer: Nicola Ferraro <[email protected]> Committed: Tue Sep 20 09:52:45 2016 +0200 ---------------------------------------------------------------------- examples/camel-example-hystrix/client/pom.xml | 6 +++++- examples/camel-example-hystrix/service1/pom.xml | 6 +++++- examples/camel-example-spring-boot-metrics/pom.xml | 6 +++++- examples/camel-example-spring-boot-starter/pom.xml | 6 +++++- examples/camel-example-spring-boot/pom.xml | 8 ++++++-- examples/camel-example-zipkin/service1/pom.xml | 6 +++++- tests/camel-itest-spring-boot/pom.xml | 2 +- .../camel/itest/springboot/ITestConfigBuilder.java | 11 +++++------ 8 files changed, 37 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-hystrix/client/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/client/pom.xml b/examples/camel-example-hystrix/client/pom.xml index e24857c..ae5164b 100644 --- a/examples/camel-example-hystrix/client/pom.xml +++ b/examples/camel-example-hystrix/client/pom.xml @@ -30,13 +30,17 @@ <name>Camel :: Example :: Hystrix :: Client</name> <description>An example showing how to use Hystrix EIP as circuit breaker in Camel routes</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <!-- import Spring-Boot and Camel BOM --> <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-hystrix/service1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/service1/pom.xml b/examples/camel-example-hystrix/service1/pom.xml index 0f1640d..344c83c 100644 --- a/examples/camel-example-hystrix/service1/pom.xml +++ b/examples/camel-example-hystrix/service1/pom.xml @@ -30,13 +30,17 @@ <name>Camel :: Example :: Hystrix :: Service 1</name> <description>An example showing how to use Hystrix EIP as circuit breaker in Camel routes</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <!-- import Spring-Boot and Camel BOM --> <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-spring-boot-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-metrics/pom.xml b/examples/camel-example-spring-boot-metrics/pom.xml index 75cad3c..a65d793 100644 --- a/examples/camel-example-spring-boot-metrics/pom.xml +++ b/examples/camel-example-spring-boot-metrics/pom.xml @@ -30,12 +30,16 @@ <name>Camel :: Example :: Spring Boot Metrics</name> <description>An example showing how to work with Camel and Spring Boot and report metrics to Graphite</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-starter/pom.xml b/examples/camel-example-spring-boot-starter/pom.xml index 7580dc5..24483f6 100644 --- a/examples/camel-example-spring-boot-starter/pom.xml +++ b/examples/camel-example-spring-boot-starter/pom.xml @@ -30,13 +30,17 @@ <name>Camel :: Example :: Spring Boot Starter</name> <description>An example showing how to work with Camel and Spring Boot using Spring Boot Starter</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <!-- import Spring-Boot and Camel BOM --> <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml index 9ab5fd7..83e6205 100644 --- a/examples/camel-example-spring-boot/pom.xml +++ b/examples/camel-example-spring-boot/pom.xml @@ -31,12 +31,16 @@ <name>Camel :: Example :: Spring Boot</name> <description>An example showing how to work with Camel and Spring Boot</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -107,7 +111,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <configuration> <mainClass>org.apache.camel.spring.boot.FatJarRouter</mainClass> </configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/examples/camel-example-zipkin/service1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-zipkin/service1/pom.xml b/examples/camel-example-zipkin/service1/pom.xml index 8b0a7c3..c42b1ef 100644 --- a/examples/camel-example-zipkin/service1/pom.xml +++ b/examples/camel-example-zipkin/service1/pom.xml @@ -30,13 +30,17 @@ <name>Camel :: Example :: Zipkin :: Service 1</name> <description>An example showing how to trace incoming and outgoing messages from Camel with Zipkin</description> + <properties> + <spring.boot-version>${spring-boot-version}</spring.boot-version> + </properties> + <!-- import Spring-Boot and Camel BOM --> <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot-version}</version> <type>pom</type> <scope>import</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/tests/camel-itest-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index 8f64e68..5622aad 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -185,7 +185,7 @@ </property> <property> <name>itest.springboot.includeTestDependencies</name> - <value>false</value> + <value>true</value> </property> <property> <name>itest.springboot.mavenOfflineResolution</name> http://git-wip-us.apache.org/repos/asf/camel/blob/ccb201a2/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java index fbb94e7..98c0e99 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java @@ -16,7 +16,6 @@ */ package org.apache.camel.itest.springboot; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.TreeSet; @@ -213,23 +212,23 @@ public class ITestConfigBuilder { } if (config.getResources() == null) { - config.setResources(Collections.<String, String>emptyMap()); + config.setResources(new HashMap<>()); } if (config.getAdditionalDependencies() == null) { - config.setAdditionalDependencies(Collections.<String>emptySet()); + config.setAdditionalDependencies(new HashSet<>()); } if (config.getMavenExclusions() == null) { - config.setMavenExclusions(Collections.<String>emptySet()); + config.setMavenExclusions(new HashSet<>()); } if (config.getJmxDisabledNames() == null) { - config.setJmxDisabledNames(Collections.<String>emptySet()); + config.setJmxDisabledNames(new HashSet<>()); } if (config.getSystemProperties() == null) { - config.setSystemProperties(Collections.<String, String>emptyMap()); + config.setSystemProperties(new HashMap<>()); } if (config.getUseCustomLog() == null) {
