[resolve #1192] Upgrade to camel-2.17.2 - WIP

wildfly-extras · Jun 20, 2016 · 9c8e58c · 9c8e58c
1 parent b135e50
commit 9c8e58c
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 74 deletions.
diff --git a/...resources/modules/system/layers/fuse/org/apache/camel/component/braintree/main/module.xml b/...resources/modules/system/layers/fuse/org/apache/camel/component/braintree/main/module.xml
@@ -9,7 +9,6 @@
     <module name="org.slf4j" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.core" />
-    <module name="org.jboss.logging.jul-to-slf4j-stub" />
   </dependencies>
   <exports>
     <exclude path="org/apache/camel/component/braintree/internal" />

diff --git a/patch/etc/baseline/module-list.txt b/patch/etc/baseline/module-list.txt
@@ -27,97 +27,97 @@
 /org/apache/activemq/main/activemq-pool-5.13.2.jar
 /org/apache/activemq/main/activemq-spring-5.13.2.jar
 /org/apache/camel/component/activemq/main/activemq-camel-5.13.2.jar
-/org/apache/camel/component/atom/main/camel-atom-2.17.1.jar
-/org/apache/camel/component/bindy/main/camel-bindy-2.17.1.jar
-/org/apache/camel/component/braintree/main/braintree-java-2.58.0.jar
-/org/apache/camel/component/braintree/main/camel-braintree-2.17.1.jar
-/org/apache/camel/component/castor/main/camel-castor-2.17.1.jar
+/org/apache/camel/component/atom/main/camel-atom-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/bindy/main/camel-bindy-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/braintree/main/braintree-java-2.63.0.jar
+/org/apache/camel/component/braintree/main/camel-braintree-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/castor/main/camel-castor-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/castor/main/castor-core-1.3.3.jar
 /org/apache/camel/component/castor/main/castor-xml-1.3.3.jar
-/org/apache/camel/component/cdi/main/camel-cdi-2.17.1.jar
-/org/apache/camel/component/crypto/main/camel-crypto-2.17.1.jar
-/org/apache/camel/component/csv/main/camel-csv-2.17.1.jar
-/org/apache/camel/component/cxf/main/camel-cxf-2.17.1.jar
-/org/apache/camel/component/cxf/main/camel-cxf-transport-2.17.1.jar
-/org/apache/camel/component/dns/main/camel-dns-2.17.1.jar
+/org/apache/camel/component/cdi/main/camel-cdi-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/crypto/main/camel-crypto-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/csv/main/camel-csv-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/cxf/main/camel-cxf-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/cxf/main/camel-cxf-transport-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/dns/main/camel-dns-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/dns/main/dnsjava-2.1.7.jar
-/org/apache/camel/component/dozer/main/camel-dozer-2.17.1.jar
-/org/apache/camel/component/ejb/main/camel-ejb-2.17.1.jar
-/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.17.1.jar
-/org/apache/camel/component/flatpack/main/camel-flatpack-2.17.1.jar
+/org/apache/camel/component/dozer/main/camel-dozer-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/ejb/main/camel-ejb-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/flatpack/main/camel-flatpack-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/flatpack/main/flatpack-3.4.3.jar
-/org/apache/camel/component/ftp/main/camel-ftp-2.17.1.jar
-/org/apache/camel/component/groovy/main/camel-groovy-2.17.1.jar
-/org/apache/camel/component/hl7/main/camel-hl7-2.17.1.jar
+/org/apache/camel/component/ftp/main/camel-ftp-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/groovy/main/camel-groovy-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/hl7/main/camel-hl7-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/hl7/main/hapi-base-2.2.jar
 /org/apache/camel/component/hl7/main/hapi-structures-v24-2.2.jar
 /org/apache/camel/component/hl7/main/hapi-structures-v25-2.2.jar
-/org/apache/camel/component/http/common/main/camel-http-common-2.17.1.jar
-/org/apache/camel/component/http4/main/camel-http4-2.17.1.jar
-/org/apache/camel/component/infinispan/main/camel-infinispan-2.17.1.jar
-/org/apache/camel/component/jackson/main/camel-jackson-2.17.1.jar
-/org/apache/camel/component/jasypt/main/camel-jasypt-2.17.1.jar
-/org/apache/camel/component/jaxb/main/camel-jaxb-2.17.1.jar
-/org/apache/camel/component/jgroups/main/camel-jgroups-2.17.1.jar
-/org/apache/camel/component/jms/main/camel-jms-2.17.1.jar
-/org/apache/camel/component/jmx/main/camel-jmx-2.17.1.jar
-/org/apache/camel/component/jpa/main/camel-jpa-2.17.1.jar
-/org/apache/camel/component/kafka/main/camel-kafka-2.17.1.jar
-/org/apache/camel/component/lucene/main/camel-lucene-2.17.1.jar
-/org/apache/camel/component/mail/main/camel-mail-2.17.1.jar
-/org/apache/camel/component/metrics/main/camel-metrics-2.17.1.jar
+/org/apache/camel/component/http/common/main/camel-http-common-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/http4/main/camel-http4-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/infinispan/main/camel-infinispan-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jackson/main/camel-jackson-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jasypt/main/camel-jasypt-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jaxb/main/camel-jaxb-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jgroups/main/camel-jgroups-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jms/main/camel-jms-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jmx/main/camel-jmx-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/jpa/main/camel-jpa-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/kafka/main/camel-kafka-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/lucene/main/camel-lucene-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/mail/main/camel-mail-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/metrics/main/camel-metrics-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/metrics/main/metrics-core-3.1.2.jar
 /org/apache/camel/component/metrics/main/metrics-json-3.1.2.jar
-/org/apache/camel/component/mina2/main/camel-mina2-2.17.1.jar
-/org/apache/camel/component/mqtt/main/camel-mqtt-2.17.1.jar
-/org/apache/camel/component/mvel/main/camel-mvel-2.17.1.jar
-/org/apache/camel/component/netty4/main/camel-netty4-2.17.1.jar
-/org/apache/camel/component/ognl/main/camel-ognl-2.17.1.jar
-/org/apache/camel/component/protobuf/main/camel-protobuf-2.17.1.jar
+/org/apache/camel/component/mina2/main/camel-mina2-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/mqtt/main/camel-mqtt-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/mvel/main/camel-mvel-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/netty4/main/camel-netty4-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/ognl/main/camel-ognl-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/protobuf/main/camel-protobuf-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/protobuf/main/protobuf-java-2.6.1.jar
-/org/apache/camel/component/quartz2/main/camel-quartz2-2.17.1.jar
-/org/apache/camel/component/restlet/main/camel-restlet-2.17.1.jar
-/org/apache/camel/component/rss/main/camel-rss-2.17.1.jar
+/org/apache/camel/component/quartz2/main/camel-quartz2-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/restlet/main/camel-restlet-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/rss/main/camel-rss-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/salesforce/main/bayeux-api-3.0.9.jar
-/org/apache/camel/component/salesforce/main/camel-salesforce-2.17.1.jar
+/org/apache/camel/component/salesforce/main/camel-salesforce-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/salesforce/main/cometd-java-client-3.0.9.jar
 /org/apache/camel/component/salesforce/main/cometd-java-common-3.0.9.jar
 /org/apache/camel/component/saxon/main/Saxon-HE-9.5.1-5.jar
-/org/apache/camel/component/saxon/main/camel-saxon-2.17.1.jar
-/org/apache/camel/component/script/main/camel-script-2.17.1.jar
-/org/apache/camel/component/servlet/main/camel-servlet-2.17.1.jar
-/org/apache/camel/component/smpp/main/camel-smpp-2.17.1.jar
+/org/apache/camel/component/saxon/main/camel-saxon-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/script/main/camel-script-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/servlet/main/camel-servlet-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/smpp/main/camel-smpp-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/smpp/main/jsmpp-2.1.1.jar
-/org/apache/camel/component/soap/main/camel-soap-2.17.1.jar
-/org/apache/camel/component/spring/security/main/camel-spring-security-2.17.1.jar
-/org/apache/camel/component/sql/main/camel-sql-2.17.1.jar
-/org/apache/camel/component/stream/main/camel-stream-2.17.1.jar
-/org/apache/camel/component/swagger/main/camel-swagger-java-2.17.1.jar
+/org/apache/camel/component/soap/main/camel-soap-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/spring/security/main/camel-spring-security-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/sql/main/camel-sql-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/stream/main/camel-stream-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/swagger/main/camel-swagger-java-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/swagger/main/reflections-0.9.10.jar
 /org/apache/camel/component/swagger/main/swagger-annotations-1.5.8.jar
 /org/apache/camel/component/swagger/main/swagger-core-1.5.8.jar
 /org/apache/camel/component/swagger/main/swagger-jaxrs-1.5.8.jar
 /org/apache/camel/component/swagger/main/swagger-models-1.5.8.jar
-/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.17.1.jar
+/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.17.2-SNAPSHOT.jar
 /org/apache/camel/component/tagsoup/main/tagsoup-1.2.1.jar
-/org/apache/camel/component/undertow/main/camel-undertow-2.17.1.jar
-/org/apache/camel/component/velocity/main/camel-velocity-2.17.1.jar
-/org/apache/camel/component/weather/main/camel-weather-2.17.1.jar
-/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.17.1.jar
-/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.17.1.jar
-/org/apache/camel/component/xstream/main/camel-xstream-2.17.1.jar
-/org/apache/camel/component/zipfile/main/camel-zipfile-2.17.1.jar
-/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.17.1.jar
-/org/apache/camel/core/main/camel-core-2.17.1.jar
-/org/apache/camel/core/xml/main/camel-core-xml-2.17.1.jar
+/org/apache/camel/component/undertow/main/camel-undertow-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/velocity/main/camel-velocity-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/weather/main/camel-weather-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/xstream/main/camel-xstream-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/zipfile/main/camel-zipfile-2.17.2-SNAPSHOT.jar
+/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.17.2-SNAPSHOT.jar
+/org/apache/camel/core/main/camel-core-2.17.2-SNAPSHOT.jar
+/org/apache/camel/core/xml/main/camel-core-xml-2.17.2-SNAPSHOT.jar
 /org/apache/camel/script/groovy/main/groovy-all-2.4.6.jar
 /org/apache/camel/script/jruby/main/jruby-complete-1.7.18.jar
 /org/apache/camel/script/jruby/main/scriptengines-jruby-1.1.1.jar
 /org/apache/camel/script/python/main/jython-2.5.3.jar
 /org/apache/camel/script/rhino/main/js-1.7R2.jar
 /org/apache/camel/script/rhino/main/livetribe-jsr223-2.0.3.jar
 /org/apache/camel/script/rhino/main/scriptengines-javascript-1.1.1.jar
-/org/apache/camel/spring/main/camel-spring-2.17.1.jar
+/org/apache/camel/spring/main/camel-spring-2.17.2-SNAPSHOT.jar
 /org/apache/commons/csv/main/commons-csv-1.1.jar
 /org/apache/commons/lang3/main/commons-lang3-3.4.jar
 /org/apache/commons/net/main/commons-net-3.3.jar
@@ -163,21 +163,21 @@
 /org/eclipse/aether/main/aether-transport-file-1.0.2.v20150114.jar
 /org/eclipse/aether/main/aether-transport-http-1.0.2.v20150114.jar
 /org/eclipse/aether/main/maven-aether-provider-3.3.3.jar
-/org/eclipse/jetty/main/jetty-client-9.2.15.v20160210.jar
-/org/eclipse/jetty/main/jetty-http-9.2.15.v20160210.jar
-/org/eclipse/jetty/main/jetty-io-9.2.15.v20160210.jar
-/org/eclipse/jetty/main/jetty-util-9.2.15.v20160210.jar
-/org/eclipse/jetty/main/jetty-util-ajax-9.2.15.v20160210.jar
+/org/eclipse/jetty/main/jetty-client-9.2.17.v20160517.jar
+/org/eclipse/jetty/main/jetty-http-9.2.17.v20160517.jar
+/org/eclipse/jetty/main/jetty-io-9.2.17.v20160517.jar
+/org/eclipse/jetty/main/jetty-util-9.2.17.v20160517.jar
+/org/eclipse/jetty/main/jetty-util-ajax-9.2.17.v20160517.jar
 /org/elasticsearch/main/compress-lzf-1.0.2.jar
 /org/elasticsearch/main/elasticsearch-2.2.0.jar
 /org/elasticsearch/main/hppc-0.7.1.jar
 /org/elasticsearch/main/jsr166e-1.1.0.jar
 /org/elasticsearch/main/securesm-1.0.jar
 /org/elasticsearch/main/t-digest-3.0.jar
-/org/fusesource/hawtbuf/main/hawtbuf-1.10.jar
-/org/fusesource/hawtdispatch/main/hawtdispatch-1.21.jar
-/org/fusesource/hawtdispatch/main/hawtdispatch-transport-1.21.jar
-/org/fusesource/mqtt/main/mqtt-client-1.12.jar
+/org/fusesource/hawtbuf/main/hawtbuf-1.11.jar
+/org/fusesource/hawtdispatch/main/hawtdispatch-1.22.jar
+/org/fusesource/hawtdispatch/main/hawtdispatch-transport-1.22.jar
+/org/fusesource/mqtt/main/mqtt-client-1.14.jar
 /org/infinispan/8.2/infinispan-client-hotrod-8.1.0.Final.jar
 /org/infinispan/8.2/infinispan-commons-8.1.0.Final.jar
 /org/infinispan/8.2/infinispan-core-8.1.0.Final.jar

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
         <version.wildfly>10.0.0.Final</version.wildfly>
 
         <!-- Camel version -->
-        <version.apache.camel>2.17.1</version.apache.camel>
+        <version.apache.camel>2.17.2-SNAPSHOT</version.apache.camel>
 
         <!-- Other versions -->
         <version.apache.felix.configadmin>1.8.8</version.apache.felix.configadmin>