You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2016/09/21 07:19:56 UTC
[37/49] camel git commit: CAMEL-10222: Fixing scala and servlet
starters
CAMEL-10222: Fixing scala and servlet starters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc44cce2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc44cce2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc44cce2
Branch: refs/heads/master
Commit: fc44cce212ff267a75448138d6f572a6f0e27488
Parents: 2292d2d
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Fri Sep 9 13:29:48 2016 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Sep 20 00:40:32 2016 +0200
----------------------------------------------------------------------
components-starter/camel-scala-starter/pom.xml | 10 ++++
.../camel-servletlistener-starter/pom.xml | 4 ++
spring-boot-dm/pom.xml | 2 +
tests/camel-itest-spring-boot/pom.xml | 55 ++++++++++++++++++--
.../itest/springboot/CamelServletTest.java | 2 +-
.../spring-boot-fix-dependencies.properties | 5 ++
6 files changed, 72 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/components-starter/camel-scala-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-scala-starter/pom.xml b/components-starter/camel-scala-starter/pom.xml
index 0709e69..c54373b 100644
--- a/components-starter/camel-scala-starter/pom.xml
+++ b/components-starter/camel-scala-starter/pom.xml
@@ -45,6 +45,16 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <version>${scalaxml-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala-version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/components-starter/camel-servletlistener-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-servletlistener-starter/pom.xml b/components-starter/camel-servletlistener-starter/pom.xml
index b12b2d6..944dce8 100644
--- a/components-starter/camel-servletlistener-starter/pom.xml
+++ b/components-starter/camel-servletlistener-starter/pom.xml
@@ -38,6 +38,10 @@
<artifactId>camel-servletlistener</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-starter</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/spring-boot-dm/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/pom.xml b/spring-boot-dm/pom.xml
index 444c699..93318e8 100644
--- a/spring-boot-dm/pom.xml
+++ b/spring-boot-dm/pom.xml
@@ -55,6 +55,8 @@
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
<geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
<lucene3-version>3.6.0</lucene3-version>
+ <scala-version>2.11.7</scala-version>
+ <scalaxml-version>1.0.4</scalaxml-version>
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
<maven-checkstyle-version>6.17</maven-checkstyle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/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 7b074ac..bec1d65 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -150,11 +150,56 @@
<rerunFailingTestsCount>1</rerunFailingTestsCount>
<includes>
<include>**/*Test.java</include>
+
+ <!-- Modules to verify -->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelAhcTest</include> fail-->
+ <!--<include>org.apache.camel.itest.springboot.CamelApnsTest</include> fail-->
+
+
+ <!--<include>org.apache.camel.itest.springboot.CamelCacheTest</include> 1-->
+ <!--<include>org.apache.camel.itest.springboot.CamelConsulTest</include> 5-->
+ <!--<include>org.apache.camel.itest.springboot.CamelHttp4Test</include> 1-->
+ <!--<include>org.apache.camel.itest.springboot.CamelIbatisTest</include> 32-->
+ <!--<include>org.apache.camel.itest.springboot.CamelJgroupsTest</include> 6-->
+ <!--<include>org.apache.camel.itest.springboot.CamelJibxTest</include> 6-->
+ <!--<include>org.apache.camel.itest.springboot.CamelJpaTest</include> 5/56-->
+ <!--<include>org.apache.camel.itest.springboot.CamelMailTest</include> 1-->
+ <!--<include>org.apache.camel.itest.springboot.CamelMybatisTest</include> 30-->
+ <!--<include>org.apache.camel.itest.springboot.CamelQuartzTest</include> 7-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelRestletTest</include> 3-->
+
+
+
+ <!--<include>org.apache.camel.itest.springboot.CamelSparkRestTest</include> 23/23-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelSpringBootTest</include> XX CHECK-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelSpringTest</include> 30/1085-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelSwaggerJavaTest</include> 1 -> org.apache.camel.tools.apt.helper.CollectionStringBuffer-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelUndertowTest</include> 1 -> org.apache.camel.tools.apt.helper.CollectionStringBuffer-->
+
+
+ <!--<include>org.apache.camel.itest.springboot.CamelZipkinTest</include> 1 CHECK -->
+
+ <!-- TBC -->
+ <!--<include>**/*CamelMongodbTest.java</include>-->
+ <!--<include>**/*CamelMongodbGridfsTest.java</include>-->
+ <!--<include>**/*Netty*Test.java</include>-->
+
+
+
+
+ <!-- OK -->
+ <!--<include>org.apache.camel.itest.springboot.CamelScriptTest</include> 17/44 OK . Test framework problem with JavaScript-->
+
+ <!--<include>org.apache.camel.itest.springboot.CamelServletTest</include> 1 OK . Excluded arquillian test -->
+
+
</includes>
- <excludes>
- <!--<exclude>**/*CamelMongodbTest.java</exclude>-->
- <!--<exclude>**/*CamelMongodbGridfsTest.java</exclude>-->
- </excludes>
<systemProperties>
<!-- Test configuration -->
<!--
@@ -166,7 +211,7 @@
-->
<property>
<name>itest.springboot.unitTestEnabled</name>
- <value>true</value>
+ <value>false</value>
</property>
<property>
<name>itest.springboot.includeTestDependencies</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
index 0b8f3a5..29b3a1a 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
@@ -37,7 +37,7 @@ public class CamelServletTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelServletTest.class))
// .dependency(DependencyResolver.withVersion("org.springframework.boot:spring-boot-starter-web"))
// .dependency(DependencyResolver.withVersion("org.springframework:spring-webmvc"))
- .unitTestExclusionPattern(".*ExposedServletEndpointURIToJMXTest")
+ .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|ExposedServletEndpointURIToJMXTest$.*Arquillian.*)")
.build();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc44cce2/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index 7412564..9f12a08 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -49,6 +49,9 @@ camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.0_spec:${geronimo-jpa2-spec-v
camel-kubernetes=org.hibernate:hibernate-validator
camel-netty4=org.hibernate:hibernate-validator
camel-netty4-http=org.hibernate:hibernate-validator
+
+camel-scala=org.scala-lang:scala-library:${scala-version},org.scala-lang.modules:scala-xml_2.11:${scalaxml-version}
+
camel-sjms=org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-spec-version}
camel-spark-rest=org.hibernate:hibernate-validator
camel-spring-boot=org.apache.camel:camel-core-starter
@@ -58,6 +61,8 @@ camel-restlet=org.hibernate:hibernate-validator
# Force the spring-boot version of jetty
camel-salesforce=org.eclipse.jetty:jetty-client,org.eclipse.jetty:jetty-util,org.eclipse.jetty:jetty-util-ajax,org.eclipse.jetty:jetty-io
+camel-servletlistener=javax.servlet:javax.servlet-api
+
camel-swagger-java=org.hibernate:hibernate-validator
camel-undertow=org.hibernate:hibernate-validator