[resolves #2459] Upgrade to camel-2.22.0

wildfly-extras · Jul 5, 2018 · 491b881 · 491b881
1 parent 90a8231
commit 491b881
Show file tree

Hide file tree

Showing 60 changed files with 1,174 additions and 950 deletions.
diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -87,6 +87,7 @@ google-bigquery
 google-calendar
 google-drive
 google-mail
+google-mail-stream
 google-pubsub
 grpc
 guava-eventbus
@@ -162,6 +163,7 @@ msv
 mustache
 mvel
 mybatis
+mybatis-bean
 nagios
 nats
 netty4
@@ -261,10 +263,14 @@ zookeeper-master
 restlet                                             #2024 Blocked by camel-2.21.x
 
 [undecided]
+as2
 elasticsearch-rest
+micrometer
+service
 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
+web3j
 xchange
 
 [rejected]
@@ -295,7 +301,7 @@ ignite-set                                          #1834 Competitor to JDG
 ironmq                                              #2006 Not another messaging system
 javaspace                                           #deprecated
 jetty                                               #2009 No alternative HTTP engine
-jira                                                #1451 Requires proprietary binary from Atlassian
+jira                                                #deprecated
 kestrel                                             #deprecated
 krati                                               #deprecated
 mina                                                #deprecated

diff --git a/catalog/src/main/resources/other.roadmap b/catalog/src/main/resources/other.roadmap
@@ -19,6 +19,11 @@ zipkin
 
 [undecided]
 aws-xray
+rxjava2
+spring-cloud-consul
+spring-cloud-zookeeper
+testcontainers
+testcontainers-spring
 
 [rejected]
 bam                                 #deprecated

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -486,10 +486,6 @@
         <include artifact="org.mortbay.jetty:(.*)" />
     </module>
 
-    <module name="org.objenesis" skip="true">
-        <include artifact="org.objenesis:objenesis" />
-    </module>
-
     <module name="org.ops4j" skip="true">
         <include artifact="org.ops4j.base:(.*)" />
     </module>
@@ -524,6 +520,8 @@
     </module>
 
     <module name="org.springframework.skipped" skip="true">
+        <!-- contains org.apache.commons.logging -->
+        <include artifact=":spring-jcl" />
         <include artifact=":spring-ldap-ldif-batch" />
         <include artifact=":spring-ldap-ldif-core" />
         <include artifact=":spring-ldap-odm" />

diff --git a/feature/common/etc/smartics/wildfly-modules.xml b/feature/common/etc/smartics/wildfly-modules.xml
@@ -132,6 +132,7 @@
     <module name="javax.jms.api" skip="true">
         <include artifact=":geronimo-jms_1.1_spec" />
         <include artifact=":geronimo-jms_2.0_spec" />
+        <include artifact=":javax.jms-api" />
         <include artifact=":jboss-jms-api_1.1_spec" />
         <include artifact=":jboss-jms-api_2.0_spec" />
         <include artifact=":jms-api" />

diff --git a/feature/extrasA/etc/smartics/other-modules.xml b/feature/extrasA/etc/smartics/other-modules.xml
@@ -20,6 +20,13 @@
   -->
 <modules xmlns="http://smartics.de/ns/jboss-modules-descriptor/2">
 
+    <module name="aopalliance">
+        <properties>
+            <property name="jboss.api" value="private"/>
+        </properties>
+        <include artifact="aopalliance:aopalliance" />
+    </module>
+
     <module name="com.google.guava" inherit-slot="false" slot="12.0">
         <properties>
             <property name="jboss.api" value="private"/>

diff --git a/feature/extrasA/etc/smartics/skipped-modules.xml b/feature/extrasA/etc/smartics/skipped-modules.xml
@@ -24,10 +24,6 @@
 -->
 <modules xmlns="http://smartics.de/ns/jboss-modules-descriptor/2">
 
-    <module name="aopalliance" skip="true">
-        <include artifact="aopalliance:aopalliance" />
-    </module>
-
     <module name="com.google.code.gson" skip="true">
         <include artifact="com.google.code.gson:gson" />
     </module>

diff --git a/feature/extrasA/etc/wildfly-feature-pack.xml b/feature/extrasA/etc/wildfly-feature-pack.xml
@@ -30,10 +30,10 @@
         <artifact groupId="javax.inject" artifactId="javax.inject" version="1"/>
         <artifact groupId="javax.jcr" artifactId="jcr" version="2.0"/>
         <artifact groupId="org.apache.avro" artifactId="avro" version="1.7.4"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.21.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.21.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.21.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.21.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.22.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.22.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.22.0"/>
         <artifact groupId="org.apache.commons" artifactId="commons-compress" version="1.4.1"/>
         <artifact groupId="org.apache.commons" artifactId="commons-math3" version="3.1.1"/>
         <artifact groupId="org.apache.curator" artifactId="curator-client" version="2.7.1"/>
@@ -47,7 +47,7 @@
         <artifact groupId="org.apache.cxf" artifactId="cxf-rt-transports-http" version="2.7.18"/>
         <artifact groupId="org.apache.cxf" artifactId="cxf-rt-ws-addr" version="2.7.18"/>
         <artifact groupId="org.apache.cxf" artifactId="cxf-rt-ws-policy" version="2.7.18"/>
-        <artifact groupId="org.apache.derby" artifactId="derby" version="10.14.1.0"/>
+        <artifact groupId="org.apache.derby" artifactId="derby" version="10.14.2.0"/>
         <artifact groupId="org.apache.directory.api" artifactId="api-asn1-api" version="1.0.0-M20"/>
         <artifact groupId="org.apache.directory.api" artifactId="api-util" version="1.0.0-M20"/>
         <artifact groupId="org.apache.directory.server" artifactId="apacheds-i18n" version="2.0.0-M15"/>
@@ -61,15 +61,15 @@
         <artifact groupId="org.apache.htrace" artifactId="htrace-core" version="3.1.0-incubating"/>
         <artifact groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.1.2"/>
         <artifact groupId="org.apache.httpcomponents" artifactId="httpcore" version="4.1.2"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-api" version="2.17.1"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-core" version="2.17.1"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-data" version="2.17.1"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-jcr-commons" version="2.17.1"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi" version="2.17.1"/>
-        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi-commons" version="2.17.1"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-api" version="2.17.3"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-core" version="2.17.3"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-data" version="2.17.3"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-jcr-commons" version="2.17.3"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi" version="2.17.3"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi-commons" version="2.17.3"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-core" version="3.6.0"/>
         <artifact groupId="org.apache.neethi" artifactId="neethi" version="3.0.3"/>
-        <artifact groupId="org.apache.tika" artifactId="tika-core" version="1.17"/>
+        <artifact groupId="org.apache.tika" artifactId="tika-core" version="1.18"/>
         <artifact groupId="org.apache.ws.xmlschema" artifactId="xmlschema-core" version="2.1.0"/>
         <artifact groupId="org.apache.zookeeper" artifactId="zookeeper" version="3.4.6"/>
         <artifact groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.12"/>

diff --git a/...m/layers/fuse/aopalliance/main/module.xml → ...m/layers/fuse/aopalliance/main/module.xml b/...m/layers/fuse/aopalliance/main/module.xml → ...m/layers/fuse/aopalliance/main/module.xml
diff --git a/feature/extrasB/etc/smartics/other-modules.xml b/feature/extrasB/etc/smartics/other-modules.xml
@@ -20,6 +20,13 @@
   -->
 <modules xmlns="http://smartics.de/ns/jboss-modules-descriptor/2">
 
+    <module name="com.carrotsearch.hppc">
+        <properties>
+            <property name="jboss.api" value="private"/>
+        </properties>
+        <include artifact="com.carrotsearch:hppc" />
+    </module>
+
     <module name="com.fasterxml.jackson.dataformat.smile">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -31,7 +38,6 @@
         <properties>
             <property name="jboss.api" value="private"/>
         </properties>
-        <include artifact="com.carrotsearch:hppc" />
         <include artifact="com.tdunning:t-digest" />
         <include artifact="com.twitter:jsr166e" />
         <include artifact="org.elasticsearch:elasticsearch" />

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -13,18 +13,16 @@
         <artifact groupId="com.fasterxml.jackson.jr" artifactId="jackson-jr-objects" version="2.9.5"/>
         <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"/>
         <artifact groupId="com.tdunning" artifactId="t-digest" version="3.0"/>
         <artifact groupId="com.twitter" artifactId="jsr166e" version="1.1.0"/>
         <artifact groupId="commons-cli" artifactId="commons-cli" version="1.3.1"/>
         <artifact groupId="io.netty" artifactId="netty" version="3.10.6.Final"/>
         <artifact groupId="joda-time" artifactId="joda-time" version="2.9.5"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.21.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.21.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.22.0"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-analyzers-common" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-backward-codecs" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-core" version="5.5.2"/>
-        <artifact groupId="org.apache.lucene" artifactId="lucene-grouping" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-highlighter" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-join" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-memory" version="5.5.2"/>
@@ -33,7 +31,6 @@
         <artifact groupId="org.apache.lucene" artifactId="lucene-queryparser" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-sandbox" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-spatial" version="5.5.2"/>
-        <artifact groupId="org.apache.lucene" artifactId="lucene-spatial3d" version="5.5.2"/>
         <artifact groupId="org.apache.lucene" artifactId="lucene-suggest" version="5.5.2"/>
         <artifact groupId="org.elasticsearch" artifactId="elasticsearch" version="2.4.4"/>
         <artifact groupId="org.elasticsearch" artifactId="securesm" version="1.0"/>

diff --git a/...trasB/src/main/resources/modules/system/layers/fuse/com/carrotsearch/hppc/main/module.xml b/...trasB/src/main/resources/modules/system/layers/fuse/com/carrotsearch/hppc/main/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="com.carrotsearch.hppc">
+  <properties>
+    <property name="jboss.api" value="private" />
+  </properties>
+  <resources>
+    <artifact name="${com.carrotsearch:hppc}" />
+  </resources>
+  <dependencies />
+</module>
diff --git a/...e/extrasB/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml b/...e/extrasB/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml
@@ -5,7 +5,6 @@
   </properties>
   <resources>
     <artifact name="${org.elasticsearch:elasticsearch}" />
-    <artifact name="${com.carrotsearch:hppc}" />
     <artifact name="${com.twitter:jsr166e}" />
     <artifact name="${org.elasticsearch:securesm}" />
     <artifact name="${com.tdunning:t-digest}" />
@@ -20,6 +19,7 @@
         <include path="sun/misc" />
       </imports>
     </module>
+    <module name="com.carrotsearch.hppc" />
     <module name="com.fasterxml.jackson.core.jackson-core" />
     <module name="com.fasterxml.jackson.dataformat.cbor" />
     <module name="com.fasterxml.jackson.dataformat.smile" />

diff --git a/feature/extrasC/etc/wildfly-feature-pack.xml b/feature/extrasC/etc/wildfly-feature-pack.xml
@@ -11,8 +11,8 @@
         <artifact groupId="com.google.inject" artifactId="guice" version="3.0"/>
         <artifact groupId="com.google.inject.extensions" artifactId="guice-assistedinject" version="3.0"/>
         <artifact groupId="javax.inject" artifactId="javax.inject" version="1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.21.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.21.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.22.0"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-blobstore" version="2.1.0"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-compute" version="2.1.0"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-core" version="2.1.0"/>

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -1703,10 +1703,12 @@
             <include module="org.apache.camel.apt" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
-        <apply-to-dependencies export="true">
-            <include module="org.apache.kafka.clients" />
-        </apply-to-dependencies>
         <dependencies>
+            <module name="org.apache.kafka.clients" export="true">
+                <exports>
+                    <exclude path="org/apache/kafka/common/header/internals" />
+                </exports>
+            </module>
             <module name="org.slf4j"/>
         </dependencies>
     </module>
@@ -3222,6 +3224,7 @@
         <include artifact="io.zipkin.java:zipkin" />
         <include artifact="io.zipkin.zipkin2:zipkin" />
         <include artifact="io.zipkin.reporter2:zipkin-reporter" />
+        <include artifact="io.zipkin.reporter2:zipkin-sender-libthrift" />
         <include artifact="io.zipkin.reporter2:zipkin-sender-urlconnection" />
         <apply-to-dependencies skip="true">
             <include module="com.google.auto.value" />
@@ -3230,15 +3233,13 @@
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
+            <module name="org.apache.thrift" />
             <module name="org.slf4j"/>
         </dependencies>
         <exports>
-            <exclude path="com/github" />
-            <exclude path="com/github/kristofa" />
-            <exclude path="com/github/kristofa/brave/internal**" />
-            <exclude path="com/twitter**" />
-            <exclude path="zipkin2/**" />
-            <exclude path="zipkin/**" />
+            <exclude path="brave**" />
+            <include path="zipkin2/reporter"/>
+            <exclude path="zipkin2**"/>
         </exports>
     </module>
 

diff --git a/feature/modules/etc/smartics/extra-modules.xml b/feature/modules/etc/smartics/extra-modules.xml
@@ -29,6 +29,7 @@
             <property name="jboss.api" value="private"/>
         </properties>
         <include artifact=":cxf-rt-features-clustering" />
+        <include artifact=":cxf-rt-features-logging" />
         <include artifact=":cxf-rt-frontend-jaxrs" />
         <include artifact=":cxf-rt-rs-client" />
         <include artifact=":cxf-rt-rs-extension-providers" />
@@ -39,6 +40,9 @@
         <include artifact=":cxf-rt-rs-security-oauth2" />
         <include artifact=":oauth"/>
         <include artifact=":oauth-provider"/>
+        <apply-to-dependencies skip="true">
+            <include module="org.osgi.compendium" />
+        </apply-to-dependencies>
         <dependencies>
             <module name="javax.api" />
             <module name="javax.servlet.api" />
@@ -50,6 +54,7 @@
         </dependencies>
         <exports>
             <exclude path="net/oauth*" />
+            <exclude path="org/apache/cxf/ext/logging**"/>
             <exclude path="OSGI-INF/blueprint" />
             <exclude path="OSGI-INF/metatype" />
             <exclude path="schemas/blueprint" />