You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/14 06:57:40 UTC
[camel] branch master updated: Fixed falining springboot iTests.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d20d1e2 Fixed falining springboot iTests.
d20d1e2 is described below
commit d20d1e2f6cb7fdae0a658e74f9997ef31f011f85
Author: Andrea Tarocchi <at...@redhat.com>
AuthorDate: Fri Dec 14 00:13:24 2018 +0100
Fixed falining springboot iTests.
---
bom/camel-bom/pom.xml | 5 +++++
components/pom.xml | 2 +-
parent/pom.xml | 5 +++++
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +++++
tests/camel-itest-spring-boot/pom.xml | 2 +-
.../test/java/org/apache/camel/itest/springboot/CamelBamTest.java | 1 +
.../org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java | 3 ++-
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 1 +
8 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 5baba0d..2d40332 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2830,6 +2830,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-websocket-jsr356-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-websocket-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/pom.xml b/components/pom.xml
index 4175334..21e5e80 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -319,6 +319,7 @@
<module>camel-weather</module>
<module>camel-web3j</module>
<module>camel-websocket</module>
+ <module>camel-websocket-jsr356</module>
<module>camel-wordpress</module>
<module>camel-xchange</module>
<module>camel-xmlbeans</module>
@@ -334,7 +335,6 @@
<module>camel-zipkin</module>
<module>camel-zookeeper</module>
<module>camel-zookeeper-master</module>
- <module>camel-websocket-jsr356</module>
</modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 73b1af0..a33aef1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3725,6 +3725,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-websocket-jsr356-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-web3j-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index b86946c..3521797 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3055,6 +3055,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-websocket-jsr356-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-websocket-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml
index 89d4386..75e8add 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -204,7 +204,7 @@
</property>
<property>
<name>itest.springboot.includeTestDependencies</name>
- <value>true</value>
+ <value>false</value>
</property>
<property>
<name>itest.springboot.mavenOfflineResolution</name>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelBamTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelBamTest.java
index a4a6067..3c3404d 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelBamTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelBamTest.java
@@ -37,6 +37,7 @@ public class CamelBamTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelBamTest.class))
.resource("components/bam-persistence.xml", "META-INF/persistence.xml")
.resource("components/bam-spring.xml", "META-INF/spring/spring.xml")
+ .dependency("org.apache.derby:derby")
.build();
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
index 9956591..0ae89e4 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
@@ -35,12 +35,13 @@ public class CamelWebsocketJsr356Test extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelWebsocketJsr356Test.class))
+ .dependency("org.springframework.boot:spring-boot-starter-websocket")
.build();
}
@Test
public void componentTests() throws Exception {
- this.runComponentTest(createTestConfig(), "websocket-jsr356");
+ this.runComponentTest(config);
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 2e189ef..827abb1 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
@@ -348,6 +348,7 @@ public final class ArquillianPackager {
ignore.add("org.jboss.logging");
ignore.add("org.jboss.marshalling");
ignore.add("org.jgroups:jgroups-raft");
+ ignore.add("net.sourceforge.htmlunit:htmlunit-cssparser");
Map<String, Map<String, String>> status = new TreeMap<>();
Set<String> mismatches = new TreeSet<>();