[resolves #2301] Upgrade to camel-2.20.2 - WIP

wildfly-extras · Jan 22, 2018 · 317d603 · 317d603
1 parent f15d4d0
commit 317d603
Show file tree

Hide file tree

Showing 20 changed files with 478 additions and 463 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/feature/common/etc/smartics/wildfly-modules.xml b/feature/common/etc/smartics/wildfly-modules.xml
@@ -68,10 +68,6 @@
         <include artifact="com.microsoft.azure:azure-storage" />
     </module>
 
-    <module name="io.netty" skip="true">
-        <include artifact="io.netty:netty-all" />
-    </module>
-
     <module name="io.undertow.core" skip="true">
         <include artifact=":undertow-core" />
     </module>

diff --git a/feature/extrasA/etc/wildfly-feature-pack.xml b/feature/extrasA/etc/wildfly-feature-pack.xml
@@ -32,10 +32,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.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.20.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-hdfs2" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jbpm" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jcr" version="2.20.2-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"/>

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -18,8 +18,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.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.20.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch" version="2.20.2-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
@@ -18,8 +18,8 @@
         <artifact groupId="io.netty" artifactId="netty" version="3.10.6.Final"/>
         <artifact groupId="joda-time" artifactId="joda-time" version="2.9.5"/>
         <artifact groupId="net.sf.jopt-simple" artifactId="jopt-simple" version="5.0.2"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch5" version="2.20.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-elasticsearch5" version="2.20.2-SNAPSHOT"/>
         <artifact groupId="org.apache.httpcomponents" artifactId="httpasyncclient" version="4.1.2"/>
         <artifact groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.5.2"/>
         <artifact groupId="org.apache.httpcomponents" artifactId="httpcore" version="4.4.5"/>

diff --git a/feature/extrasD/etc/wildfly-feature-pack.xml b/feature/extrasD/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.20.1"/>
-        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.20.1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.20.2-SNAPSHOT"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.20.2-SNAPSHOT"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-blobstore" version="2.0.2"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-compute" version="2.0.2"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-core" version="2.0.2"/>