Fix spring-boot compatibility
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6556320f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6556320f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6556320f Branch: refs/heads/master Commit: 6556320fd2fcf6c1ae57def187c3952d5caf6316 Parents: ea6747b Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Sep 25 13:14:20 2017 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Mon Sep 25 14:55:58 2017 +0200 ---------------------------------------------------------------------- components/camel-servlet/pom.xml | 1 + .../components-starter/camel-salesforce-starter/pom.xml | 4 ++++ .../src/main/resources/META-INF/spring.factories | 1 - .../spring-boot/spring-boot-dm/camel-starter-parent/pom.xml | 8 -------- platforms/spring-boot/spring-boot-dm/pom.xml | 1 - .../java/org/apache/camel/itest/springboot/ITestConfig.java | 8 +++++++- .../apache/camel/itest/springboot/ITestConfigBuilder.java | 4 ++-- .../camel/itest/springboot/util/ArquillianPackager.java | 4 ++++ 8 files changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index a80f3c5..83cde13 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -148,6 +148,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> + <version>${arquillian-version}</version> <scope>test</scope> </dependency> <!--jetty--> http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml index ce17340..a77e3eb 100644 --- a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml @@ -39,6 +39,10 @@ <artifactId>camel-salesforce</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/spring.factories ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/spring.factories index f75f320..e1b6c66 100644 --- a/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/spring.factories +++ b/platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/spring.factories @@ -15,5 +15,4 @@ ## limitations under the License. ## --------------------------------------------------------------------------- org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.camel.component.servicenow.springboot.health.ServiceNowHealthAutoConfiguration,\ org.apache.camel.component.servicenow.springboot.ServiceNowComponentAutoConfiguration http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml index 1eaf84c..31231fa 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml @@ -77,14 +77,6 @@ <scope>import</scope> </dependency> - <!-- Testing --> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>${arquillian-version}</version> - <scope>test</scope> - </dependency> - <!-- Forcing Hadoop in starters --> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/platforms/spring-boot/spring-boot-dm/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml index 6b0dff6..a9fd4d3 100644 --- a/platforms/spring-boot/spring-boot-dm/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/pom.xml @@ -59,7 +59,6 @@ <maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version> <maven-checkstyle-version>7.6.1</maven-checkstyle-version> - <arquillian-version>1.1.13.Final</arquillian-version> <hadoop2-version>2.7.2</hadoop2-version> <!-- Custom dependency required by some modules --> http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java index 611c9a0..c1d9ea8 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java @@ -25,6 +25,8 @@ import java.util.Set; */ public class ITestConfig implements Serializable { + private static final int DEFAULT_SPRING_BOOT_MAJOR_VERSION = 1; + private static final long serialVersionUID = -3641997669166217595L; private String moduleName; @@ -257,7 +259,11 @@ public class ITestConfig implements Serializable { } public Integer getSpringBootMajorVersion() { - return Integer.parseInt(springBootVersion.substring(0, 1)); + if (springBootVersion != null) { + return Integer.parseInt(springBootVersion.substring(0, 1)); + } else { + return DEFAULT_SPRING_BOOT_MAJOR_VERSION; + } } public void setSpringBootVersion(String springBootVersion) { http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/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 1b529d8..ce309ef 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 @@ -89,7 +89,7 @@ public class ITestConfigBuilder { public ITestConfigBuilder resource(String file, String dest) { if (config.getResources() == null) { - config.setResources(new HashMap<String, String>()); + config.setResources(new HashMap<>()); } config.getResources().put(file, dest); return this; @@ -97,7 +97,7 @@ public class ITestConfigBuilder { public ITestConfigBuilder dependency(String dependencyCanonicalForm) { if (config.getAdditionalDependencies() == null) { - config.setAdditionalDependencies(new HashSet<String>()); + config.setAdditionalDependencies(new HashSet<>()); } config.getAdditionalDependencies().add(dependencyCanonicalForm); return this; http://git-wip-us.apache.org/repos/asf/camel/blob/6556320f/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java index a71f9d6..8a65c78 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java @@ -543,6 +543,10 @@ public final class ArquillianPackager { private static String enforceExclusions(ITestConfig config, String dependencyXml, List<MavenDependencyExclusion> exclusions) { + if (dependencyXml.contains("<groupId>org.springframework.boot</groupId>") && dependencyXml.contains("<artifactId>spring-boot-starter")) { + return dependencyXml; + } + if (!dependencyXml.contains("<exclusions>")) { dependencyXml = dependencyXml.replace("</dependency>", "<exclusions></exclusions></dependency>"); }
