You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2016/03/21 09:34:46 UTC
[3/3] camel git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aaa6bf59
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aaa6bf59
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aaa6bf59
Branch: refs/heads/master
Commit: aaa6bf59306cf21681d291b170bd55aa45726749
Parents: fea6904 37584a7
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Mar 21 16:31:56 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Mar 21 16:31:56 2016 +0800
----------------------------------------------------------------------
apache-camel/pom.xml | 2 +-
buildingtools/pom.xml | 2 +-
camel-core/pom.xml | 2 +-
camel-website/pom.xml | 2 +-
components/camel-ahc-ws/pom.xml | 2 +-
components/camel-ahc/pom.xml | 2 +-
components/camel-amqp/pom.xml | 2 +-
components/camel-apns/pom.xml | 2 +-
components/camel-atmos/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-atom/pom.xml | 2 +-
components/camel-avro/pom.xml | 2 +-
components/camel-aws/pom.xml | 2 +-
components/camel-bam/pom.xml | 2 +-
components/camel-barcode/pom.xml | 2 +-
components/camel-base64/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 2 +-
components/camel-beanio/pom.xml | 2 +-
components/camel-beanstalk/pom.xml | 2 +-
components/camel-bindy/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 2 +-
components/camel-boon/pom.xml | 2 +-
components/camel-box/pom.xml | 2 +-
components/camel-braintree/pom.xml | 2 +-
components/camel-cache/pom.xml | 2 +-
components/camel-cassandraql/pom.xml | 2 +-
components/camel-castor/pom.xml | 2 +-
components/camel-cdi/pom.xml | 2 +-
components/camel-chunk/pom.xml | 2 +-
components/camel-cmis/pom.xml | 2 +-
components/camel-coap/pom.xml | 2 +-
components/camel-cometd/pom.xml | 2 +-
components/camel-context/pom.xml | 2 +-
components/camel-core-osgi/pom.xml | 2 +-
components/camel-core-xml/pom.xml | 2 +-
components/camel-couchdb/pom.xml | 2 +-
components/camel-crypto/pom.xml | 2 +-
components/camel-csv/pom.xml | 2 +-
components/camel-cxf-transport/pom.xml | 2 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-disruptor/pom.xml | 2 +-
components/camel-dns/pom.xml | 2 +-
components/camel-docker/pom.xml | 2 +-
components/camel-dozer/pom.xml | 2 +-
components/camel-dropbox/pom.xml | 2 +-
components/camel-eclipse/pom.xml | 2 +-
components/camel-ejb/pom.xml | 2 +-
components/camel-elasticsearch/pom.xml | 2 +-
components/camel-elsql/pom.xml | 2 +-
components/camel-etcd/pom.xml | 2 +-
components/camel-eventadmin/pom.xml | 2 +-
components/camel-exec/pom.xml | 2 +-
components/camel-facebook/pom.xml | 2 +-
components/camel-flatpack/pom.xml | 2 +-
components/camel-fop/pom.xml | 2 +-
components/camel-freemarker/pom.xml | 2 +-
components/camel-ftp/pom.xml | 2 +-
components/camel-gae/pom.xml | 2 +-
components/camel-ganglia/pom.xml | 2 +-
components/camel-geocoder/pom.xml | 2 +-
components/camel-git/pom.xml | 2 +-
components/camel-github/pom.xml | 2 +-
components/camel-google-calendar/pom.xml | 2 +-
components/camel-google-drive/pom.xml | 2 +-
components/camel-google-mail/pom.xml | 2 +-
components/camel-gora/pom.xml | 2 +-
components/camel-grape/pom.xml | 2 +-
components/camel-groovy/pom.xml | 2 +-
components/camel-gson/pom.xml | 2 +-
components/camel-guava-eventbus/pom.xml | 2 +-
components/camel-guice/pom.xml | 2 +-
components/camel-hawtdb/pom.xml | 2 +-
components/camel-hazelcast/pom.xml | 2 +-
components/camel-hbase/pom.xml | 2 +-
components/camel-hdfs/pom.xml | 2 +-
components/camel-hdfs2/pom.xml | 2 +-
components/camel-hessian/pom.xml | 2 +-
components/camel-hipchat/pom.xml | 2 +-
components/camel-hl7/pom.xml | 2 +-
components/camel-http-common/pom.xml | 2 +-
components/camel-http/pom.xml | 2 +-
components/camel-http4/pom.xml | 2 +-
components/camel-ibatis/pom.xml | 2 +-
components/camel-ical/pom.xml | 2 +-
components/camel-ignite/pom.xml | 2 +-
components/camel-infinispan/pom.xml | 2 +-
components/camel-irc/pom.xml | 2 +-
components/camel-ironmq/pom.xml | 2 +-
components/camel-jackson/pom.xml | 2 +-
components/camel-jacksonxml/pom.xml | 2 +-
components/camel-jasypt/pom.xml | 2 +-
components/camel-javaspace/pom.xml | 2 +-
components/camel-jaxb/pom.xml | 2 +-
components/camel-jbpm/pom.xml | 2 +-
components/camel-jcache/pom.xml | 2 +-
components/camel-jclouds/pom.xml | 2 +-
components/camel-jcr/pom.xml | 2 +-
components/camel-jdbc/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 2 +-
components/camel-jetty8/pom.xml | 2 +-
components/camel-jetty9/pom.xml | 2 +-
components/camel-jgroups/pom.xml | 2 +-
components/camel-jibx/pom.xml | 2 +-
components/camel-jing/pom.xml | 2 +-
components/camel-jira/pom.xml | 2 +-
components/camel-jms/pom.xml | 2 +-
components/camel-jmx/pom.xml | 2 +-
components/camel-jolt/pom.xml | 2 +-
components/camel-josql/pom.xml | 2 +-
components/camel-jpa/pom.xml | 2 +-
components/camel-jsch/pom.xml | 2 +-
components/camel-jsonpath/pom.xml | 2 +-
components/camel-jt400/pom.xml | 2 +-
components/camel-juel/pom.xml | 2 +-
components/camel-jxpath/pom.xml | 2 +-
components/camel-kafka/pom.xml | 2 +-
components/camel-kestrel/pom.xml | 2 +-
components/camel-krati/pom.xml | 2 +-
components/camel-kubernetes/pom.xml | 2 +-
components/camel-kura/pom.xml | 2 +-
components/camel-ldap/pom.xml | 2 +-
components/camel-leveldb/pom.xml | 2 +-
components/camel-linkedin/camel-linkedin-api/pom.xml | 2 +-
.../camel-linkedin/camel-linkedin-component/pom.xml | 2 +-
components/camel-linkedin/pom.xml | 2 +-
components/camel-lucene/pom.xml | 2 +-
components/camel-lzf/pom.xml | 2 +-
components/camel-mail/pom.xml | 2 +-
components/camel-metrics/pom.xml | 2 +-
components/camel-mina/pom.xml | 2 +-
components/camel-mina2/pom.xml | 2 +-
components/camel-mllp/pom.xml | 2 +-
components/camel-mongodb-gridfs/pom.xml | 2 +-
components/camel-mongodb/pom.xml | 2 +-
components/camel-mqtt/pom.xml | 2 +-
components/camel-msv/pom.xml | 2 +-
components/camel-mustache/pom.xml | 2 +-
components/camel-mvel/pom.xml | 2 +-
components/camel-mybatis/pom.xml | 2 +-
components/camel-nagios/pom.xml | 2 +-
components/camel-nats/pom.xml | 2 +-
components/camel-netty-http/pom.xml | 2 +-
components/camel-netty/pom.xml | 2 +-
components/camel-netty4-http/pom.xml | 2 +-
components/camel-netty4/pom.xml | 2 +-
components/camel-ognl/pom.xml | 2 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 2 +-
.../camel-olingo2/camel-olingo2-component/pom.xml | 2 +-
components/camel-olingo2/pom.xml | 2 +-
components/camel-openshift/pom.xml | 2 +-
components/camel-optaplanner/pom.xml | 2 +-
components/camel-paho/pom.xml | 2 +-
components/camel-paxlogging/pom.xml | 2 +-
components/camel-pdf/pom.xml | 2 +-
components/camel-pgevent/pom.xml | 2 +-
components/camel-printer/pom.xml | 2 +-
components/camel-protobuf/pom.xml | 2 +-
components/camel-quartz/pom.xml | 2 +-
components/camel-quartz2/pom.xml | 2 +-
components/camel-quickfix/pom.xml | 2 +-
components/camel-rabbitmq/pom.xml | 2 +-
components/camel-restlet/pom.xml | 2 +-
components/camel-rmi/pom.xml | 2 +-
components/camel-routebox/pom.xml | 2 +-
components/camel-rss/pom.xml | 2 +-
components/camel-ruby/pom.xml | 2 +-
components/camel-rx/pom.xml | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 2 +-
.../camel-salesforce-maven-plugin/pom.xml | 2 +-
components/camel-salesforce/pom.xml | 2 +-
components/camel-sap-netweaver/pom.xml | 2 +-
components/camel-saxon/pom.xml | 2 +-
components/camel-scala/pom.xml | 2 +-
components/camel-schematron/pom.xml | 2 +-
components/camel-scr/pom.xml | 2 +-
components/camel-script/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-servletlistener/pom.xml | 2 +-
components/camel-shiro/pom.xml | 2 +-
components/camel-sip/pom.xml | 2 +-
components/camel-sjms/pom.xml | 2 +-
components/camel-slack/pom.xml | 2 +-
components/camel-smpp/pom.xml | 2 +-
components/camel-snakeyaml/pom.xml | 2 +-
components/camel-snmp/pom.xml | 2 +-
components/camel-soap/pom.xml | 2 +-
components/camel-solr/pom.xml | 2 +-
components/camel-spark-rest/pom.xml | 2 +-
components/camel-spark/pom.xml | 2 +-
components/camel-splunk/pom.xml | 2 +-
components/camel-spring-batch/pom.xml | 2 +-
components/camel-spring-boot-starter/pom.xml | 2 +-
components/camel-spring-boot/pom.xml | 2 +-
components/camel-spring-integration/pom.xml | 2 +-
components/camel-spring-javaconfig/pom.xml | 2 +-
components/camel-spring-ldap/pom.xml | 2 +-
components/camel-spring-redis/pom.xml | 2 +-
components/camel-spring-security/pom.xml | 2 +-
components/camel-spring-ws/pom.xml | 2 +-
components/camel-spring/pom.xml | 2 +-
components/camel-sql/pom.xml | 2 +-
components/camel-ssh/pom.xml | 2 +-
components/camel-stax/pom.xml | 2 +-
components/camel-stomp/pom.xml | 2 +-
components/camel-stream/pom.xml | 2 +-
components/camel-stringtemplate/pom.xml | 2 +-
components/camel-swagger-java/pom.xml | 2 +-
components/camel-swagger/pom.xml | 2 +-
components/camel-syslog/pom.xml | 2 +-
components/camel-tagsoup/pom.xml | 2 +-
components/camel-tarfile/pom.xml | 2 +-
components/camel-test-blueprint/pom.xml | 2 +-
components/camel-test-cdi/pom.xml | 2 +-
components/camel-test-spring/pom.xml | 2 +-
components/camel-test-spring3/pom.xml | 2 +-
components/camel-test-spring40/pom.xml | 2 +-
components/camel-test/pom.xml | 2 +-
components/camel-testng/pom.xml | 2 +-
components/camel-twitter/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
components/camel-univocity-parsers/pom.xml | 2 +-
components/camel-urlrewrite/pom.xml | 2 +-
components/camel-velocity/pom.xml | 2 +-
components/camel-vertx/pom.xml | 2 +-
components/camel-weather/pom.xml | 2 +-
components/camel-websocket/pom.xml | 2 +-
components/camel-xmlbeans/pom.xml | 2 +-
components/camel-xmljson/pom.xml | 2 +-
components/camel-xmlrpc/pom.xml | 2 +-
components/camel-xmlsecurity/pom.xml | 2 +-
components/camel-xmpp/pom.xml | 2 +-
components/camel-xstream/pom.xml | 2 +-
components/camel-yammer/pom.xml | 2 +-
components/camel-zipfile/pom.xml | 2 +-
components/camel-zookeeper/pom.xml | 2 +-
components/pom.xml | 2 +-
etc/pom.xml | 2 +-
examples/camel-example-activemq-tomcat/pom.xml | 2 +-
examples/camel-example-aggregate/pom.xml | 2 +-
examples/camel-example-bam/pom.xml | 2 +-
examples/camel-example-box-osgi/pom.xml | 2 +-
examples/camel-example-cafe/pom.xml | 2 +-
examples/camel-example-cdi-metrics/pom.xml | 2 +-
examples/camel-example-cdi-osgi/README.md | 12 ++++++------
examples/camel-example-cdi-osgi/pom.xml | 2 +-
examples/camel-example-cdi-properties/README.md | 4 ++--
examples/camel-example-cdi-properties/pom.xml | 2 +-
examples/camel-example-cdi-rest-servlet/README.md | 4 ++--
examples/camel-example-cdi-rest-servlet/pom.xml | 2 +-
examples/camel-example-cdi-test/pom.xml | 2 +-
examples/camel-example-cdi/pom.xml | 2 +-
examples/camel-example-console/pom.xml | 2 +-
examples/camel-example-cxf-blueprint/pom.xml | 2 +-
examples/camel-example-cxf-osgi/pom.xml | 2 +-
examples/camel-example-cxf-proxy/pom.xml | 2 +-
examples/camel-example-cxf-tomcat/pom.xml | 2 +-
examples/camel-example-cxf/pom.xml | 2 +-
examples/camel-example-etl/pom.xml | 2 +-
examples/camel-example-ftp/pom.xml | 2 +-
examples/camel-example-gae/pom.xml | 2 +-
examples/camel-example-gauth/pom.xml | 2 +-
examples/camel-example-guice-jms/pom.xml | 2 +-
examples/camel-example-jdbc/pom.xml | 2 +-
examples/camel-example-jms-file/pom.xml | 2 +-
examples/camel-example-jmx/pom.xml | 2 +-
examples/camel-example-loadbalancing/pom.xml | 2 +-
examples/camel-example-loan-broker/pom.xml | 2 +-
examples/camel-example-management/pom.xml | 2 +-
examples/camel-example-mybatis/pom.xml | 2 +-
examples/camel-example-netty-http/myapp-one/pom.xml | 2 +-
examples/camel-example-netty-http/myapp-two/pom.xml | 2 +-
examples/camel-example-netty-http/pom.xml | 2 +-
.../shared-netty-http-server/pom.xml | 2 +-
examples/camel-example-osgi-rmi/pom.xml | 2 +-
examples/camel-example-osgi/pom.xml | 2 +-
examples/camel-example-pojo-messaging/pom.xml | 2 +-
.../camel-example-reportincident-wssecurity/pom.xml | 2 +-
examples/camel-example-reportincident/pom.xml | 2 +-
examples/camel-example-restlet-jdbc/pom.xml | 2 +-
examples/camel-example-route-throttling/pom.xml | 2 +-
examples/camel-example-servlet-rest-blueprint/pom.xml | 2 +-
examples/camel-example-servlet-tomcat-no-spring/pom.xml | 2 +-
examples/camel-example-servlet-tomcat/pom.xml | 2 +-
examples/camel-example-simplejirabot/javadsl/pom.xml | 2 +-
examples/camel-example-simplejirabot/pom.xml | 2 +-
examples/camel-example-simplejirabot/xmlconf/pom.xml | 2 +-
examples/camel-example-spark-rest/pom.xml | 2 +-
examples/camel-example-splunk/pom.xml | 2 +-
examples/camel-example-spring-boot-metrics/pom.xml | 2 +-
examples/camel-example-spring-boot-starter/pom.xml | 2 +-
examples/camel-example-spring-boot/pom.xml | 2 +-
examples/camel-example-spring-javaconfig/pom.xml | 2 +-
examples/camel-example-spring-jms/pom.xml | 2 +-
examples/camel-example-spring-security/pom.xml | 2 +-
examples/camel-example-spring-ws/pom.xml | 2 +-
examples/camel-example-spring-xquery/pom.xml | 2 +-
examples/camel-example-spring/pom.xml | 2 +-
examples/camel-example-sql-blueprint/pom.xml | 2 +-
examples/camel-example-sql/pom.xml | 2 +-
examples/camel-example-ssh-security/pom.xml | 2 +-
examples/camel-example-ssh/pom.xml | 2 +-
examples/camel-example-swagger-cdi/pom.xml | 2 +-
examples/camel-example-swagger-xml/pom.xml | 2 +-
examples/camel-example-tracer/pom.xml | 2 +-
.../camel-example-twitter-websocket-blueprint/pom.xml | 2 +-
examples/camel-example-twitter-websocket/pom.xml | 2 +-
examples/camel-example-widget-gadget-cdi/pom.xml | 2 +-
examples/camel-example-widget-gadget-java/pom.xml | 2 +-
examples/camel-example-widget-gadget-xml/pom.xml | 2 +-
examples/pom.xml | 2 +-
parent/pom.xml | 2 +-
platforms/catalog-lucene/pom.xml | 2 +-
platforms/catalog/pom.xml | 2 +-
platforms/commands/commands-core/pom.xml | 2 +-
platforms/commands/commands-jolokia/pom.xml | 2 +-
platforms/commands/commands-spring-boot/pom.xml | 2 +-
platforms/commands/pom.xml | 2 +-
platforms/karaf/commands-catalog/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 2 +-
platforms/karaf/pom.xml | 2 +-
platforms/pom.xml | 2 +-
pom.xml | 2 +-
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-itest-cdi/pom.xml | 2 +-
tests/camel-itest-karaf/pom.xml | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
tests/camel-itest-performance/pom.xml | 2 +-
tests/camel-itest-spring32/pom.xml | 2 +-
tests/camel-itest-spring40/pom.xml | 2 +-
tests/camel-itest-standalone/pom.xml | 2 +-
tests/camel-itest/pom.xml | 2 +-
tests/camel-partial-classpath-test/pom.xml | 2 +-
tests/camel-performance/pom.xml | 2 +-
tests/camel-typeconverterscan-test/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/test-bundles/mock-javamail_1.7/pom.xml | 2 +-
tests/test-bundles/pom.xml | 2 +-
tooling/apt/pom.xml | 2 +-
tooling/archetypes/camel-archetype-activemq/pom.xml | 2 +-
.../archetypes/camel-archetype-api-component/pom.xml | 2 +-
tooling/archetypes/camel-archetype-blueprint/pom.xml | 2 +-
tooling/archetypes/camel-archetype-cdi/pom.xml | 2 +-
tooling/archetypes/camel-archetype-component/pom.xml | 2 +-
.../camel-archetype-cxf-code-first-blueprint/pom.xml | 2 +-
.../pom.xml | 2 +-
tooling/archetypes/camel-archetype-dataformat/pom.xml | 2 +-
tooling/archetypes/camel-archetype-groovy/pom.xml | 2 +-
tooling/archetypes/camel-archetype-java/pom.xml | 2 +-
tooling/archetypes/camel-archetype-scala/pom.xml | 2 +-
tooling/archetypes/camel-archetype-scr/pom.xml | 2 +-
tooling/archetypes/camel-archetype-spring-boot/pom.xml | 2 +-
tooling/archetypes/camel-archetype-spring-dm/pom.xml | 2 +-
tooling/archetypes/camel-archetype-spring/pom.xml | 2 +-
tooling/archetypes/camel-archetype-web/pom.xml | 2 +-
tooling/archetypes/pom.xml | 2 +-
tooling/camel-manual/pom.xml | 2 +-
tooling/maven/camel-api-component-maven-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
tooling/maven/camel-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
tooling/maven/guice-maven-plugin/pom.xml | 2 +-
tooling/maven/pom.xml | 2 +-
tooling/parent/pom.xml | 2 +-
tooling/pom.xml | 2 +-
tooling/spi-annotations/pom.xml | 2 +-
367 files changed, 374 insertions(+), 374 deletions(-)
----------------------------------------------------------------------