You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/02/27 17:13:53 UTC
[camel] branch jenkins-pipeline updated (54dfb45 -> 6150f9b)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 54dfb45 CAMEL-11930: camel-box and camel-linkedin make ...
discard 0f85182 CAMEL-11930: camel-spring and camel-blueprint: ...
add 0929a98 Upgrade Embed MongoDB to version 2.0.3
add 8aef513 Revert "Swagger-java now uses Jackson 2.9.x for his Karaf feature"
add ce0df6d Downgrade Swagger Java to version 1.5.17, since it has problem with CXF
add 0f7664d Regen docs of camel-core
add 209cb7d Added Sticky Load Balancer EIP docs
add 9a8a3a7 Add examples to sticky-eip docs
add 185dd0c Regen docs
add 1b393fb Added roundRobin load balancer EIP docs
add 08af109 Added description of roundRobin
add c75f7d6 Added description of sticky Load balancing
add 6a05393 Added topic load balancer EIP docs
add 63805e4 Added Topic load balancer EIP description
add 97e486a Added failover load balancing EIP docs
add e31d385 Added weighted load balance EIP docs
add 241587c Upgrade Chronicle Queue to version 4.6.73
add 5d968e3 add missing attributes in RedeliveryPolicyFactoryBean
add a6b0b2c Upgrade Ekstazi to version 5.2.0
add 4656f0f CAMEL-12266: Maven plugin for restdsl can now generate xml.
add 2e87df3 CAMEL-12282: rest-dsl - Inlined route has route id wrongly assigned
add 87e6ef3 CAMEL-12266: Maven plugin for restdsl can now generate xml.
add ca87845 CAMEL-12266: Maven plugin for restdsl can now generate xml.
add 9ccb9cc CAMEL-12266: Add log4j logging
add 7ffe15f Upgrade Json Validator to version 0.1.15
add d6aa7da CAMEL-12283: camel-restdsl-swagger-plugin - Allow to filter operations
add 495dd3f CAMEL-12284: camel-beanio - Set encoding option does not work
add 72593ed Upgrade Netty to version 4.1.22.Final
add f7009f8 CAMEL-11497 - fix broken links
add 9d568d2 Upgrade Caffeine to version 2.6.2
add 2bb2400 Upgrade Chronicle Core to version 1.11.0
add 3bf7e60 Upgrade Async Http Client to version 2.4.2
add e1db679 Fix up documentation of Camel Milo
add cd6a277 Upgrade AssertJ to version 3.9.1
add 0ef32ce Upgrade Disruptor to version 3.3.8
add e92e8e7 CAMEL-12286: Fix camel-milo client component
add 2e3a7b1 Regen
add b869562 Added InOnly EIP docs
add d5a1f8b Added inOut EIP docs
add 107430d Upgrade RxJava to version 2.1.10
add 2907efb Added BatchAggregationStrategy
add a12d53f Renamed to better name. Fixed CS.
add 6ebf7e1 Fix up documentation of Camel MongoDB
add f2a7ca1 Fixed Linkedin component description
add 0444a4a CAMEL-11497- add pipeline onFallback and pollEnrich eips docs
add 2ae0093 CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator
add ccde993 Added Stop EIP docs
add daadfe7 CAMEL-12287: Allow overriding the endpoint host
add 7d8f0ea CAMEL-12273: Component docs should not generate empty tables.
add 065b6b4 CAMEL-12273: Regen docs
add 1cb67e2 CAMEL-12273: Regen docs
add 5355a19 Added automatic generation marker to pipeline docs
add 9a6f33f Added automatic generation marker to onFallback docs
add 539fafe Added automatic generation makers for enricher docs
add b16fdf9 Fixed component doc
add a452a9e Added remove Header EIP docs
add 0eba468 Upgrade EhCache to version 3.5.0
add 0ff8be2 CAMEL-12047: Allow to resolve JSonSchemaResolver from registry
add 4f50ce7 Regen docs
add c88f2b4 Added remove headers EIP docs
add ed47a51 CAMEL-11598: camel-spring-boot - actuator endpoints - Make it read-only by default
add 16fdf71 Upgrade Spring Cloud Commons to version 1.3.2.RELEASE
add a6e3d4d CAMEL-12293: Avoid KeyAlreadyExistsException for listTypeConverters JMX operation
add 925a290 CAMEL-11637: Unable to assign null value to a S...
add 2e20c53 CAMEL-10474: Aggregate EIP allow to force complete of all previous groups decided by AggregationStrategy.
add 020f37b CAMEL-12296: Aggregate EIP - Added option to complete all previous groups on new incoming group detected.
add 3639bca CAMEL-12123: camel-salesforce - Http proxy supp...
new 9fbfad9 CAMEL-11930: camel-spring and camel-blueprint: ...
new 6150f9b CAMEL-11930: camel-box and camel-linkedin make ...
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (54dfb45)
\
N -- N -- N refs/heads/jenkins-pipeline (6150f9b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-core/src/main/docs/bean-component.adoc | 3 +
camel-core/src/main/docs/binding-component.adoc | 3 +
camel-core/src/main/docs/browse-component.adoc | 3 +
camel-core/src/main/docs/class-component.adoc | 3 +
camel-core/src/main/docs/controlbus-component.adoc | 3 +
camel-core/src/main/docs/dataformat-component.adoc | 3 +
camel-core/src/main/docs/dataset-component.adoc | 3 +
camel-core/src/main/docs/direct-component.adoc | 3 +
camel-core/src/main/docs/direct-vm-component.adoc | 3 +
camel-core/src/main/docs/eips/aggregate-eip.adoc | 112 ++++++---
.../src/main/docs/eips/batch-config-eip.adoc | 3 +-
camel-core/src/main/docs/eips/bean-eip.adoc | 5 +-
camel-core/src/main/docs/eips/choice-eip.adoc | 3 +-
.../src/main/docs/eips/circuitBreaker-eip.adoc | 3 +-
camel-core/src/main/docs/eips/claimCheck-eip.adoc | 5 +-
.../src/main/docs/eips/convertBodyTo-eip.adoc | 3 +-
.../src/main/docs/eips/customLoadBalancer-eip.adoc | 3 +-
camel-core/src/main/docs/eips/delay-eip.adoc | 3 +-
.../src/main/docs/eips/dynamicRouter-eip.adoc | 5 +-
camel-core/src/main/docs/eips/enrich-eip.adoc | 171 ++------------
camel-core/src/main/docs/eips/failover-eip.adoc | 46 ++++
camel-core/src/main/docs/eips/filter-eip.adoc | 4 +-
camel-core/src/main/docs/eips/from-eip.adoc | 3 +-
camel-core/src/main/docs/eips/hystrix-eip.adoc | 73 +-----
.../main/docs/eips/hystrixConfiguration-eip.adoc | 17 +-
.../src/main/docs/eips/idempotentConsumer-eip.adoc | 5 +-
camel-core/src/main/docs/eips/inOnly-eip.adoc | 17 ++
camel-core/src/main/docs/eips/inOut-eip.adoc | 17 ++
camel-core/src/main/docs/eips/loadBalance-eip.adoc | 3 +-
camel-core/src/main/docs/eips/log-eip.adoc | 3 +-
camel-core/src/main/docs/eips/loop-eip.adoc | 5 +-
camel-core/src/main/docs/eips/multicast-eip.adoc | 21 +-
.../eips/{hystrix-eip.adoc => onFallback-eip.adoc} | 72 +-----
.../{pipes-and-filters.adoc => pipeline-eip.adoc} | 19 +-
.../src/main/docs/eips/pipes-and-filters.adoc | 9 +-
camel-core/src/main/docs/eips/pollEnrich-eip.adoc | 135 +++++++++++
camel-core/src/main/docs/eips/random-eip.adoc | 4 +-
.../src/main/docs/eips/recipientList-eip.adoc | 27 ++-
.../src/main/docs/eips/removeHeader-eip.adoc | 39 ++++
.../src/main/docs/eips/removeHeaders-eip.adoc | 25 ++
camel-core/src/main/docs/eips/resequence-eip.adoc | 3 +-
camel-core/src/main/docs/eips/roundRobin-eip.adoc | 35 +++
camel-core/src/main/docs/eips/routingSlip-eip.adoc | 5 +-
camel-core/src/main/docs/eips/saga-eip.adoc | 13 +-
camel-core/src/main/docs/eips/sample-eip.adoc | 5 +-
camel-core/src/main/docs/eips/script-eip.adoc | 4 +-
camel-core/src/main/docs/eips/serviceCall-eip.adoc | 3 +-
camel-core/src/main/docs/eips/sort-eip.adoc | 3 +-
camel-core/src/main/docs/eips/split-eip.adoc | 23 +-
camel-core/src/main/docs/eips/sticky-eip.adoc | 45 ++++
camel-core/src/main/docs/eips/stop-eip.adoc | 22 ++
.../src/main/docs/eips/stream-config-eip.adoc | 5 +-
camel-core/src/main/docs/eips/threads-eip.adoc | 3 +-
camel-core/src/main/docs/eips/throttle-eip.adoc | 3 +-
camel-core/src/main/docs/eips/topic-eip.adoc | 35 +++
camel-core/src/main/docs/eips/validate-eip.adoc | 4 +-
camel-core/src/main/docs/eips/weighted-eip.adoc | 43 ++++
camel-core/src/main/docs/eips/wireTap-eip.adoc | 7 +-
camel-core/src/main/docs/file-component.adoc | 3 +
camel-core/src/main/docs/language-component.adoc | 3 +
camel-core/src/main/docs/log-component.adoc | 3 +
camel-core/src/main/docs/mock-component.adoc | 3 +
camel-core/src/main/docs/properties-component.adoc | 3 +
camel-core/src/main/docs/ref-component.adoc | 3 +
camel-core/src/main/docs/rest-api-component.adoc | 3 +
camel-core/src/main/docs/rest-component.adoc | 3 +
camel-core/src/main/docs/saga-component.adoc | 3 +
camel-core/src/main/docs/scheduler-component.adoc | 3 +
camel-core/src/main/docs/seda-component.adoc | 3 +
camel-core/src/main/docs/stub-component.adoc | 3 +
camel-core/src/main/docs/test-component.adoc | 3 +
camel-core/src/main/docs/timer-component.adoc | 3 +
camel-core/src/main/docs/validator-component.adoc | 3 +
camel-core/src/main/docs/vm-component.adoc | 3 +
camel-core/src/main/docs/xslt-component.adoc | 3 +
.../mbean/ManagedAggregateProcessorMBean.java | 3 +
.../mbean/ManagedAggregateProcessor.java | 4 +
.../mbean/ManagedTypeConverterRegistry.java | 4 +-
.../apache/camel/model/AggregateDefinition.java | 26 +++
.../apache/camel/model/rest/RestDefinition.java | 2 +-
.../apache/camel/processor/RedeliveryPolicy.java | 1 +
.../processor/aggregate/AggregateProcessor.java | 21 +-
.../aggregate/GroupedBodyAggregationStrategy.java | 33 ++-
.../camel/runtimecatalog/RuntimeCamelCatalog.java | 14 ++
.../camel/util/toolbox/AggregationStrategies.java | 8 +
.../camel/management/ManagedFromRestGetTest.java | 4 +
...gregateCompletionOnNewCorrelationGroupTest.java | 70 ++++++
...eCompletionHeaderInAggregationStrategyTest.java | 72 ++++++
.../src/main/docs/ahc-ws-component.adoc | 3 +
.../camel-ahc/src/main/docs/ahc-component.adoc | 3 +
.../camel-amqp/src/main/docs/amqp-component.adoc | 3 +
.../camel-apns/src/main/docs/apns-component.adoc | 3 +
.../src/main/docs/asterisk-component.adoc | 3 +
.../camel-atmos/src/main/docs/atmos-component.adoc | 3 +
.../main/docs/atmosphere-websocket-component.adoc | 3 +
.../camel-atom/src/main/docs/atom-component.adoc | 3 +
.../src/main/docs/atomix-map-component.adoc | 3 +
.../src/main/docs/atomix-messaging-component.adoc | 3 +
.../src/main/docs/atomix-multimap-component.adoc | 3 +
.../src/main/docs/atomix-queue-component.adoc | 3 +
.../src/main/docs/atomix-set-component.adoc | 3 +
.../src/main/docs/atomix-value-component.adoc | 3 +
.../camel-avro/src/main/docs/avro-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-cw-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 3 +
.../src/main/docs/aws-ddbstream-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-ec2-component.adoc | 3 +
.../src/main/docs/aws-kinesis-component.adoc | 3 +
.../main/docs/aws-kinesis-firehose-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-kms-component.adoc | 3 +
.../src/main/docs/aws-lambda-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-mq-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-s3-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-sdb-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-ses-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-sns-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 3 +
.../camel-aws/src/main/docs/aws-swf-component.adoc | 3 +
.../src/main/docs/azure-blob-component.adoc | 3 +
.../src/main/docs/azure-queue-component.adoc | 3 +
.../src/main/docs/bean-validator-component.adoc | 3 +
.../camel/dataformat/beanio/BeanIODataFormat.java | 7 +
.../beanio/SpringBeanIODataFormatSimpleTest.xml | 2 +-
.../src/main/docs/beanstalk-component.adoc | 3 +
.../src/main/docs/bonita-component.adoc | 3 +
.../src/main/docs/box-component.adoc | 3 +
.../src/main/docs/braintree-component.adoc | 3 +
.../camel-cache/src/main/docs/cache-component.adoc | 3 +
.../src/main/docs/caffeine-cache-component.adoc | 3 +
.../main/docs/caffeine-loadcache-component.adoc | 3 +
.../src/main/docs/cql-component.adoc | 3 +
.../src/main/docs/chronicle-engine-component.adoc | 3 +
.../camel-chunk/src/main/docs/chunk-component.adoc | 3 +
.../src/main/docs/cm-sms-component.adoc | 3 +
.../camel-cmis/src/main/docs/cmis-component.adoc | 3 +
.../camel-coap/src/main/docs/coap-component.adoc | 3 +
.../src/main/docs/cometd-component.adoc | 3 +
.../src/main/docs/consul-component.adoc | 3 +
.../src/main/docs/context-component.adoc | 3 +
.../core/xml/AbstractCamelContextFactoryBean.java | 6 +
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 31 +++
.../src/main/docs/couchbase-component.adoc | 3 +
.../src/main/docs/couchdb-component.adoc | 3 +
.../src/main/docs/crypto-cms-component.adoc | 3 +
.../src/main/docs/crypto-component.adoc | 3 +
.../camel-cxf/src/main/docs/cxf-component.adoc | 3 +
.../camel-cxf/src/main/docs/cxfrs-component.adoc | 3 +
.../src/main/docs/digitalocean-component.adoc | 3 +
.../src/main/docs/disruptor-component.adoc | 3 +
.../camel-dns/src/main/docs/dns-component.adoc | 3 +
.../src/main/docs/docker-component.adoc | 3 +
.../camel-dozer/src/main/docs/dozer-component.adoc | 3 +
.../camel-drill/src/main/docs/drill-component.adoc | 3 +
.../src/main/docs/dropbox-component.adoc | 3 +
.../src/main/docs/ehcache-component.adoc | 3 +
.../camel-ejb/src/main/docs/ejb-component.adoc | 3 +
.../main/docs/elasticsearch-rest-component.adoc | 3 +
.../src/main/docs/elasticsearch-component.adoc | 3 +
.../src/main/docs/elasticsearch5-component.adoc | 3 +
.../camel-elsql/src/main/docs/elsql-component.adoc | 3 +
.../camel-etcd/src/main/docs/etcd-component.adoc | 3 +
.../src/main/docs/eventadmin-component.adoc | 3 +
.../camel-exec/src/main/docs/exec-component.adoc | 3 +
.../src/main/docs/facebook-component.adoc | 3 +
.../src/main/docs/flatpack-component.adoc | 3 +
.../camel-flink/src/main/docs/flink-component.adoc | 3 +
.../camel-fop/src/main/docs/fop-component.adoc | 3 +
.../src/main/docs/freemarker-component.adoc | 3 +
.../camel-ftp/src/main/docs/ftp-component.adoc | 3 +
.../camel-ftp/src/main/docs/ftps-component.adoc | 3 +
.../camel-ftp/src/main/docs/sftp-component.adoc | 3 +
.../src/main/docs/ganglia-component.adoc | 3 +
.../src/main/docs/geocoder-component.adoc | 3 +
.../camel-git/src/main/docs/git-component.adoc | 3 +
.../src/main/docs/github-component.adoc | 3 +
.../src/main/docs/google-bigquery-component.adoc | 3 +
.../src/main/docs/google-calendar-component.adoc | 3 +
.../src/main/docs/google-drive-component.adoc | 3 +
.../src/main/docs/google-mail-component.adoc | 3 +
.../src/main/docs/google-pubsub-component.adoc | 3 +
.../camel-gora/src/main/docs/gora-component.adoc | 3 +
.../camel-grape/src/main/docs/grape-component.adoc | 5 +-
.../camel-grpc/src/main/docs/grpc-component.adoc | 3 +
.../src/main/docs/guava-eventbus-component.adoc | 3 +
.../main/docs/hazelcast-atomicvalue-component.adoc | 3 +
.../main/docs/hazelcast-instance-component.adoc | 3 +
.../src/main/docs/hazelcast-list-component.adoc | 3 +
.../src/main/docs/hazelcast-map-component.adoc | 3 +
.../main/docs/hazelcast-multimap-component.adoc | 3 +
.../src/main/docs/hazelcast-queue-component.adoc | 3 +
.../docs/hazelcast-replicatedmap-component.adoc | 3 +
.../main/docs/hazelcast-ringbuffer-component.adoc | 3 +
.../src/main/docs/hazelcast-seda-component.adoc | 3 +
.../src/main/docs/hazelcast-set-component.adoc | 3 +
.../src/main/docs/hazelcast-topic-component.adoc | 3 +
.../camel-hbase/src/main/docs/hbase-component.adoc | 3 +
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 3 +
.../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 3 +
.../src/main/docs/hipchat-component.adoc | 3 +
.../camel-http/src/main/docs/http-component.adoc | 3 +
.../camel-http4/src/main/docs/http4-component.adoc | 3 +
.../src/main/docs/ibatis-component.adoc | 3 +
.../src/main/docs/iec60870-client-component.adoc | 3 +
.../src/main/docs/iec60870-server-component.adoc | 3 +
.../src/main/docs/ignite-cache-component.adoc | 3 +
.../src/main/docs/ignite-compute-component.adoc | 3 +
.../src/main/docs/ignite-events-component.adoc | 3 +
.../src/main/docs/ignite-idgen-component.adoc | 3 +
.../src/main/docs/ignite-messaging-component.adoc | 3 +
.../src/main/docs/ignite-queue-component.adoc | 3 +
.../src/main/docs/ignite-set-component.adoc | 3 +
.../src/main/docs/infinispan-component.adoc | 3 +
.../src/main/docs/influxdb-component.adoc | 3 +
.../camel-irc/src/main/docs/irc-component.adoc | 3 +
.../src/main/docs/ironmq-component.adoc | 3 +
.../src/main/docs/javaspace-component.adoc | 3 +
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 3 +
.../src/main/docs/jcache-component.adoc | 3 +
.../src/main/docs/jclouds-component.adoc | 3 +
.../camel-jcr/src/main/docs/jcr-component.adoc | 3 +
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 3 +
.../src/main/docs/jetty-component.adoc | 3 +
.../src/main/docs/jgroups-component.adoc | 3 +
.../camel-jing/src/main/docs/jing-component.adoc | 3 +
.../camel-jira/src/main/docs/jira-component.adoc | 3 +
.../camel-jms/src/main/docs/jms-component.adoc | 3 +
.../camel-jmx/src/main/docs/jmx-component.adoc | 3 +
.../camel-jolt/src/main/docs/jolt-component.adoc | 3 +
.../camel-jpa/src/main/docs/jpa-component.adoc | 3 +
.../camel-jsch/src/main/docs/scp-component.adoc | 3 +
.../src/main/docs/json-validator-component.adoc | 3 +
.../camel-jt400/src/main/docs/jt400-component.adoc | 3 +
.../camel-kafka/src/main/docs/kafka-component.adoc | 3 +
.../src/main/docs/kestrel-component.adoc | 3 +
.../camel-krati/src/main/docs/krati-component.adoc | 3 +
.../src/main/docs/kubernetes-component.adoc | 3 +
.../docs/kubernetes-config-maps-component.adoc | 3 +
.../docs/kubernetes-deployments-component.adoc | 3 +
.../main/docs/kubernetes-namespaces-component.adoc | 3 +
.../src/main/docs/kubernetes-nodes-component.adoc | 3 +
...rnetes-persistent-volumes-claims-component.adoc | 3 +
.../kubernetes-persistent-volumes-component.adoc | 3 +
.../src/main/docs/kubernetes-pods-component.adoc | 3 +
...bernetes-replication-controllers-component.adoc | 3 +
.../docs/kubernetes-resources-quota-component.adoc | 3 +
.../main/docs/kubernetes-secrets-component.adoc | 3 +
.../kubernetes-service-accounts-component.adoc | 3 +
.../main/docs/kubernetes-services-component.adoc | 3 +
.../docs/openshift-build-configs-component.adoc | 3 +
.../src/main/docs/openshift-builds-component.adoc | 3 +
.../camel-ldap/src/main/docs/ldap-component.adoc | 3 +
.../camel-ldif/src/main/docs/ldif-component.adoc | 3 +
.../src/main/docs/linkedin-component.adoc | 3 +
.../camel/component/linkedin/LinkedInEndpoint.java | 2 +-
.../src/main/docs/lucene-component.adoc | 3 +
.../src/main/docs/lumberjack-component.adoc | 3 +
.../camel-mail/src/main/docs/mail-component.adoc | 3 +
.../src/main/docs/master-component.adoc | 3 +
.../src/main/docs/metrics-component.adoc | 3 +
.../src/main/docs/milo-client-component.adoc | 46 ++--
.../src/main/docs/milo-server-component.adoc | 9 +-
.../milo/client/MiloClientConfiguration.java | 72 ++++++
.../milo/client/internal/SubscriptionManager.java | 77 +++++-
.../camel-mina/src/main/docs/mina-component.adoc | 3 +
.../camel-mina2/src/main/docs/mina2-component.adoc | 3 +
.../camel-mllp/src/main/docs/mllp-component.adoc | 3 +
.../src/main/docs/mongodb-gridfs-component.adoc | 3 +
.../src/main/docs/mongodb-component.adoc | 5 +-
.../src/main/docs/mongodb3-component.adoc | 3 +
.../camel-mqtt/src/main/docs/mqtt-component.adoc | 3 +
.../camel-msv/src/main/docs/msv-component.adoc | 3 +
.../src/main/docs/mustache-component.adoc | 3 +
.../camel-mvel/src/main/docs/mvel-component.adoc | 3 +
.../src/main/docs/mybatis-component.adoc | 3 +
.../src/main/docs/nagios-component.adoc | 3 +
.../camel-nats/src/main/docs/nats-component.adoc | 3 +
.../src/main/docs/netty-http-component.adoc | 3 +
.../camel-netty/src/main/docs/netty-component.adoc | 3 +
.../src/main/docs/netty4-http-component.adoc | 3 +
.../src/main/docs/netty4-component.adoc | 3 +
.../src/main/docs/olingo2-component.adoc | 3 +
.../src/main/docs/olingo4-component.adoc | 3 +
.../src/main/docs/openshift-component.adoc | 3 +
.../src/main/docs/openstack-cinder-component.adoc | 3 +
.../src/main/docs/openstack-glance-component.adoc | 3 +
.../main/docs/openstack-keystone-component.adoc | 3 +
.../src/main/docs/openstack-neutron-component.adoc | 3 +
.../src/main/docs/openstack-nova-component.adoc | 3 +
.../src/main/docs/openstack-swift-component.adoc | 3 +
.../decorators/AbstractSpanDecorator.java | 16 +-
.../src/main/docs/optaplanner-component.adoc | 3 +
.../camel-paho/src/main/docs/paho-component.adoc | 3 +
.../src/main/docs/paxlogging-component.adoc | 3 +
.../camel-pdf/src/main/docs/pdf-component.adoc | 3 +
.../src/main/docs/pgevent-component.adoc | 3 +
.../camel-printer/src/main/docs/lpr-component.adoc | 3 +
.../src/main/docs/pubnub-component.adoc | 3 +
.../src/main/docs/quartz-component.adoc | 3 +
.../src/main/docs/quartz2-component.adoc | 3 +
.../src/main/docs/quickfix-component.adoc | 3 +
.../src/main/docs/rabbitmq-component.adoc | 3 +
.../src/main/docs/reactive-streams-component.adoc | 3 +
.../src/main/docs/rest-swagger-component.adoc | 3 +
.../src/main/docs/restlet-component.adoc | 3 +
.../camel-rmi/src/main/docs/rmi-component.adoc | 3 +
.../src/main/docs/routebox-component.adoc | 3 +
.../camel-rss/src/main/docs/rss-component.adoc | 3 +
.../src/main/docs/salesforce-component.adoc | 3 +-
.../component/salesforce/SalesforceComponent.java | 32 +++
.../salesforce/SalesforceEndpointConfig.java | 17 ++
.../component/salesforce/api/utils/JsonUtils.java | 28 +++
.../internal/processor/AbstractRestProcessor.java | 4 +-
.../internal/processor/JsonRestProcessor.java | 27 ++-
.../internal/processor/XmlRestProcessor.java | 4 +-
.../salesforce/HttpProxyIntegrationTest.java | 63 +++--
.../AbstractRestProcessorApprovalTest.java | 26 ++-
.../internal/processor/JsonRestProcessorTest.java | 105 +++++++--
.../src/main/docs/sap-netweaver-component.adoc | 3 +
.../src/main/docs/xquery-component.adoc | 3 +
.../src/main/docs/schematron-component.adoc | 3 +
.../src/main/docs/servicenow-component.adoc | 3 +
.../src/main/docs/servlet-component.adoc | 3 +
.../camel-sip/src/main/docs/sip-component.adoc | 3 +
.../src/main/docs/sjms-batch-component.adoc | 3 +
.../camel-sjms/src/main/docs/sjms-component.adoc | 3 +
.../camel-sjms2/src/main/docs/sjms2-component.adoc | 3 +
.../camel-slack/src/main/docs/slack-component.adoc | 3 +
.../camel-smpp/src/main/docs/smpp-component.adoc | 3 +
.../camel-snmp/src/main/docs/snmp-component.adoc | 3 +
.../camel-solr/src/main/docs/solr-component.adoc | 3 +
.../src/main/docs/spark-rest-component.adoc | 3 +
.../camel-spark/src/main/docs/spark-component.adoc | 3 +
.../src/main/docs/splunk-component.adoc | 3 +
.../src/main/docs/spring-batch-component.adoc | 3 +
.../actuate/endpoint/AbstractCamelMvcEndpoint.java | 39 ++++
.../actuate/endpoint/CamelRoutesMvcEndpoint.java | 10 +-
.../additional-spring-configuration-metadata.json | 6 +
.../endpoint/CamelRoutesMvcEndpointTest.java | 15 +-
.../main/docs/spring-integration-component.adoc | 3 +
.../src/main/docs/spring-ldap-component.adoc | 3 +
.../src/main/docs/spring-redis-component.adoc | 3 +
.../src/main/docs/spring-ws-component.adoc | 3 +
.../src/main/docs/spring-event-component.adoc | 3 +
.../camel-sql/src/main/docs/sql-component.adoc | 3 +
.../src/main/docs/sql-stored-component.adoc | 3 +
.../camel-ssh/src/main/docs/ssh-component.adoc | 3 +
.../camel-stax/src/main/docs/stax-component.adoc | 3 +
.../camel-stomp/src/main/docs/stomp-component.adoc | 3 +
.../src/main/docs/stream-component.adoc | 3 +
.../src/main/docs/string-template-component.adoc | 3 +
.../src/main/docs/telegram-component.adoc | 3 +
.../src/main/docs/thrift-component.adoc | 3 +
.../camel-tika/src/main/docs/tika-component.adoc | 33 +--
.../src/main/docs/twilio-component.adoc | 3 +
.../src/main/docs/twitter-component.adoc | 3 +
.../main/docs/twitter-directmessage-component.adoc | 3 +
.../src/main/docs/twitter-search-component.adoc | 3 +
.../src/main/docs/twitter-streaming-component.adoc | 3 +
.../src/main/docs/twitter-timeline-component.adoc | 3 +
.../src/main/docs/undertow-component.adoc | 3 +
.../src/main/docs/velocity-component.adoc | 3 +
.../camel-vertx/src/main/docs/vertx-component.adoc | 3 +
.../src/main/docs/weather-component.adoc | 3 +
.../src/main/docs/websocket-component.adoc | 3 +
.../src/main/docs/wordpress-component.adoc | 3 +
.../src/main/docs/xchange-component.adoc | 3 +
.../src/main/docs/xmlrpc-component.adoc | 3 +
.../src/main/docs/xmlsecurity-component.adoc | 3 +
.../camel-xmpp/src/main/docs/xmpp-component.adoc | 3 +
.../src/main/docs/yammer-component.adoc | 3 +
.../camel-yql/src/main/docs/yql-component.adoc | 3 +
.../src/main/docs/zendesk-component.adoc | 3 +
.../src/main/docs/zookeeper-master-component.adoc | 3 +
.../src/main/docs/zookeeper-component.adoc | 3 +
components/readme.adoc | 2 +-
.../src/main/resources/application.properties | 3 +
parent/pom.xml | 29 ++-
.../karaf/features/src/main/resources/features.xml | 16 +-
.../springboot/LinkedInComponentConfiguration.java | 2 +-
.../MiloClientComponentConfiguration.java | 27 +++
.../SalesforceComponentConfiguration.java | 257 +++++++++++----------
.../camel-spring-boot-dependencies/pom.xml | 2 +-
.../src/main/resources/eip-options.mvel | 4 +-
.../src/main/resources/endpoint-options.mvel | 8 +
.../src/it/simple-xml/pom.xml | 57 +++++
.../{simple => simple-xml}/src/spec/swagger.json | 0
.../src/it/simple-xml/verify.groovy} | 24 +-
.../src/main/docs/camel-package-maven-plugin.adoc | 27 +++
...GenerateMojo.java => AbstractGenerateMojo.java} | 78 +------
.../maven/generator/swagger/GenerateMojo.java | 65 +-----
.../maven/generator/swagger/GenerateXmlMojo.java | 99 ++++++++
tooling/swagger-rest-dsl-generator/pom.xml | 17 ++
.../{PathVisitor.java => OperationFilter.java} | 31 +--
.../camel/generator/swagger/OperationVisitor.java | 27 ++-
.../camel/generator/swagger/PathVisitor.java | 6 +-
.../swagger/RestDslDefinitionGenerator.java | 2 +-
.../camel/generator/swagger/RestDslGenerator.java | 27 ++-
.../swagger/RestDslSourceCodeGenerator.java | 5 +-
...tionGenerator.java => RestDslXmlGenerator.java} | 28 ++-
.../generator/swagger/RestDslGeneratorTest.java | 15 ++
...ratorTest.java => RestDslXmlGeneratorTest.java} | 44 ++--
.../src/test/resources/MyRestRouteFilter.txt | 78 +++++++
.../src/test/resources/SwaggerPetstoreXml.txt | 99 ++++++++
.../src/test/resources/log4j2.properties | 28 +++
404 files changed, 3071 insertions(+), 964 deletions(-)
create mode 100644 camel-core/src/main/docs/eips/failover-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/inOnly-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/inOut-eip.adoc
copy camel-core/src/main/docs/eips/{hystrix-eip.adoc => onFallback-eip.adoc} (52%)
copy camel-core/src/main/docs/eips/{pipes-and-filters.adoc => pipeline-eip.adoc} (72%)
create mode 100644 camel-core/src/main/docs/eips/pollEnrich-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/removeHeader-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/removeHeaders-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/roundRobin-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/sticky-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/stop-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/topic-eip.adoc
create mode 100644 camel-core/src/main/docs/eips/weighted-eip.adoc
copy tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/PathVisitor.java => camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java (54%)
create mode 100644 camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionOnNewCorrelationGroupTest.java
create mode 100644 camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionHeaderInAggregationStrategyTest.java
create mode 100644 tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
copy tooling/maven/camel-restdsl-swagger-plugin/src/it/{simple => simple-xml}/src/spec/swagger.json (100%)
copy tooling/{swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/PathVisitor.java => maven/camel-restdsl-swagger-plugin/src/it/simple-xml/verify.groovy} (54%)
copy tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/{GenerateMojo.java => AbstractGenerateMojo.java} (57%)
create mode 100644 tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/GenerateXmlMojo.java
copy tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/{PathVisitor.java => OperationFilter.java} (57%)
copy tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/{RestDslDefinitionGenerator.java => RestDslXmlGenerator.java} (57%)
copy tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/{RestDslGeneratorTest.java => RestDslXmlGeneratorTest.java} (51%)
create mode 100644 tooling/swagger-rest-dsl-generator/src/test/resources/MyRestRouteFilter.txt
create mode 100644 tooling/swagger-rest-dsl-generator/src/test/resources/SwaggerPetstoreXml.txt
create mode 100644 tooling/swagger-rest-dsl-generator/src/test/resources/log4j2.properties
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 02/02: CAMEL-11930: camel-box and camel-linkedin make ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6150f9b9c3d4e0f751342f18a070e6cc7d3240cd
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 20 12:46:21 2018 +0100
CAMEL-11930: camel-box and camel-linkedin make ...
...`test` goal execute successfully
`camel-box` and `camel-linkedin` components uses
`camel-api-component-maven-plugin` to generate sources, this fails if
javadoc is not present.
If run via `mvn install` this works as the javadoc dependency is present
in the reactor. If run with just `mvn test` this fails as it is not.
This moves the `maven-javadoc-plugin` to phase `generate-test-resources`
so that it will be present when running `mvn test`.
---
components/camel-box/camel-box-api/pom.xml | 1 +
components/camel-linkedin/camel-linkedin-api/pom.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index cc10aa8..b52ffa6 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -50,6 +50,7 @@
<executions>
<execution>
<id>add-javadoc</id>
+ <phase>generate-test-resources</phase>
<goals>
<goal>jar</goal>
</goals>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 4c42720..3a49d71 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -191,6 +191,7 @@
<executions>
<execution>
<id>add-javadoc</id>
+ <phase>generate-test-resources</phase>
<goals>
<goal>jar</goal>
</goals>
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 01/02: CAMEL-11930: camel-spring and camel-blueprint: ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9fbfad95b12a02c94578641798128dfb75fa0b67
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 20 12:41:46 2018 +0100
CAMEL-11930: camel-spring and camel-blueprint: ...
...make `test` goal execute successfully
Ant task to manipulate schemas fails if the `schema1.xsd` doesn't exist
and this could be because it was moved by previous execution. That is
running `mvn test` after `mvn install` fails because `schema1.xsd` no
longer exists.
This adds a condition so if `schema1.xsd` is not present schema
manipulation is skipped.
Affected components are `camel-spring` and `camel-blueprint`.
---
components/camel-blueprint/pom.xml | 14 ++++++++++----
components/camel-spring/pom.xml | 30 +++++++++++++++++++++---------
2 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 53e0021..91f14ba 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -387,10 +387,16 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <move file="${project.build.directory}/schema/schema1.xsd"
- tofile="${project.build.directory}/schema/camel-blueprint.xsd"/>
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.build.directory}/schema/schema1.xsd"
+ tofile="${project.build.directory}/schema/camel-blueprint.xsd"/>
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index cbcb8cb..00d0026 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -581,9 +581,15 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
@@ -649,12 +655,18 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <replace file="${project.build.directory}/schema/schema1.xsd"
- token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
- value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""/>
- <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <replace file="${project.build.directory}/schema/schema1.xsd"
+ token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
+ value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""/>
+ <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.