Skip to content

Commit

Permalink
[resolves #906] Update to camel-2.17.0 - WIP
Browse files Browse the repository at this point in the history
[resolves #903] Undertow component incompatible with WildFly
  • Loading branch information
Thomas Diesler committed Feb 17, 2016
1 parent fb3e837 commit bb346a6
Show file tree
Hide file tree
Showing 112 changed files with 387 additions and 579 deletions.
Expand Up @@ -7,11 +7,10 @@
<module name="javax.annotation.api" />
<module name="javax.enterprise.api" />
<module name="javax.xml.bind.api" />
<module name="org.apache.deltaspike.core.api" />
<module name="org.apache.deltaspike.core.impl" />
<module name="org.jboss.weld.core" />
<module name="org.jboss.weld.spi" />
<module name="org.slf4j" />
<module name="javax.el.api" />
<module name="org.apache.camel.core" />
</dependencies>
</module>
Expand Up @@ -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" />
Expand Down
Expand Up @@ -6,6 +6,6 @@
<dependencies>
<module name="javax.xml.bind.api" />
<module name="org.apache.camel.core" />
<module name="org.apache.lucene" slot="4.10" />
<module name="org.apache.lucene" slot="5.4" />
</dependencies>
</module>
Expand Up @@ -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>
Expand Down

This file was deleted.

This file was deleted.

@@ -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.4">
<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}" />
Expand All @@ -12,6 +13,7 @@
<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-spatial3d}" />
<artifact name="${org.apache.lucene:lucene-suggest}" />
<artifact name="${com.spatial4j:spatial4j}" />
</resources>
Expand Down
Expand Up @@ -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" />
Expand Down
Expand Up @@ -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" />
Expand Down
Expand Up @@ -5,6 +5,7 @@
</properties>
<resources>
<artifact name="${org.elasticsearch:elasticsearch}" />
<artifact name="${org.elasticsearch:securesm}" />
</resources>
<dependencies>
<module name="javax.api" />
Expand All @@ -14,7 +15,7 @@
<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" />
<module name="org.apache.lucene" slot="5.4" />
</dependencies>
</module>
Expand Up @@ -38,15 +38,13 @@
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;
import org.wildfly.camel.test.common.http.HttpRequest.HttpResponse;
import org.wildfly.camel.test.http4.subA.MyServlet;

@RunWith(Arquillian.class)
@Ignore("[#903] Undertow component incompatible with WildFly")
public class UndertowConsumerIntegrationTest {

@ArquillianResource
Expand Down
Expand Up @@ -36,15 +36,13 @@
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.http4.subA.MyServlet;
import org.wildfly.extension.camel.EndpointRegistryClient;

@RunAsClient
@RunWith(Arquillian.class)
@Ignore("[#903] Undertow component incompatible with WildFly")
public class UndertowProducerIntegrationTest {

@ArquillianResource
Expand Down

0 comments on commit bb346a6

Please sign in to comment.