This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 076176fd718037f0088a385dff4ebfd91edf0ebf
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Feb 16 13:03:25 2018 +0100
CAMEL-11874: fix spring-boot integration tests
---
platforms/spring-boot/spring-boot-dm/pom.xml | 5 +----
.../org/apache/camel/itest/springboot/CamelInfinispanTest.java | 2 --
.../java/org/apache/camel/itest/springboot/CamelMongodb3Test.java | 2 +-
.../java/org/apache/camel/itest/springboot/CamelMongodbTest.java | 2 +-
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 7 +++++++
.../org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 1 +
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml
b/platforms/spring-boot/spring-boot-dm/pom.xml
index f948bb9..1aa9553 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -55,10 +55,7 @@
<hadoop2-version>2.7.4</hadoop2-version>
<infinispan-spring-boot-version>1.0.0.Final</infinispan-spring-boot-version>
<cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
- <!--<scala-version>2.11.7</scala-version>-->
- <!--<scalaxml-version>1.0.6</scalaxml-version>-->
-
<!--<cassandra-netty-version-testing>4.0.44.Final</cassandra-netty-version-testing>-->
- <!--<groovy-version>2.4.13</groovy-version>-->
+ <groovy-version>2.4.13</groovy-version>
<!-- Plugin versions -->
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
index 8b0d368..838f741 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
@@ -37,8 +37,6 @@ public class CamelInfinispanTest extends
AbstractSpringBootTestSupport {
return new ITestConfigBuilder()
.module(inferModuleName(CamelInfinispanTest.class))
.disableJmx("org.infinispan:*")
- // arquillian fails, but the tests pass
- .dependency("org.apache.logging.log4j:log4j-jcl:" +
DependencyResolver.resolveParentProperty("${log4j2-version}"))
.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 4de6287..138b696 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
@@ -40,7 +40,7 @@ public class CamelMongodb3Test extends
AbstractSpringBootTestSupport {
@Test
public void componentTests() throws Exception {
- this.runComponentTest(config);
+ // no component test
this.runModuleUnitTestsIfEnabled(config);
}
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 5dbeeb5..4664e32 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
@@ -40,7 +40,7 @@ public class CamelMongodbTest extends
AbstractSpringBootTestSupport {
@Test
public void componentTests() throws Exception {
- this.runComponentTest(config);
+ // no component test
this.runModuleUnitTestsIfEnabled(config);
}
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 8a65c78..86734f6 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
@@ -152,6 +152,7 @@ public final class ArquillianPackager {
commonExclusions.add(MavenDependencies.createExclusion("log4j",
"log4j"));
commonExclusions.add(MavenDependencies.createExclusion("log4j",
"log4j-slf4j-impl"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j"));
+
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-jcl"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-core"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j",
"log4j-slf4j-impl"));
commonExclusions.add(MavenDependencies.createExclusion("log4j",
"apache-log4j-extras"));
@@ -308,6 +309,11 @@ public final class ArquillianPackager {
ignore.add("org.apache.curator");
ignore.add("org.apache.cxf:cxf-api");
ignore.add("org.apache.geronimo.specs");
+ ignore.add("org.apache.flink:flink-shaded-asm");
+ ignore.add("org.apache.flink:flink-shaded-guava");
+ ignore.add("org.apache.flink:flink-shaded-jackson");
+ ignore.add("org.apache.flink:flink-shaded-netty");
+ ignore.add("org.apache.logging.log4j:log4j-jcl");
ignore.add("org.apache.maven");
ignore.add("org.apache.parquet");
ignore.add("org.apache.velocity");
@@ -322,6 +328,7 @@ public final class ArquillianPackager {
ignore.add("org.scala-lang:scala-compiler");
ignore.add("org.easytesting");
ignore.add("net.openhft");
+ ignore.add("org.scala-lang.modules:scala-java8-compat_2.11");
ignore.add("net.sourceforge.htmlunit:htmlunit-core-js"); // v 2.21
does not exist
ignore.add("org.springframework.cloud"); // too many different versions
ignore.add("org.springframework.data");
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 7b4bb84..4b94e2f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -320,6 +320,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
loggingImpl.add("ch.qos.logback:logback-classic");
loggingImpl.add("org.apache.logging.log4j:log4j");
+ loggingImpl.add("org.apache.logging.log4j:log4j-jcl");
loggingImpl.add("org.apache.logging.log4j:log4j-core");
loggingImpl.add("org.apache.logging.log4j:log4j-slf4j-impl");
--
To stop receiving notification emails like this one, please contact
nferr...@apache.org.
