[resolves #906] Update to camel-2.17.0 - WIP

[resolves #903] Undertow component incompatible with WildFly
wildfly-extras · Jan 18, 2016 · fa6388b · fa6388b
1 parent ac68aff
commit fa6388b
Show file tree

Hide file tree

Showing 103 changed files with 348 additions and 466 deletions.
diff --git a/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/cxf/main/module.xml b/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/cxf/main/module.xml
@@ -44,6 +44,7 @@
     <module name="org.springframework.beans" />
     <module name="org.springframework.context" />
     <module name="org.springframework.core" />
+    <module name="javax.servlet.api" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.core" />
     <module name="org.apache.camel.spring" />

diff --git a/...in/resources/modules/system/layers/fuse/org/apache/camel/component/lucene/main/module.xml b/...in/resources/modules/system/layers/fuse/org/apache/camel/component/lucene/main/module.xml
@@ -4,8 +4,8 @@
     <artifact name="${org.apache.camel:camel-lucene}" />
   </resources>
   <dependencies>
+    <module name="org.apache.lucene" slot="5.2" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.core" />
-    <module name="org.apache.lucene" slot="4.10" />
   </dependencies>
 </module>
diff --git a/...main/resources/modules/system/layers/fuse/org/apache/camel/component/mail/main/module.xml b/...main/resources/modules/system/layers/fuse/org/apache/camel/component/mail/main/module.xml
@@ -6,8 +6,8 @@
   <dependencies>
     <module name="javax.api" />
     <module name="javax.activation.api" />
-    <module name="org.slf4j" />
     <module name="javax.mail.api" />
+    <module name="org.slf4j" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.core" />
   </dependencies>

diff --git a/...rs/fuse/org/apache/lucene/4.10/module.xml → ...ers/fuse/org/apache/lucene/5.2/module.xml b/...rs/fuse/org/apache/lucene/4.10/module.xml → ...ers/fuse/org/apache/lucene/5.2/module.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.1" name="org.apache.lucene" slot="4.10">
+<module xmlns="urn:jboss:module:1.1" name="org.apache.lucene" slot="5.2">
   <resources>
     <artifact name="${org.apache.lucene:lucene-analyzers-common}" />
+    <artifact name="${org.apache.lucene:lucene-backward-codecs}" />
     <artifact name="${org.apache.lucene:lucene-core}" />
     <artifact name="${org.apache.lucene:lucene-grouping}" />
     <artifact name="${org.apache.lucene:lucene-highlighter}" />
@@ -10,7 +11,6 @@
     <artifact name="${org.apache.lucene:lucene-misc}" />
     <artifact name="${org.apache.lucene:lucene-queries}" />
     <artifact name="${org.apache.lucene:lucene-queryparser}" />
-    <artifact name="${org.apache.lucene:lucene-sandbox}" />
     <artifact name="${org.apache.lucene:lucene-spatial}" />
     <artifact name="${org.apache.lucene:lucene-suggest}" />
     <artifact name="${com.spatial4j:spatial4j}" />

diff --git a/...esources/modules/system/layers/fuse/org/apache/ws/commons/axiom/axiom-api/main/module.xml b/...esources/modules/system/layers/fuse/org/apache/ws/commons/axiom/axiom-api/main/module.xml
@@ -10,7 +10,6 @@
     <module name="javax.api" />
     <module name="org.apache.commons.logging" />
     <module name="javax.activation.api" />
-    <module name="javax.mail.api" />
     <module name="javax.xml.stream.api" />
     <module name="org.apache.james.mime4j" />
     <module name="org.codehaus.woodstox" />

diff --git a/...sources/modules/system/layers/fuse/org/apache/ws/commons/axiom/axiom-impl/main/module.xml b/...sources/modules/system/layers/fuse/org/apache/ws/commons/axiom/axiom-impl/main/module.xml
@@ -10,7 +10,6 @@
     <module name="javax.api" />
     <module name="org.apache.commons.logging" />
     <module name="javax.activation.api" />
-    <module name="javax.mail.api" />
     <module name="javax.xml.stream.api" />
     <module name="org.apache.ws.commons.axiom.axiom-api" />
     <module name="org.codehaus.woodstox" />

diff --git a/feature-pack/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml
@@ -8,13 +8,13 @@
   </resources>
   <dependencies>
     <module name="javax.api" />
+    <module name="org.apache.lucene" slot="5.2" />
     <module name="org.slf4j" />
     <module name="sun.jdk">
       <imports>
         <include path="sun/misc/Unsafe" />
       </imports>
     </module>
-    <module name="org.apache.lucene" slot="4.10" />
-    <module name="org.yaml.snakeyaml" />
+    <module name="com.google.guava" />
   </dependencies>
 </module>
diff --git a/...andalone/basic/src/main/java/org/wildfly/camel/test/undertow/UndertowIntegrationTest.java b/...andalone/basic/src/main/java/org/wildfly/camel/test/undertow/UndertowIntegrationTest.java
@@ -37,7 +37,6 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.wildfly.camel.test.common.http.HttpRequest;
@@ -47,7 +46,6 @@
 
 @CamelAware
 @RunWith(Arquillian.class)
-@Ignore("[#903] Undertow component incompatible with WildFly")
 public class UndertowIntegrationTest {
 
     @Deployment