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 69276b3cea40805ad546ec971351549399c2eaec
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Mon Mar 19 17:14:33 2018 +0100

    Fix camel-itest-spring-boot 2
---
 .../camel-kubernetes-starter/pom.xml               |   4 +
 .../camel-swagger-java-starter/pom.xml             |   4 +
 .../camel-undertow-starter/pom.xml                 |   4 +
 .../apache/camel/itest/springboot/ITestConfig.java |   2 +-
 .../itest/springboot/CamelCassandraqlTest.java     |   2 +
 .../camel/itest/springboot/CamelHbaseTest.java     |   1 +
 .../camel/itest/springboot/CamelJetty9Test.java    |   2 +-
 .../itest/springboot/CamelKubernetesTest.java      |   2 +-
 .../camel/itest/springboot/CamelMongodb3Test.java  |   2 +
 .../itest/springboot/CamelMongodbGridfsTest.java   |   2 +
 .../camel/itest/springboot/CamelMongodbTest.java   |   2 +
 .../itest/springboot/CamelNetty4HttpTest.java      |   4 +-
 .../camel/itest/springboot/CamelNettyTest.java     |   2 +-
 .../itest/springboot/CamelRestSwaggerTest.java     |   2 +
 .../camel/itest/springboot/CamelRestletTest.java   |   2 +-
 .../itest/springboot/CamelSwaggerJavaTest.java     |   2 +-
 .../camel/itest/springboot/CamelUndertowTest.java  |   4 +-
 .../src/test/resources/application-pom-sb2.xml     | 112 +++++++++++++++++++++
 18 files changed, 145 insertions(+), 10 deletions(-)

diff --git 
a/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
index 8fef119..f4c0a72 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
@@ -39,6 +39,10 @@
       <artifactId>camel-kubernetes</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git 
a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
index 5e679e9..690b48b 100644
--- 
a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
+++ 
b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
@@ -39,6 +39,10 @@
       <artifactId>camel-swagger-java</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git 
a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
index 7b76421..25b6620 100644
--- a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
@@ -39,6 +39,10 @@
       <artifactId>camel-undertow</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.undertow</groupId>
+      <artifactId>undertow-servlet</artifactId>
+    </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
       <groupId>org.apache.camel</groupId>
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 c1d9ea8..c877cb9 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,7 +25,7 @@ import java.util.Set;
  */
 public class ITestConfig implements Serializable {
 
-    private static final int DEFAULT_SPRING_BOOT_MAJOR_VERSION = 1;
+    private static final int DEFAULT_SPRING_BOOT_MAJOR_VERSION = 2;
 
     private static final long serialVersionUID = -3641997669166217595L;
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java
index ae838cb..3d2aa2b 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java
@@ -37,6 +37,8 @@ public class CamelCassandraqlTest extends 
AbstractSpringBootTestSupport {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelCassandraqlTest.class))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|CassandraComponentProducerTest$|CassandraComponentBeanRefTest$|CassandraComponentConsumerTest$)")
+                .includeTestDependencies(false)
+                .unitTestsEnabled(false)
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
index 014937f..9ee57a5 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHbaseTest.java
@@ -34,6 +34,7 @@ public class CamelHbaseTest extends 
AbstractSpringBootTestSupport {
 
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
+                .dependency("log4j:log4j")
                 .module(inferModuleName(CamelHbaseTest.class))
                 .unitTestsEnabled(false)
                 .includeTestDependencies(false)
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
index 8623d89..9ad2561 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
@@ -36,7 +36,7 @@ public class CamelJetty9Test extends 
AbstractSpringBootTestSupport {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelJetty9Test.class))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|JettyHttpContentTypeTest$)")
-                .dependency("org.hibernate:hibernate-validator")
+                .dependency("org.hibernate.validator:hibernate-validator")
                 // in JettyHttpContentTypeTest the case of the encoding string 
is different in Jetty 9.3
                 .build();
     }
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKubernetesTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKubernetesTest.java
index 8fe6c8a..3d44a26 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKubernetesTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKubernetesTest.java
@@ -35,7 +35,7 @@ public class CamelKubernetesTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelKubernetesTest.class))
-                
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
+                
//.dependency(DependencyResolver.withVersion("org.hibernate.validator:hibernate-validator"))
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
index 138b696..cbb83d5 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
@@ -35,6 +35,8 @@ public class CamelMongodb3Test extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelMongodb3Test.class))
+                .includeTestDependencies(false)
+                .unitTestsEnabled(false)
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbGridfsTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbGridfsTest.java
index e7e7420..95ef63a 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbGridfsTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbGridfsTest.java
@@ -35,6 +35,8 @@ public class CamelMongodbGridfsTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelMongodbGridfsTest.class))
+                .includeTestDependencies(false)
+                .unitTestsEnabled(false)
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
index 4664e32..f54fd35 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
@@ -35,6 +35,8 @@ public class CamelMongodbTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelMongodbTest.class))
+                .includeTestDependencies(false)
+                .unitTestsEnabled(false)
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
index 0d4d87e..a0f8879 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
@@ -35,9 +35,9 @@ public class CamelNetty4HttpTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelNetty4HttpTest.class))
-                
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
+                
//.dependency(DependencyResolver.withVersion("org.hibernate.validator:hibernate-validator"))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseNettyTest$|ManagedNettyEndpointTest$|NettyMixedCaseHttpPathTest$|NettyHttpContentTypeTest$)")
-                .dependency("org.hibernate:hibernate-validator")
+                .dependency("org.hibernate.validator:hibernate-validator")
                 // removed JMX check tests and tests that nof fail singularly
                 .build();
     }
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
index 1dbee13..25e821a 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
@@ -35,7 +35,7 @@ public class CamelNettyTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelNettyTest.class))
-                
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
+                
//.dependency(DependencyResolver.withVersion("org.hibernate.validator:hibernate-validator"))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseNettyTest$)")
                 .build();
     }
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestSwaggerTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestSwaggerTest.java
index d631a15..22d6cf8 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestSwaggerTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestSwaggerTest.java
@@ -35,6 +35,8 @@ public class CamelRestSwaggerTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelRestSwaggerTest.class))
+                .unitTestsEnabled(false)
+                .includeTestDependencies(false)
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
index 0f15ca0..151f98f 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
@@ -38,7 +38,7 @@ public class CamelRestletTest extends 
AbstractSpringBootTestSupport {
                 .module(inferModuleName(CamelRestletTest.class))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|RestletConfigurationTest$)")
                 .testLibraryVersion("com.google.guava:guava", 
DependencyResolver.resolveCamelParentProperty("${google-guava-version}"))
-                .dependency("org.hibernate:hibernate-validator")
+                .dependency("org.hibernate.validator:hibernate-validator")
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSwaggerJavaTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSwaggerJavaTest.java
index 582a0c9..9bd1adc 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSwaggerJavaTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSwaggerJavaTest.java
@@ -35,7 +35,7 @@ public class CamelSwaggerJavaTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelSwaggerJavaTest.class))
-                
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
+                
//.dependency(DependencyResolver.withVersion("org.hibernate.validator:hibernate-validator"))
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
index e2cc7d8..c82ba94 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
@@ -35,9 +35,9 @@ public class CamelUndertowTest extends 
AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelUndertowTest.class))
-                
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
+                
//.dependency(DependencyResolver.withVersion("org.hibernate.validator:hibernate-validator"))
                 
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseUndertowTest$|UndertowHttpsSpringTest$)")
-                .dependency("org.hibernate:hibernate-validator")
+                .dependency("org.hibernate.validator:hibernate-validator")
                 .build();
     }
 
diff --git 
a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml 
b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
new file mode 100644
index 0000000..67eed1f
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.company</groupId>
+    <artifactId>spring-boot-application</artifactId>
+    <version>1.0</version>
+
+    <name>Spring-Boot Application</name>
+    <description>This a the base pom of spring-boot applications launched by 
the users</description>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- The two BOMs -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-spring-boot-dependencies</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>#{module}-starter</artifactId>
+        </dependency>
+
+        <!-- Required by the integration tests to run -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <!-- DEPENDENCIES -->
+
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>http://repo1.maven.org/maven2/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots</name>
+            <url>http://repository.apache.org/snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>atlassian-public</id>
+            <name>Atlassian Public</name>
+            <url>https://maven.atlassian.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+</project>

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

Reply via email to