[resolves #2459] Upgrade to camel-2.22.0 - WIP

wildfly-extras · Apr 30, 2018 · ba61606 · ba61606
1 parent 0b58b85
commit ba61606
Show file tree

Hide file tree

Showing 50 changed files with 885 additions and 737 deletions.
diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -161,6 +161,7 @@ msv
 mustache
 mvel
 mybatis
+mybatis-bean
 nagios
 nats
 netty4
@@ -260,10 +261,12 @@ restlet                                             #2024 Blocked by camel-2.21.
 
 [undecided]
 elasticsearch-rest
+elasticsearch5-rest
 ganglia                                             #1998 No test coverage for ganglia 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
+web3j
 xchange
 yql
 
@@ -295,7 +298,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
@@ -17,6 +17,7 @@ zipkin
 [planned]
 
 [undecided]
+as2-parent
 aws-xray
 lra
 

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -82,6 +82,10 @@
         <include artifact="com.github.jnr:jffi" />
     </module>
 
+    <module name="com.github.luben.zstd-jni" skip="true">
+        <include artifact="com.github.luben:zstd-jni" />
+    </module>
+
     <module name="com.google.android" skip="true">
         <include artifact="com.google.android:android"/>
     </module>
@@ -465,10 +469,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>

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

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
@@ -31,10 +31,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.0"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.21.0"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.21.0"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.21.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.22.0-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.22.0-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.22.0-SNAPSHOT"/>
         <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"/>
@@ -62,12 +62,12 @@
         <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.2"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-core" version="2.17.2"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-data" version="2.17.2"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-jcr-commons" version="2.17.2"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi" version="2.17.2"/>
+        <artifact groupId="org.apache.jackrabbit" artifactId="jackrabbit-spi-commons" version="2.17.2"/>
         <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"/>

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/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -19,8 +19,8 @@
         <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.0"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.21.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.22.0-SNAPSHOT"/>
         <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"/>

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.0"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.21.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.22.0-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.22.0-SNAPSHOT"/>
         <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/extrasC/pom.xml b/feature/extrasC/pom.xml
@@ -89,6 +89,10 @@
                             <groupId>org.osgi</groupId>
                             <artifactId>osgi_R4_core</artifactId>
                         </exclude>
+                        <exclude>
+                            <groupId>org.apache.logging.log4j</groupId>
+                            <artifactId>log4j-core-java9</artifactId>
+                        </exclude>
                         <exclude>
                             <groupId>org.wildfly.camel</groupId>
                             <artifactId>wildfly-camel-feature-extrasB</artifactId>

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -2314,12 +2314,12 @@
 
     <module name="org.apache.camel.component.reactor">
         <include artifact="org.apache.camel:camel-reactor" />
-        <include artifact="io.projectreactor:reactor-core" />
         <apply-to-dependencies skip="true">
             <include module="org.apache.camel.apt" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
+            <module name="io.projectreactor.reactor-core" export="true" />
             <module name="org.slf4j"/>
         </dependencies>
     </module>

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -20,13 +20,6 @@
   -->
 <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="ca.uhn.hapi">
         <include artifact="ca.uhn.hapi:hapi-base" />
         <include artifact="ca.uhn.hapi:hapi-structures-v21" />
@@ -1539,6 +1532,8 @@
         <include artifact="org.gagravarr:vorbis-java-tika"/>
         <apply-to-dependencies skip="true">
             <include module="biz.aQute" />
+            <include module="com.github.jai-imageio" />
+            <include module="com.github.luben.zstd-jni" />
             <include module="org.apache.ctakes.ctakes-core" />
             <include module="org.apache.felix" />
             <include module="org.xerial.sqlite-jdbc" />
@@ -1731,6 +1726,7 @@
         <include artifact="com.github.dozermapper:dozer-schema" />
         <apply-to-dependencies skip="true">
             <include module="org.osgi.core" />
+            <include module="org.projectlombok" />
         </apply-to-dependencies>
         <dependencies>
             <module name="javax.api"/>

diff --git a/feature/modules/etc/smartics/spring-modules.xml b/feature/modules/etc/smartics/spring-modules.xml
@@ -125,11 +125,15 @@
             <property name="jboss.api" value="private"/>
         </properties>
         <include artifact=":spring-core" />
+        <apply-to-dependencies skip="true">
+            <include module="org.springframework.jcl" />
+        </apply-to-dependencies>
         <dependencies>
             <module name="javax.api" />
             <module name="org.jboss.vfs" />
             <module name="org.springframework.aop" export="true" />
             <module name="org.springframework.batch" optional="true" />
+            <module name="org.apache.commons.logging" />
         </dependencies>
         <exports>
             <exclude path="org/springframework/cglib/core/internal" />
@@ -192,6 +196,7 @@
         <dependencies>
             <module name="javax.api" />
             <module name="org.apache.commons.logging" />
+            <module name="org.reactivestreams" />
             <module name="org.springframework.beans" />
             <module name="org.springframework.expression" />
         </dependencies>
@@ -200,6 +205,10 @@
         </dependencies>
     </module>
 
+    <module name="org.springframework.jcl" skip="true"><!-- contains org.apache.commons.logging -->
+        <include artifact="org.springframework:spring-jcl" />
+    </module>
+
     <module name="org.springframework.jdbc">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -221,6 +230,7 @@
         <dependencies>
             <module name="javax.api" />
             <module name="org.apache.commons.logging" />
+            <module name="org.springframework.context" />
         </dependencies>
     </module>
 
@@ -247,6 +257,7 @@
         <dependencies>
             <module name="javax.api" />
             <module name="org.apache.commons.logging" />
+            <module name="org.springframework.context" />
         </dependencies>
     </module>
 
@@ -319,6 +330,9 @@
             <property name="jboss.api" value="private"/>
         </properties>
         <include artifact="org.springframework:spring-web" />
+        <dependencies>
+            <module name="org.springframework.context" />
+        </dependencies>
     </module>
 
     <module name="org.springframework.ws">
@@ -333,6 +347,7 @@
             <module name="javax.api" />
             <module name="javax.xml.bind.api" />
             <module name="javax.xml.soap.api" />
+            <module name="org.springframework.context" />
         </dependencies>
     </module>