[resolves #2272] Upgrade to wildfly-12.0.0 - WIP

wildfly-extras · Feb 26, 2018 · df74db6 · df74db6
1 parent a672c4f
commit df74db6
Show file tree

Hide file tree

Showing 29 changed files with 214 additions and 238 deletions.
diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -256,11 +256,13 @@ restlet                                             #2024 Blocked by camel-2.21.
 tika                                                #1850 Blocked by camel-2.21.x
 
 [undecided]
+elasticsearch5-rest
 ganglia                                             #1998 No test coverage for ganglia in camel
 pgevent                                             #2021 No test coverage for pgevent in camel
 solr                                                #2030 No test coverage for solr in camel
 solrCloud                                           #2031 No test coverage for solr in camel
 solrs                                               #2032 No test coverage for solr in camel
+yql
 
 [rejected]
 atmos                                               #1984 Jersey clashes with RestEasy

diff --git a/catalog/src/main/resources/other.roadmap b/catalog/src/main/resources/other.roadmap
@@ -17,6 +17,8 @@ zipkin
 [planned]
 
 [undecided]
+aws-xray
+lra
 
 [rejected]
 bam                                 #deprecated

diff --git a/config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java b/config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java
@@ -30,9 +30,9 @@
 
 public final class WildFlyCamelConfigPlugin implements ConfigPlugin {
 
-    public static final Namespace NS_DOMAIN_50 = Namespace.getNamespace("urn:jboss:domain:5.0");
+    public static final Namespace NS_DOMAIN_60 = Namespace.getNamespace("urn:jboss:domain:6.0");
 
-    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_50 };
+    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_60 };
 
     public static final Namespace NS_CAMEL = Namespace.getNamespace("urn:jboss:domain:camel:1.0");
     public static final Namespace NS_SECURITY = Namespace.getNamespace("urn:jboss:domain:security:2.0");

diff --git a/config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java b/config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java
@@ -17,7 +17,7 @@
 
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_CAMEL;
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAINS;
-import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_50;
+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_60;
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_SECURITY;
 
 import java.io.File;
@@ -81,7 +81,7 @@ public void testUnsupportedNamespaceVersion() throws Exception {
         SAXBuilder jdom = new SAXBuilder();
         Document doc = jdom.build(resurl);
 
-        doc.getRootElement().getChild("extensions", NS_DOMAIN_50).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
+        doc.getRootElement().getChild("extensions", NS_DOMAIN_60).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
 
         File modifiedConfig = new File("target/standalone-modified.xml");
         outputDocumentContent(doc, new FileOutputStream(modifiedConfig));

diff --git a/feature/common/etc/smartics/wildfly-modules.xml b/feature/common/etc/smartics/wildfly-modules.xml
@@ -56,6 +56,10 @@
         <include artifact=":jackson-module-jaxb-annotations" />
     </module>
 
+    <module name="com.github.ben-manes.caffeine" skip="true">
+        <include artifact="com.github.ben-manes.caffeine:caffeine" />
+    </module>
+
     <module name="com.github.relaxng" skip="true">
         <include artifact=":relaxngDatatype" />
     </module>
@@ -243,6 +247,10 @@
         <include artifact=":commons-io" />
     </module>
 
+    <module name="org.apache.commons.lang3" skip="true">
+        <include artifact="org.apache.commons:commons-lang3" />
+    </module>
+
     <module name="org.apache.commons.logging" skip="true">
         <include artifact=":commons-logging" />
     </module>
@@ -302,6 +310,10 @@
         <include artifact=":neethi" />
     </module>
 
+    <module name="org.apache.qpid.proton" skip="true">
+        <include artifact="org.apache.qpid:proton-j" />
+    </module>
+
     <module name="org.apache.santuario.xmlsec" skip="true">
         <include artifact="org.apache.santuario:xmlsec" />
     </module>
@@ -469,6 +481,10 @@
         <include artifact=":jsoup" />
     </module>
 
+    <module name="org.reactivestreams" skip="true">
+        <include artifact="org.reactivestreams:reactive-streams" />
+    </module>
+
     <module name="org.slf4j" skip="true">
         <include artifact=":jcl-over-slf4j" />
         <include artifact=":slf4j-api" />

diff --git a/feature/extrasA/etc/wildfly-feature-pack.xml b/feature/extrasA/etc/wildfly-feature-pack.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <feature-pack xmlns="urn:wildfly:feature-pack:1.1">
     <dependencies>
         <artifact name="org.wildfly.camel:wildfly-camel-feature-modules"/>
     </dependencies>
     <artifact-versions>
         <artifact groupId="aopalliance" artifactId="aopalliance" version="1.0"/>
-        <artifact groupId="asm" artifactId="asm" version="3.1"/>
         <artifact groupId="com.google.code.gson" artifactId="gson" version="2.2.4"/>
         <artifact groupId="com.google.guava" artifactId="guava" version="11.0.2"/>
         <artifact groupId="com.google.inject" artifactId="guice" version="3.0"/>

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <feature-pack xmlns="urn:wildfly:feature-pack:1.1">
     <dependencies>
         <artifact name="org.wildfly.camel:wildfly-camel-feature-extrasA"/>
     </dependencies>
     <artifact-versions>
         <artifact groupId="com.carrotsearch" artifactId="hppc" version="0.7.1"/>
-        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.8.9"/>
+        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.9.4"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.9.4"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.9.4"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.9.4"/>
         <artifact groupId="com.google.guava" artifactId="guava" version="18.0"/>
         <artifact groupId="com.ning" artifactId="compress-lzf" version="1.0.2"/>
         <artifact groupId="com.spatial4j" artifactId="spatial4j" version="0.5"/>
@@ -39,6 +39,6 @@
         <artifact groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.6"/>
         <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.22"/>
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasA" version="5.2.0-SNAPSHOT" extension="zip"/>
-        <artifact groupId="org.yaml" artifactId="snakeyaml" version="1.17"/>
+        <artifact groupId="org.yaml" artifactId="snakeyaml" version="1.18"/>
     </artifact-versions>
 </feature-pack>
diff --git a/feature/extrasC/etc/wildfly-feature-pack.xml b/feature/extrasC/etc/wildfly-feature-pack.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <feature-pack xmlns="urn:wildfly:feature-pack:1.1">
     <dependencies>

diff --git a/feature/extrasD/etc/wildfly-feature-pack.xml b/feature/extrasD/etc/wildfly-feature-pack.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <feature-pack xmlns="urn:wildfly:feature-pack:1.1">
     <dependencies>

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -397,20 +397,19 @@
 
     <module name="org.apache.camel.component.caffeine">
         <include artifact="org.apache.camel:camel-caffeine" />
-        <include artifact="com.github.ben-manes.caffeine:caffeine" />
         <apply-to-dependencies skip="true">
-            <include module="com.google.code.findbugs" />
-            <include module="com.google.errorprone" />
             <include module="org.apache.camel.apt" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
             <module name="org.slf4j" />
+            <module name="com.github.ben-manes.caffeine" export="true">
+                <exports>
+                    <exclude path="com/github"/>
+                    <exclude path="com/github/benmanes"/>
+                </exports>
+            </module>
         </dependencies>
-        <exports>
-            <exclude path="com/github"/>
-            <exclude path="com/github/benmanes"/>
-        </exports>
     </module>
 
     <module name="org.apache.camel.component.cassandra">
@@ -1371,6 +1370,7 @@
         <dependencies>
             <module name="org.infinispan" export="true" >
                 <exports>
+                    <exclude path="org/infinispan/configuration/internal" />
                     <exclude path="OSGI-INF/blueprint" />
                 </exports>
             </module>

diff --git a/feature/modules/etc/smartics/extra-modules.xml b/feature/modules/etc/smartics/extra-modules.xml
@@ -42,6 +42,7 @@
         <dependencies>
             <module name="javax.api" />
             <module name="javax.servlet.api" />
+            <module name="javax.ws.rs.api" />
             <module name="javax.xml.bind.api" />
         </dependencies>
         <exports>

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -1088,13 +1088,6 @@
         </exports>
     </module>
 
-    <module name="org.apache.commons.lang3">
-        <properties>
-            <property name="jboss.api" value="private"/>
-        </properties>
-        <include artifact="org.apache.commons:commons-lang3" />
-    </module>
-
     <module name="org.apache.commons.math3">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -1325,13 +1318,6 @@
         </dependencies>
     </module>
 
-    <module name="org.apache.qpid.proton" slot="0.16">
-        <properties>
-            <property name="jboss.api" value="private"/>
-        </properties>
-        <include artifact="org.apache.qpid:proton-(.*)" />
-    </module>
-
     <module name="org.apache.sshd">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -1839,13 +1825,6 @@
         </exports>
     </module>
 
-    <module name="org.reactivestreams">
-        <properties>
-            <property name="jboss.api" value="private"/>
-        </properties>
-        <include artifact="org.reactivestreams:reactive-streams" />
-    </module>
-
     <module name="org.reflections">
         <properties>
             <property name="jboss.api" value="private"/>