This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit b9cf7e20dfc94a3d5533536c2915213a7d060f17 Merge: 30d8594 f3b688c Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Feb 15 08:28:53 2021 +0100 Merge remote-tracking branch 'origin/master' camel-dependencies/pom.xml | 4 +- .../camel/catalog/docs/properties-component.adoc | 2 +- .../apache/camel/catalog/docs/sql-component.adoc | 5 + .../camel/component/apns/util/ApnsUtils.java | 4 +- .../camel/component/aws2/s3/AWS2S3Producer.java | 4 + .../aws2/s3/localstack/Aws2S3BaseTest.java | 6 + ...mpleEncryptedUploadOperationLocalstackTest.java | 103 ++++ .../blob/integration/BlobOperationsITTest.java | 10 +- .../blob/integration/BlobProducerITTest.java | 4 +- .../caffeine/cache/CaffeineCacheTestSupport.java | 4 +- .../CaffeineAggregationRepositoryRoutesTest.java | 4 +- .../camel/component/consul/ConsulHealthTest.java | 4 +- .../component/consul/ConsulKeyValueWatchTest.java | 6 +- .../component/ehcache/EhcacheTestSupport.java | 4 +- .../file/remote/FtpConsumerAsyncStressTest.java | 4 +- .../file/remote/FtpProducerMoveExistingTest.java | 4 +- .../apache/camel/component/http/HttpProducer.java | 124 +++-- .../camel/component/http/HttpProducerLoadTest.java | 125 +++++ .../camel-sql/src/main/docs/sql-component.adoc | 5 + .../vertx/http/DefaultVertxHttpBinding.java | 27 +- .../vertx/http/VertxHttpProducerLoadTest.java | 97 ++++ .../component/vertx/kafka/VertxKafkaConsumer.java | 42 +- .../src/main/java/org/apache/camel/InOnly.java | 3 +- .../src/main/java/org/apache/camel/InOut.java | 3 +- .../src/main/java/org/apache/camel/Pattern.java | 3 +- .../org/apache/camel/spi/HeaderFilterStrategy.java | 4 +- .../src/main/docs/properties-component.adoc | 2 +- .../camel/processor/RemoveHeadersAllTest.java | 107 +++++ .../org/apache/camel/main/BaseMainSupport.java | 8 +- .../camel/main/MainConfigurationProperties.java | 63 ++- .../camel/main/MainSupportModelConfigurer.java | 6 +- .../org/apache/camel/support/DefaultExchange.java | 17 +- .../camel/support/DefaultHeaderFilterStrategy.java | 37 +- .../org/apache/camel/support/DefaultMessage.java | 28 +- .../java/org/apache/camel/util/SensitiveUtils.java | 4 + .../org/apache/camel/util/SensitiveUtilsTest.java | 2 + .../modules/ROOT/pages/properties-component.adoc | 2 +- .../modules/ROOT/pages/sql-component.adoc | 5 + docs/user-manual-nav.adoc.template | 1 - docs/user-manual/modules/ROOT/nav.adoc | 1 - .../modules/ROOT/pages/bean-injection.adoc | 3 +- .../modules/ROOT/pages/bean-integration.adoc | 3 +- .../ROOT/pages/camel-3x-upgrade-guide-3_9.adoc | 10 + .../modules/ROOT/pages/hiding-middleware.adoc | 10 +- .../modules/ROOT/pages/pojo-producing.adoc | 3 +- .../modules/ROOT/pages/spring-remoting.adoc | 522 --------------------- .../pages/using-exchange-pattern-annotations.adoc | 3 +- .../ROOT/pages/using-propertyplaceholder.adoc | 2 +- parent/pom.xml | 4 +- .../itest/proxy/SpringEchoCamelProxyTest.java | 41 -- .../camel/itest/proxy/SpringEchoCamelProxyTest.xml | 46 -- 51 files changed, 764 insertions(+), 771 deletions(-)
