This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a change to branch CAMEL-13342-JUNIT5-EXPLORATORY in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 3894b7c CAMEL-13342: Implemented a first version of a proof-of-concept for camel-cdi-test in junit 5 discard cf9dac8 CAMEL-13342: Added a JUnit 5 version of JUnit 4 test patterns discard 0ad3700 CAMEL-13342: Setup SimpleMockTest with junit extension and parameter resolver discard a0eefe3 CAMEL-13342: Created CamelTest annotation and move existing tests to **test/junit4** add 728bbcb [CAMEL-13693]avoid useOverridePropertiesWithPropertiesComponent being invoked twice when running a unit-test with OSGI Blueprint XML. add 174a4e1 CAMEL-13692 - Updating docs add 5a0d6d7 CAMEL-13692 - More doc fixes add c3dac10 CAMEL-13683: Property binding support - Better error reporting for binding not possible. add 7f8412f CAMEL-13695: camel-core - Injector allow to create beans via static factory methods add 102f170 camel-main-maven-plugin - Add a way to grab javadoc as component option desc for ActiveMQ Artemis ConnectionFactory which has its javadoc on a special interface. add 4361835 Fixed duplicate in pom add a2a252a Fixed CS add 8d02bf6 CAMEL-13686: camel-main - Refine logging output add 2eb00b5 CAMEL-13681: Property binding support should have support for ignore case in property keys add 6f7c532 CAMEL-13686: camel-main - Output summary of auto-configuration add b34731b Fixed java9+ deprecation warning add d717709 Fixed test add 948c93a CAMEL-13686: camel-main - Added option to log summary or not. add 3474c4d CAMEL-13697: URISupport - Mask accessToken and clientSecret in uri logging add eda13e8 Remove the default password from the camel-smpp component add fae75d6 CAMEL-13698: Disable flattern pom plugin for archetypes as it breaks them. CAMEL-13669: Add camel-archetype-main add 495bb73 CAMEL-13698: Fixed camel archetype catalog and only attach the catalog to the archetypes pom. add e38709e Polished add 77a127c CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add 6ad3352 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add 90e1cd8 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add a2d2b18 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add 8c4ccf6 CAMEL-13656: camel3 - reifiers classes should be public add 8e4e4ec CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add 8d503e7 CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to make it simpler and more natural. add 43205e8 ran ./mvnw -Pfastinstall install inside the project root directory add 268e387 update links in core/camel-core/src/main/docs/eips add e7f465f again ran /mvnw -Pfastinstall install after changing the links inside core/camel-core/src/main/docs/eips add 479ec98 link errors fixed, ran ./mvnw -Pfastinstall install in project root dirctory add d327845 link errors fixed, ran ./mvnw -Pfastinstall install in project root dirctory add 37f45d6 link errors fixed, ran ./mvnw -Pfastinstall install in project root dirctory add d61d094 fix on S3Configuration.java add 348e6da Regen add 05fcac1 Incremented to SlfJ 1.7.26 (CAMEL-13696) add 57d6074 Cross reference with custom xreflabel text converted to Inline xref macro to fix anchor not found errors add f03523d restore the lost camel-example-cdi-osgi files using the 2.24.1 release add 0388d3a upgrade the broken camel-example-cdi-osgi to the camel 3 API add 86f3e44 using the correct result set method to get value from blob-type column add 631f8a0 adding clob column type add 47bca85 unit test to validate column type add 2a74add Regen add 936bb88 Fixed CS add 5ff01857 Upgrade Netty to version 4.1.37.Final add 095ee8e Upgrade Async Http Client to version 2.10.1 add 5273887 CAMEL-13702: camel-main-maven-plugin - Only download sources JAR if really neesed and optimise to only write files if they are changed/needed. add 7ac44e1 Upgrade Maven OWASP plugin to version 5.1.0 add 8a32b09 Upgrade DNSJava and related bundle to version 2.1.9 add 6380fe6 CAMEL-13705: Properties component should work with Eclipse MicroProfile Config add e000d87 CAMEL-13705: Properties component should work with Eclipse MicroProfile Config add cfb2f3e Fixed CS add 56acfb6 Polished add d74b298 CAMEL-13709: Properties component - Optimise to not call loadProperties to frequently add 512248b CAMEL-13705: Properties component should work with Eclipse MicroProfile Config add 0487346 Upgrade AWS SDK and related bundle to version 1.11.573 add f2723f2 Upgrade Pulsar and related bundle to version 2.3.2 add c26e65f Upgrade Libphonenumber and related bundle to version 8.10.13 add 6798ab9 Use Apache Pulsar 2.3.2 docker image for tests add 88e5f4f Upgrade Kafka and related bundle to version 2.2.1 add a5a536b remove camel-example-cdi-osgi add 50e337d Regen add ffbd0c6 CAMEL-13687: NotifyBuilder - Add fromCurrentRoute functionality add 9c8f9fb Cross reference with custom xreflabel text converted to Inline xref macro to fix anchor not found errors in camel/components add 7ab8f67 ran yarn gulp inside camel/docs add ba0299b Cross reference with custom xreflabel text converted to Inline xref macro to fix anchor not found errors in camel/core/camel-base add b456ef9 ran yarn gulp inside camel/docs add b6ac2ca Cross reference with custom xreflabel text converted to Inline xref macro to fix anchor not found errors inside camel/core/camel-core add 702d991 ran yarn gulp inside camel/docs add b4fd2a1 ran ./mvnw -Pfastinstall install in camel root directory add eae4fca Added camel-microprofile-config to component POM add 4bec458 Regen add 9ed3837 Add keys (#3010) add 8b164fb Regen. Fixed camel-cm-sms docs. add 3ddec4e Fixed CS add 5492614 Fixed CS for camel-microprofile-config add 7da288c Upgrade Brave Zipkin to version 5.6.6 add 4db2571 CAMEL-13714 - Camel-AWS-S3: Add and option to specify the S3 Key also as endpoint parameter add 0fd74a5 CAMEL-13714 - Camel-AWS-S3: Add and option to specify the S3 Key also as endpoint parameter, adding test add c6ca9d4 CAMEL-13714 - Fixed CS add e1c4a19 Regen add 096f313 [CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile (#3008) add a631df872 CAMEL-13466: CamelContext should stop routes which failed to start when Camel is shutting down. This is to ensure resources leaks etc from those failed routes are also stopped, eg in karaf or app servers to have all resources stopped when you undeploy. Thanks to Julien Greffe for reporting and a prototype fix and to Jean Baptiste for working on a PR. add e81504f CAMEL-13715 - Remove dummyTrustManager from camel-mail add 2940459 Use StandardCharsets.UTF_8 in camel-ftp add c4adc0d CAMEL-13713: Switched to dynamic port allocation for Consul*ServiceCallRouteTest add 0e9d77d CAMEL-13680: File component with readLock=fileLock is not supported on Windows add ff431fe NO JIRA - Simplfy test data add 23fae65 CAMEL-13716 - fixed wrong syntax for corda endpoints add 49bface Merge pull request #3011 from lhein/CAMEL-13716 add 517252c CAMEL-13717 - fixed wrong syntax for websocket-jsr356 endpoints add ac97ac4 Merge pull request #3012 from lhein/CAMEL-13717 add 15ce69f Merge branch 'master' of https://gitbox.apache.org/repos/asf/camel add ede3313 "CAMEL-13710:Camel kafka with Spring FileStateRepository example" add 1a95fca Regen add 64bebcc Regen of regen add 49fedf4 The regen game: play at your own risk add 754f9a0 Replaced usage of deprecated JndiRegistry add 8da6627 NO JIRA - Fix checkstyle issues add 9823a8a NO JIRA - Fix failing camel-mllp tests add db9f893 CAMEL-13719 - Upgrade to jasypt 1.9.3 add f363b54 Upgrade Braintree to version 2.98.0 add ee88977 Upgrade PDFBox to version 2.0.16 add e227cf6 CAMEL-13589: escape http/ftp URLs add 95e0834 CAMEL-13589: remove security advisories from ma... add e9b8aa0 Upgrade Flink to version 1.8.1 add ba6d9a7 Cleanup camel-package-maven-plugin add 138189d CAMEL-13588: escape $ in options add 27d6124 Regen add 67589ec Disallow doctypes in a few more places add 0f3f194 Upgrade Rome to version 1.12.1 add 49c804a Fixed CS for Camel-Salesforce add d5b64b1 Camel-NSQ: Wait for message in logs for the container initialization in tests add 5ab9667 Camel-NSQ: Use v1.1.0 tag for used docker images add ffbe4ef Use property replacement instead of version management for camel modules add bc8a604 Revert "Use property replacement instead of version management for camel modules" add f7b0e18 Upgrade Qpid JMS client to version 0.44.0 add f8832c8 Remove custom Identity classes for RSA/DSA signing from camel-ftp + improve security testing in general new 21a1b49 CAMEL-13342: Created CamelTest annotation and move existing tests to **test/junit4** new e3c3472 CAMEL-13342: Setup SimpleMockTest with junit extension and parameter resolver new cf977cc CAMEL-13342: Added a JUnit 5 version of JUnit 4 test patterns new e9edc1d CAMEL-13342: Implemented a first version of a proof-of-concept for camel-cdi-test in junit 5 new b744435 CAMEL-13342: Implemented a first version of a proof-of-concept for camel-testcontainers with JUnit 5 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 (3894b7c) \ N -- N -- N refs/heads/CAMEL-13342-JUNIT5-EXPLORATORY (b744435) 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 5 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: KEYS | 58 +++ MIGRATION.md | 15 + apache-camel/pom.xml | 9 +- apache-camel/src/main/descriptors/common-bin.xml | 1 + .../src/main/resources/archetype-resources/pom.xml | 4 + .../src/main/resources/archetype-resources/pom.xml | 4 + archetypes/camel-archetype-main/pom.xml | 62 +++ .../META-INF/maven/archetype-metadata.xml | 77 ++++ .../src/main/resources/META-INF/LICENSE.txt | 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../main/resources/archetype-resources/ReadMe.txt | 20 + .../src/main/resources/archetype-resources/pom.xml | 71 +++- .../src/main/java/MyApplication.java | 41 ++ .../archetype-resources/src/main/java/MyBean.java | 36 ++ .../src/main/java/MyConfiguration.java | 37 ++ .../src/main/java/MyRouteBuilder.java | 31 ++ .../src/main/resources/application.properties | 48 +++ .../src/main/resources/logback.xml | 0 archetypes/pom.xml | 20 + bom/camel-bom/pom.xml | 5 + .../apache/camel/catalog/DefaultCamelCatalog.java | 1 + .../java/org/apache/camel/maven/GenerateMojo.java | 127 ++++-- .../src/main/docs/ahc-ws-component.adoc | 4 +- .../camel-ahc/src/main/docs/ahc-component.adoc | 8 +- .../camel-amqp/src/main/docs/amqp-component.adoc | 2 +- .../main/docs/atmosphere-websocket-component.adoc | 6 +- .../camel-atom/src/main/docs/atom-component.adoc | 2 +- .../src/main/docs/aws-ddb-component.adoc | 2 +- .../src/main/docs/aws-ddbstream-component.adoc | 2 +- .../src/main/docs/aws-ec2-component.adoc | 2 +- .../src/main/docs/aws-ecs-component.adoc | 2 +- .../src/main/docs/aws-eks-component.adoc | 2 +- .../src/main/docs/aws-iam-component.adoc | 2 +- .../src/main/docs/aws-kinesis-component.adoc | 2 +- .../main/docs/aws-kinesis-firehose-component.adoc | 2 +- .../src/main/docs/aws-kms-component.adoc | 2 +- .../src/main/docs/aws-lambda-component.adoc | 2 +- .../src/main/docs/aws-mq-component.adoc | 2 +- .../src/main/docs/aws-msk-component.adoc | 2 +- .../src/main/docs/aws-s3-component.adoc | 12 +- .../camel/component/aws/s3/S3Configuration.java | 17 +- .../apache/camel/component/aws/s3/S3Producer.java | 3 + .../aws/s3/S3ComponentKeyNameFileTest.java | 150 +++++++ .../src/main/docs/aws-sdb-component.adoc | 2 +- .../src/main/docs/aws-ses-component.adoc | 2 +- .../src/main/docs/aws-sns-component.adoc | 2 +- .../src/main/docs/aws-sqs-component.adoc | 2 +- .../src/main/docs/aws-swf-component.adoc | 2 +- components/camel-azure/src/main/docs/azure.adoc | 4 +- .../camel-bean/src/main/docs/bean-component.adoc | 4 +- .../camel-bean/src/main/docs/class-component.adoc | 8 +- .../org/apache/camel/cdi/CdiCamelInjector.java | 19 + .../src/test/resources/camel-context-multiples.xml | 2 +- .../src/main/docs/cm-sms-component.adoc | 6 +- .../apache/camel/component/cm/CMConfiguration.java | 6 +- .../camel/component/consul/ConsulCatalogTest.java | 16 +- .../component/consul/ConsulClientKeyValueTest.java | 23 +- .../component/consul/ConsulCoordinatesTest.java | 20 +- .../camel/component/consul/ConsulEventTest.java | 9 +- .../component/consul/ConsulEventWatchTest.java | 2 +- .../camel/component/consul/ConsulHealthTest.java | 14 +- .../camel/component/consul/ConsulKeyValueTest.java | 7 +- .../component/consul/ConsulKeyValueWatchTest.java | 2 +- .../camel/component/consul/ConsulRegistryTest.java | 32 +- .../component/consul/ConsulRegistryUtilsTest.java | 6 +- .../camel/component/consul/ConsulSessionTest.java | 18 +- .../camel/component/consul/ConsulTestSupport.java | 29 +- .../cloud/ConsulDefaultServiceCallRouteTest.java | 6 +- .../cloud/ConsulRibbonServiceCallRouteTest.java | 6 +- .../ConsulServiceCallWithRegistrationTest.java | 60 ++- .../consul/cloud/ConsulServiceDiscoveryTest.java | 5 +- .../cloud/ConsulServiceRegistrationTestBase.java | 5 +- .../consul/cloud/ConsulServiceRegistryTest.java | 4 +- .../ConsulClusteredRoutePolicyFactoryTest.java | 14 +- .../cluster/ConsulClusteredRoutePolicyTest.java | 14 +- .../component/consul/cluster/ConsulMasterTest.java | 14 +- .../src/main/docs/controlbus-component.adoc | 12 +- .../camel-corda/src/main/docs/corda-component.adoc | 2 +- .../camel/component/corda/CordaEndpoint.java | 2 +- .../src/main/docs/crypto-dataformat.adoc | 2 +- .../crypto/SpringCryptoDataFormatTest.xml | 4 +- .../src/main/docs/cxf-transport.adoc | 8 +- .../camel-cxf/src/main/docs/cxfrs-component.adoc | 2 +- .../component/cxf/jaxrs/CxfOperationException.xml | 2 +- .../cxf/transport/CxfRsCamelTransport.xml | 8 +- .../src/main/docs/dataformat-component.adoc | 4 +- .../src/main/docs/dataset-component.adoc | 6 +- .../src/main/docs/dataset-test-component.adoc | 14 +- .../src/main/docs/direct-component.adoc | 10 +- .../src/main/docs/direct-vm-component.adoc | 10 +- .../src/main/docs/disruptor-component.adoc | 4 +- .../camel-ejb/src/main/docs/ejb-component.adoc | 12 +- .../camel-elsql/src/main/docs/elsql-component.adoc | 4 +- .../camel-exec/src/main/docs/exec-component.adoc | 2 +- .../src/main/docs/fhirJson-dataformat.adoc | 2 +- .../src/main/docs/fhirXml-dataformat.adoc | 2 +- .../camel-file/src/main/docs/file-component.adoc | 42 +- .../camel/component/file/GenericFileEndpoint.java | 5 +- .../src/main/docs/flatpack-component.adoc | 2 +- .../src/main/docs/flatpack-dataformat.adoc | 2 +- .../src/main/docs/freemarker-component.adoc | 2 +- .../camel-ftp/src/main/docs/ftp-component.adoc | 21 +- .../camel-ftp/src/main/docs/ftps-component.adoc | 14 +- .../camel-ftp/src/main/docs/sftp-component.adoc | 14 +- .../component/file/remote/DSAKeyPairIdentity.java | 227 ---------- .../component/file/remote/RSAKeyPairIdentity.java | 145 ------- .../component/file/remote/SftpOperations.java | 45 +- ...sumeTest.java => SftpECKeyFileConsumeTest.java} | 12 +- .../file/remote/sftp/SftpKeyFileConsumeTest.java | 8 + .../remote/sftp/SftpKeyPairDSAConsumeTest.java | 27 +- .../remote/sftp/SftpKeyPairRSAConsumeTest.java | 27 +- .../file/remote/sftp/SftpServerTestSupport.java | 7 +- .../src/test/resources/ec.pem | 0 .../main/docs/google-bigquery-sql-component.adoc | 2 +- .../camel-gora/src/main/docs/gora-component.adoc | 16 +- .../camel-grok/src/main/docs/grok-dataformat.adoc | 4 +- .../src/main/docs/groovy-language.adoc | 4 +- .../camel-grpc/src/main/docs/grpc-component.adoc | 4 +- .../main/docs/hazelcast-atomicvalue-component.adoc | 10 +- .../src/main/docs/hazelcast-map-component.adoc | 16 +- .../main/docs/hazelcast-multimap-component.adoc | 8 +- .../docs/hazelcast-replicatedmap-component.adoc | 6 +- .../main/docs/hazelcast-ringbuffer-component.adoc | 2 +- .../camel-hazelcast/src/main/docs/hazelcast.adoc | 34 +- .../spring/test-camel-context-atomicnumber.xml | 14 +- ...l-context-hazelcast-instance-name-reference.xml | 4 +- ...-camel-context-hazelcast-instance-reference.xml | 4 +- .../META-INF/spring/test-camel-context-map.xml | 24 +- .../spring/test-camel-context-multimap.xml | 14 +- .../spring/test-camel-context-replicatedmap.xml | 12 +- .../spring/test-camel-context-ringbuffer.xml | 10 +- .../camel-hbase/src/main/docs/hbase-component.adoc | 32 +- .../camel-hdfs2/src/main/docs/hdfs2-component.adoc | 2 +- .../apache/camel/component/hdfs2/HdfsFileType.java | 6 + .../src/main/docs/hipchat-component.adoc | 2 +- .../camel-hl7/src/main/docs/hl7-dataformat.adoc | 12 +- .../camel-http4/src/main/docs/http4-component.adoc | 10 +- components/camel-ignite/src/main/docs/ignite.adoc | 16 +- .../camel-iota/src/main/docs/iota-component.adoc | 18 +- .../camel-irc/src/main/docs/irc-component.adoc | 2 +- components/camel-jasypt/src/main/docs/jasypt.adoc | 16 +- .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 4 +- .../src/test/resources/blobstore-test.xml | 4 +- .../camel/component/jcr/JcrConverterTest.java | 5 + components/camel-jdbc/pom.xml | 2 + .../camel-jdbc/src/main/docs/jdbc-component.adoc | 8 +- .../camel/component/jdbc/ResultSetIterator.java | 27 +- .../camel/component/jdbc/JdbcColumnTypeTest.java | 69 ++++ .../camel-jdbc/src/test/resources/sql/init.sql | 5 +- .../camel-jetty/src/main/docs/jetty-component.adoc | 18 +- .../src/main/docs/jgroups-raft-component.adoc | 2 +- .../src/main/docs/jgroups-component.adoc | 4 +- .../camel-jing/src/main/docs/jing-component.adoc | 2 +- .../camel-jira/src/main/docs/jira-component.adoc | 8 +- .../camel-jms/src/main/docs/jms-component.adoc | 22 +- .../camel-jmx/src/main/docs/jmx-component.adoc | 2 +- .../camel-jpa/src/main/docs/jpa-component.adoc | 2 +- .../camel-jsch/src/main/docs/scp-component.adoc | 4 +- .../src/main/docs/jsonpath-language.adoc | 6 +- .../docs/kubernetes-config-maps-component.adoc | 2 +- .../docs/kubernetes-deployments-component.adoc | 2 +- .../src/main/docs/kubernetes-hpa-component.adoc | 2 +- .../src/main/docs/kubernetes-job-component.adoc | 2 +- .../main/docs/kubernetes-namespaces-component.adoc | 2 +- .../src/main/docs/kubernetes-nodes-component.adoc | 2 +- ...rnetes-persistent-volumes-claims-component.adoc | 2 +- .../kubernetes-persistent-volumes-component.adoc | 2 +- .../src/main/docs/kubernetes-pods-component.adoc | 2 +- ...bernetes-replication-controllers-component.adoc | 2 +- .../docs/kubernetes-resources-quota-component.adoc | 2 +- .../main/docs/kubernetes-secrets-component.adoc | 2 +- .../kubernetes-service-accounts-component.adoc | 2 +- .../main/docs/kubernetes-services-component.adoc | 2 +- .../camel-kubernetes/src/main/docs/kubernetes.adoc | 24 +- .../docs/openshift-build-configs-component.adoc | 2 +- .../src/main/docs/openshift-builds-component.adoc | 2 +- .../src/main/docs/language-component.adoc | 12 +- .../api/LinkedInExceptionResponseFilter.java | 24 +- .../camel-log/src/main/docs/log-component.adoc | 2 +- .../camel-mail/src/main/docs/mail-component.adoc | 8 +- .../component/mail/DummySSLSocketFactory.java | 96 ----- .../camel/component/mail/DummyTrustManager.java | 58 --- .../camel/component/mail/MailConfiguration.java | 26 +- .../camel/component/mail/MailComponentTest.java | 19 +- .../camel/component/mail/MailEndpointTlsTest.java | 26 +- .../pom.xml | 36 +- .../src/main/docs/microprofile-config.adoc | 19 + .../config/CamelMicroProfilePropertiesSource.java | 71 ++++ .../org/apache/camel/properties-source-factory | 18 + .../CamelMicroProfilePropertiesSourceTest.java | 74 ++++ .../src/test/resources/log4j2.properties | 28 ++ .../src/main/docs/milo-client-component.adoc | 2 +- .../camel-mina2/src/main/docs/mina2-component.adoc | 8 +- .../component/mllp/MllpTcpServerCharsetTest.java | 68 +-- ...onsumerOptionalEndOfDataWithValidationTest.java | 2 +- ...umerOptionalEndOfDataWithoutValidationTest.java | 2 +- ...onsumerRequiredEndOfDataWithValidationTest.java | 2 +- ...umerRequiredEndOfDataWithoutValidationTest.java | 2 +- ...tProducerEndOfDataAndValidationTestSupport.java | 29 +- ...rConsumerEndOfDataAndValidationTestSupport.java | 8 +- .../camel/component/mllp/internal/Hl7UtilTest.java | 93 ++--- .../camel/test/mllp/Hl7TestMessageGenerator.java | 23 +- .../camel-mock/src/main/docs/mock-component.adoc | 20 +- .../src/main/docs/mongodb-gridfs-component.adoc | 2 +- .../src/main/docs/mongodb3-component.adoc | 12 +- .../camel-msv/src/main/docs/msv-component.adoc | 2 +- .../src/main/docs/mybatis-component.adoc | 4 +- .../src/main/docs/nagios-component.adoc | 6 +- .../src/main/docs/netty4-http-component.adoc | 20 +- .../src/main/docs/netty4-component.adoc | 8 +- .../apache/camel/component/nsq/NsqTestSupport.java | 9 +- .../camel-openstack/src/main/docs/openstack.adoc | 12 +- .../src/main/docs/properties-component.adoc | 30 +- .../component/properties/PropertiesComponent.java | 71 +++- .../component/properties/PropertiesSource.java | 30 +- .../src/main/docs/protobuf-dataformat.adoc | 4 +- .../src/main/docs/pubnub-component.adoc | 2 +- .../camel/component/pulsar/PulsarTestSupport.java | 2 +- .../src/main/docs/quartz2-component.adoc | 16 +- .../src/main/docs/quickfix-component.adoc | 2 +- .../src/main/docs/rest-swagger-component.adoc | 24 +- .../rest/swagger/RestSwaggerComponent.java | 2 +- .../rest/swagger/RestSwaggerEndpoint.java | 2 +- .../camel-rest/src/main/docs/rest-component.adoc | 2 +- .../src/main/docs/restlet-component.adoc | 2 +- .../camel-rss/src/main/docs/rss-component.adoc | 2 +- .../src/main/docs/salesforce-component.adoc | 2 +- .../internal/client/DefaultBulkApiClient.java | 28 +- .../src/main/docs/sap-netweaver-component.adoc | 2 +- .../src/main/docs/scheduler-component.adoc | 6 +- .../camel-seda/src/main/docs/seda-component.adoc | 16 +- .../src/main/docs/servicenow-component.adoc | 2 +- .../src/main/docs/servlet-component.adoc | 16 +- components/camel-shiro/src/main/docs/shiro.adoc | 2 +- .../src/main/docs/sjms-batch-component.adoc | 4 +- .../camel/component/smpp/SmppConfiguration.java | 40 +- .../component/smpp/SmppConfigurationTest.java | 16 +- .../camel/component/smpp/SmppConsumerTest.java | 23 +- .../smpp/SmppProducerLazySessionCreationTest.java | 13 +- .../camel/component/smpp/SmppProducerTest.java | 21 +- .../src/main/docs/soapjaxb-dataformat.adoc | 4 +- .../camel-solr/src/main/docs/solr-component.adoc | 10 +- .../src/main/docs/spring-security.adoc | 4 +- .../src/main/docs/spring-ws-component.adoc | 8 +- components/camel-spring/src/main/docs/spring.adoc | 6 +- .../apache/camel/spring/spi/SpringInjector.java | 20 + .../SpringPropertiesAfterTransactedDSL2Test.xml | 2 +- .../SpringPropertiesAfterTransactedDSLTest.xml | 2 +- .../SpringSimpleFileNameWithQuoteTest-context.xml | 2 +- .../SpringPropertiesAvailableEverywhereTest.xml | 2 +- .../issues/SpringRenameFileOnCommitIssueTest.xml | 2 +- .../processor/ClaimCheckEipPushPopBodyTest.xml | 2 +- .../ClaimCheckEipPushPopHeadersPatternTest.xml | 2 +- .../processor/ClaimCheckEipPushPopHeadersTest.xml | 2 +- .../ClaimCheckEipPushPopRemoveHeaderTest.xml | 6 +- .../RouteWithConstantFieldFromExchangeFailTest.xml | 2 +- .../RouteWithConstantFieldFromExchangeTest.xml | 2 +- .../spring/processor/SpringMethodCallTest.xml | 4 +- ...RecipientListParallelOptionalPropertiesTest.xml | 2 +- .../camel/spring/processor/SpringRouteStopTest.xml | 2 +- .../processor/SpringSetHeaderTest-context.xml | 2 +- .../SpringSetHeaderWithConstantTest-context.xml | 2 +- .../SpringSetHeaderXPathResultTypeTest.xml | 4 +- .../processor/SpringSimpleResultTypeRouteTest.xml | 8 +- .../spring/processor/SpringTraceTest-context.xml | 2 +- .../SpringTraceUsingPropertyTest-context.xml | 2 +- .../processor/SpringWireTapNewExchangeTest.xml | 4 +- .../apache/camel/spring/processor/aggregator.xml | 2 +- .../apache/camel/spring/processor/removeHeader.xml | 2 +- .../processor/removePropertiesWithExclusion.xml | 6 +- .../processor/removePropertiesWithoutExclusion.xml | 4 +- .../camel/spring/processor/removeProperty.xml | 2 +- .../spring/processor/setHeaderNameDynamic.xml | 2 +- .../apache/camel/spring/processor/setProperty.xml | 2 +- .../spring/processor/setPropertyNameDynamic.xml | 2 +- .../camel-sql/src/main/docs/sql-component.adoc | 2 +- .../camel-ssh/src/main/docs/ssh-component.adoc | 4 +- .../camel/component/ssh/SshConfiguration.java | 5 +- .../camel-stub/src/main/docs/stub-component.adoc | 8 +- .../src/main/docs/syslog-dataformat.adoc | 4 +- .../src/main/docs/test-blueprint.adoc | 2 +- .../test/blueprint/CamelBlueprintTestSupport.java | 2 +- .../properties-location-element-implicit-test.xml | 6 +- .../properties-location-element-optional-test.xml | 6 +- .../blueprint/properties-location-element-test.xml | 6 +- .../camel-test-cdi/src/main/docs/test-cdi.adoc | 10 +- .../src/main/docs/test-spring.adoc | 6 +- ...SpringPropertiesLocationElementTest-context.xml | 6 +- .../apache/camel/test/junit4/CamelTestSupport.java | 5 +- components/camel-testcontainers/pom.xml | 6 +- .../testcontainers/ContainerAwareTestSupport.java | 112 +++++ .../ContainerAwareTestSupportIT.java | 54 +++ .../camel-timer/src/main/docs/timer-component.adoc | 8 +- .../camel-twitter/src/main/docs/twitter.adoc | 22 +- .../src/main/docs/undertow-component.adoc | 8 +- .../src/main/docs/validator-component.adoc | 4 +- .../camel-vm/src/main/docs/vm-component.adoc | 10 +- .../src/main/docs/websocket-jsr356-component.adoc | 2 +- .../camel/websocket/jsr356/JSR356Endpoint.java | 2 +- .../src/main/docs/websocket-component.adoc | 8 +- .../src/main/docs/xmlsecurity-component.adoc | 2 +- .../camel-xpath/src/main/docs/xpath-language.adoc | 14 +- .../camel-xslt/src/main/docs/xslt-component.adoc | 4 +- .../src/main/docs/zookeeper-component.adoc | 2 +- components/pom.xml | 1 + components/readme.adoc | 8 +- .../org/apache/camel/PropertyBindingException.java | 30 +- .../main/java/org/apache/camel/spi/Injector.java | 10 + .../src/main/docs/constant-language.adoc | 2 +- core/camel-base/src/main/docs/file-language.adoc | 34 +- core/camel-base/src/main/docs/simple-language.adoc | 30 +- .../camel/impl/engine/AbstractCamelContext.java | 15 +- .../camel/impl/engine/DefaultFactoryFinder.java | 5 +- .../apache/camel/impl/engine/DefaultInjector.java | 21 +- .../runtimecatalog/impl/AbstractCamelCatalog.java | 2 +- .../org/apache/camel/core/osgi/impl/Activator.java | 2 +- .../xml/AbstractCamelContextFactoryBeanTest.java | 5 + .../src/main/docs/eips/aggregate-eip.adoc | 24 +- core/camel-core/src/main/docs/eips/bean-eip.adoc | 22 +- core/camel-core/src/main/docs/eips/choice-eip.adoc | 6 +- .../src/main/docs/eips/claimCheck-eip.adoc | 4 +- .../main/docs/eips/content-based-router-eip.adoc | 18 +- .../src/main/docs/eips/content-filter-eip.adoc | 32 +- core/camel-core/src/main/docs/eips/delay-eip.adoc | 2 +- .../src/main/docs/eips/dynamic-router.adoc | 6 +- .../src/main/docs/eips/dynamicRouter-eip.adoc | 2 +- .../main/docs/eips/eventDrivenConsumer-eip.adoc | 26 +- core/camel-core/src/main/docs/eips/filter-eip.adoc | 20 +- core/camel-core/src/main/docs/eips/from-eip.adoc | 2 +- .../camel-core/src/main/docs/eips/hystrix-eip.adoc | 6 +- .../src/main/docs/eips/idempotentConsumer-eip.adoc | 22 +- core/camel-core/src/main/docs/eips/log-eip.adoc | 12 +- .../camel-core/src/main/docs/eips/marshal-eip.adoc | 4 +- .../src/main/docs/eips/multicast-eip.adoc | 2 +- .../src/main/docs/eips/otherwise-eip.adoc | 4 +- .../src/main/docs/eips/pipeline-eip.adoc | 6 +- .../camel-core/src/main/docs/eips/process-eip.adoc | 20 +- .../src/main/docs/eips/recipientList-eip.adoc | 2 +- .../src/main/docs/eips/requestReply-eip.adoc | 4 +- .../src/main/docs/eips/resequence-eip.adoc | 2 +- .../src/main/docs/eips/rollback-eip.adoc | 40 +- .../src/main/docs/eips/routingSlip-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/script-eip.adoc | 2 +- .../src/main/docs/eips/setHeader-eip.adoc | 2 +- .../src/main/docs/eips/setProperty-eip.adoc | 4 +- core/camel-core/src/main/docs/eips/split-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/step-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/to-eip.adoc | 12 +- core/camel-core/src/main/docs/eips/toD-eip.adoc | 18 +- .../src/main/docs/eips/transform-eip.adoc | 2 +- .../src/main/docs/eips/unmarshal-eip.adoc | 6 +- core/camel-core/src/main/docs/eips/when-eip.adoc | 4 +- .../camel-core/src/main/docs/eips/wireTap-eip.adoc | 60 +-- .../camel/builder/FlexibleAggregationStrategy.java | 2 +- .../org/apache/camel/builder/NotifyBuilder.java | 44 ++ .../apache/camel/model/SetHeaderDefinition.java | 26 +- .../apache/camel/model/SetPropertyDefinition.java | 26 +- .../org/apache/camel/reifier/AggregateReifier.java | 2 +- .../java/org/apache/camel/reifier/BeanReifier.java | 2 +- .../org/apache/camel/reifier/CatchReifier.java | 2 +- .../org/apache/camel/reifier/ChoiceReifier.java | 2 +- .../apache/camel/reifier/ClaimCheckReifier.java | 2 +- .../apache/camel/reifier/ConvertBodyReifier.java | 2 +- .../org/apache/camel/reifier/DelayReifier.java | 2 +- .../apache/camel/reifier/DynamicRouterReifier.java | 2 +- .../org/apache/camel/reifier/EnrichReifier.java | 2 +- .../org/apache/camel/reifier/FilterReifier.java | 2 +- .../org/apache/camel/reifier/FinallyReifier.java | 2 +- .../org/apache/camel/reifier/HystrixReifier.java | 2 +- .../camel/reifier/IdempotentConsumerReifier.java | 2 +- .../apache/camel/reifier/InterceptFromReifier.java | 2 +- .../org/apache/camel/reifier/InterceptReifier.java | 2 +- .../reifier/InterceptSendToEndpointReifier.java | 2 +- .../apache/camel/reifier/LoadBalanceReifier.java | 2 +- .../java/org/apache/camel/reifier/LogReifier.java | 2 +- .../java/org/apache/camel/reifier/LoopReifier.java | 2 +- .../org/apache/camel/reifier/MarshalReifier.java | 2 +- .../org/apache/camel/reifier/MulticastReifier.java | 2 +- .../apache/camel/reifier/OnCompletionReifier.java | 3 +- .../apache/camel/reifier/OnExceptionReifier.java | 2 +- .../apache/camel/reifier/OnFallbackReifier.java | 2 +- .../org/apache/camel/reifier/OtherwiseReifier.java | 2 +- .../org/apache/camel/reifier/PipelineReifier.java | 2 +- .../org/apache/camel/reifier/PolicyReifier.java | 2 +- .../apache/camel/reifier/PollEnrichReifier.java | 2 +- .../org/apache/camel/reifier/ProcessReifier.java | 2 +- .../apache/camel/reifier/RecipientListReifier.java | 2 +- .../apache/camel/reifier/RemoveHeaderReifier.java | 2 +- .../apache/camel/reifier/RemoveHeadersReifier.java | 2 +- .../camel/reifier/RemovePropertiesReifier.java | 2 +- .../camel/reifier/RemovePropertyReifier.java | 2 +- .../apache/camel/reifier/ResequenceReifier.java | 2 +- .../org/apache/camel/reifier/RollbackReifier.java | 2 +- .../apache/camel/reifier/RoutingSlipReifier.java | 4 +- .../java/org/apache/camel/reifier/SagaReifier.java | 2 +- .../org/apache/camel/reifier/SamplingReifier.java | 2 +- .../org/apache/camel/reifier/ScriptReifier.java | 2 +- .../java/org/apache/camel/reifier/SendReifier.java | 2 +- .../apache/camel/reifier/ServiceCallReifier.java | 2 +- .../org/apache/camel/reifier/SetBodyReifier.java | 2 +- .../camel/reifier/SetExchangePatternReifier.java | 2 +- .../apache/camel/reifier/SetFaultBodyReifier.java | 2 +- .../org/apache/camel/reifier/SetHeaderReifier.java | 6 +- .../apache/camel/reifier/SetPropertyReifier.java | 6 +- .../java/org/apache/camel/reifier/SortReifier.java | 3 +- .../org/apache/camel/reifier/SplitReifier.java | 2 +- .../java/org/apache/camel/reifier/StepReifier.java | 2 +- .../java/org/apache/camel/reifier/StopReifier.java | 2 +- .../org/apache/camel/reifier/ThreadsReifier.java | 2 +- .../org/apache/camel/reifier/ThrottleReifier.java | 2 +- .../camel/reifier/ThrowExceptionReifier.java | 2 +- .../org/apache/camel/reifier/ToDynamicReifier.java | 2 +- .../org/apache/camel/reifier/TransformReifier.java | 2 +- .../java/org/apache/camel/reifier/TryReifier.java | 2 +- .../org/apache/camel/reifier/UnmarshalReifier.java | 2 +- .../org/apache/camel/reifier/ValidateReifier.java | 2 +- .../java/org/apache/camel/reifier/WhenReifier.java | 2 +- .../reifier/WhenSkipSendToEndpointReifier.java | 2 +- .../org/apache/camel/reifier/WireTapReifier.java | 2 +- .../dataformat/CryptoDataFormatReifier.java | 1 - .../dataformat/CustomDataFormatReifier.java | 1 - .../reifier/dataformat/GrokDataFormatReifier.java | 1 - .../reifier/dataformat/JsonDataFormatReifier.java | 1 - .../loadbalancer/CustomLoadBalancerReifier.java | 2 +- .../loadbalancer/FailoverLoadBalancerReifier.java | 2 +- .../loadbalancer/RandomLoadBalancerReifier.java | 2 +- .../RoundRobinLoadBalancerReifier.java | 2 +- .../loadbalancer/StickyLoadBalancerReifier.java | 2 +- .../loadbalancer/TopicLoadBalancerReifier.java | 2 +- .../loadbalancer/WeightedLoadBalancerReifier.java | 2 +- .../camel/reifier/rest/RestBindingReifier.java | 1 - .../transformer/CustomTransformeReifier.java | 2 +- .../transformer/DataFormatTransformeReifier.java | 2 +- .../transformer/EndpointTransformeReifier.java | 2 +- .../reifier/validator/CustomValidatorReifier.java | 2 +- .../validator/EndpointValidatorReifier.java | 2 +- .../validator/PredicateValidatorReifier.java | 2 +- .../camel/builder/NotifyBuilderFromRouteTest.java | 28 ++ .../org/apache/camel/builder/xml/XPathTest.java | 2 +- .../PropertiesComponentEIPChoiceSimpleTest.java | 9 +- .../org/apache/camel/impl/DefaultInjectorTest.java | 25 ++ .../RouteStartupFailShouldStopAlsoIssueTest.java | 137 +++++++ .../java/org/apache/camel/model/XmlParseTest.java | 4 +- .../camel/support/PropertyBindingSupportTest.java | 7 +- .../util/DumpModelAsXmlRouteExpressionTest.java | 2 +- .../org/apache/camel/util/ReflectionInjector.java | 19 + .../org/apache/camel/impl/route4_error.xml | 2 +- .../resources/org/apache/camel/impl/route4_ok.xml | 2 +- .../resources/org/apache/camel/model/setHeader.xml | 2 +- .../org/apache/camel/model/setHeaderToConstant.xml | 2 +- .../endpoint/dsl/FileEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/FtpEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/FtpsEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/MailEndpointBuilderFactory.java | 64 --- .../endpoint/dsl/S3EndpointBuilderFactory.java | 28 +- .../endpoint/dsl/SftpEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/SshEndpointBuilderFactory.java | 12 +- .../apache/camel/converter/jaxp/XmlConverter.java | 2 +- .../support/builder/xml/XMLConverterHelper.java | 2 +- .../processor/validation/ValidatingProcessor.java | 2 +- .../camel/main/MainConfigurationProperties.java | 26 +- .../java/org/apache/camel/main/MainSupport.java | 122 +++--- .../camel-main-configuration-metadata.json | 9 +- .../apache/camel/support/IntrospectionSupport.java | 4 +- .../org/apache/camel/support/LRUCacheFactory.java | 2 +- .../org/apache/camel/support/ObjectHelper.java | 10 +- .../camel/support/PropertyBindingSupport.java | 50 ++- .../java/org/apache/camel/util/URISupport.java | 2 +- .../java/org/apache/camel/util/URISupportTest.java | 6 + docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/ahc-component.adoc | 8 +- .../modules/ROOT/pages/ahc-ws-component.adoc | 4 +- .../modules/ROOT/pages/amqp-component.adoc | 2 +- .../ROOT/pages/atmosphere-websocket-component.adoc | 6 +- .../modules/ROOT/pages/atom-component.adoc | 2 +- .../modules/ROOT/pages/aws-ddb-component.adoc | 2 +- .../ROOT/pages/aws-ddbstream-component.adoc | 2 +- .../modules/ROOT/pages/aws-ec2-component.adoc | 2 +- .../modules/ROOT/pages/aws-ecs-component.adoc | 2 +- .../modules/ROOT/pages/aws-eks-component.adoc | 2 +- .../modules/ROOT/pages/aws-iam-component.adoc | 2 +- .../modules/ROOT/pages/aws-kinesis-component.adoc | 2 +- .../ROOT/pages/aws-kinesis-firehose-component.adoc | 2 +- .../modules/ROOT/pages/aws-kms-component.adoc | 2 +- .../modules/ROOT/pages/aws-lambda-component.adoc | 2 +- .../modules/ROOT/pages/aws-mq-component.adoc | 2 +- .../modules/ROOT/pages/aws-msk-component.adoc | 2 +- .../modules/ROOT/pages/aws-s3-component.adoc | 12 +- .../modules/ROOT/pages/aws-sdb-component.adoc | 2 +- .../modules/ROOT/pages/aws-ses-component.adoc | 2 +- .../modules/ROOT/pages/aws-sns-component.adoc | 2 +- .../modules/ROOT/pages/aws-sqs-component.adoc | 2 +- .../modules/ROOT/pages/aws-swf-component.adoc | 2 +- docs/components/modules/ROOT/pages/azure.adoc | 4 +- .../modules/ROOT/pages/bean-component.adoc | 4 +- .../modules/ROOT/pages/class-component.adoc | 8 +- .../modules/ROOT/pages/cm-sms-component.adoc | 6 +- .../modules/ROOT/pages/controlbus-component.adoc | 12 +- .../modules/ROOT/pages/corda-component.adoc | 2 +- .../modules/ROOT/pages/crypto-dataformat.adoc | 2 +- .../modules/ROOT/pages/cxf-transport.adoc | 8 +- .../modules/ROOT/pages/cxfrs-component.adoc | 2 +- .../modules/ROOT/pages/dataformat-component.adoc | 4 +- .../modules/ROOT/pages/dataset-component.adoc | 6 +- .../modules/ROOT/pages/dataset-test-component.adoc | 14 +- .../modules/ROOT/pages/direct-component.adoc | 10 +- .../modules/ROOT/pages/direct-vm-component.adoc | 10 +- .../modules/ROOT/pages/disruptor-component.adoc | 4 +- .../modules/ROOT/pages/ejb-component.adoc | 12 +- .../modules/ROOT/pages/elsql-component.adoc | 4 +- .../modules/ROOT/pages/exec-component.adoc | 2 +- .../modules/ROOT/pages/file-component.adoc | 42 +- .../modules/ROOT/pages/flatpack-component.adoc | 2 +- .../modules/ROOT/pages/flatpack-dataformat.adoc | 2 +- .../modules/ROOT/pages/freemarker-component.adoc | 2 +- .../modules/ROOT/pages/ftp-component.adoc | 21 +- .../modules/ROOT/pages/ftps-component.adoc | 14 +- .../ROOT/pages/google-bigquery-sql-component.adoc | 2 +- .../modules/ROOT/pages/gora-component.adoc | 16 +- .../modules/ROOT/pages/grok-dataformat.adoc | 4 +- .../modules/ROOT/pages/groovy-language.adoc | 4 +- .../modules/ROOT/pages/grpc-component.adoc | 4 +- .../pages/hazelcast-atomicvalue-component.adoc | 10 +- .../ROOT/pages/hazelcast-map-component.adoc | 16 +- .../ROOT/pages/hazelcast-multimap-component.adoc | 8 +- .../pages/hazelcast-replicatedmap-component.adoc | 6 +- .../ROOT/pages/hazelcast-ringbuffer-component.adoc | 2 +- docs/components/modules/ROOT/pages/hazelcast.adoc | 34 +- .../modules/ROOT/pages/hbase-component.adoc | 32 +- .../modules/ROOT/pages/hdfs2-component.adoc | 2 +- .../modules/ROOT/pages/hipchat-component.adoc | 2 +- .../modules/ROOT/pages/hl7-dataformat.adoc | 12 +- .../modules/ROOT/pages/http4-component.adoc | 10 +- docs/components/modules/ROOT/pages/ignite.adoc | 16 +- .../modules/ROOT/pages/iota-component.adoc | 18 +- .../modules/ROOT/pages/irc-component.adoc | 2 +- docs/components/modules/ROOT/pages/jasypt.adoc | 16 +- .../modules/ROOT/pages/jaxb-dataformat.adoc | 4 +- .../modules/ROOT/pages/jdbc-component.adoc | 8 +- .../modules/ROOT/pages/jetty-component.adoc | 18 +- .../modules/ROOT/pages/jgroups-component.adoc | 4 +- .../modules/ROOT/pages/jgroups-raft-component.adoc | 2 +- .../modules/ROOT/pages/jing-component.adoc | 2 +- .../modules/ROOT/pages/jira-component.adoc | 8 +- .../modules/ROOT/pages/jms-component.adoc | 22 +- .../modules/ROOT/pages/jmx-component.adoc | 2 +- .../modules/ROOT/pages/jpa-component.adoc | 2 +- .../modules/ROOT/pages/jsonpath-language.adoc | 6 +- .../pages/kubernetes-config-maps-component.adoc | 2 +- .../pages/kubernetes-deployments-component.adoc | 2 +- .../ROOT/pages/kubernetes-hpa-component.adoc | 2 +- .../ROOT/pages/kubernetes-job-component.adoc | 2 +- .../pages/kubernetes-namespaces-component.adoc | 2 +- .../ROOT/pages/kubernetes-nodes-component.adoc | 2 +- ...rnetes-persistent-volumes-claims-component.adoc | 2 +- .../kubernetes-persistent-volumes-component.adoc | 2 +- .../ROOT/pages/kubernetes-pods-component.adoc | 2 +- ...bernetes-replication-controllers-component.adoc | 2 +- .../kubernetes-resources-quota-component.adoc | 2 +- .../ROOT/pages/kubernetes-secrets-component.adoc | 2 +- .../kubernetes-service-accounts-component.adoc | 2 +- .../ROOT/pages/kubernetes-services-component.adoc | 2 +- docs/components/modules/ROOT/pages/kubernetes.adoc | 24 +- .../modules/ROOT/pages/language-component.adoc | 12 +- .../modules/ROOT/pages/log-component.adoc | 2 +- .../modules/ROOT/pages/mail-component.adoc | 8 +- .../modules/ROOT/pages/microprofile-config.adoc | 19 + .../modules/ROOT/pages/milo-client-component.adoc | 2 +- .../modules/ROOT/pages/mina2-component.adoc | 8 +- .../modules/ROOT/pages/mock-component.adoc | 20 +- .../ROOT/pages/mongodb-gridfs-component.adoc | 2 +- .../modules/ROOT/pages/mongodb3-component.adoc | 12 +- .../modules/ROOT/pages/msv-component.adoc | 2 +- .../modules/ROOT/pages/mybatis-component.adoc | 4 +- .../modules/ROOT/pages/nagios-component.adoc | 6 +- .../modules/ROOT/pages/netty4-component.adoc | 8 +- .../modules/ROOT/pages/netty4-http-component.adoc | 20 +- .../pages/openshift-build-configs-component.adoc | 2 +- .../ROOT/pages/openshift-builds-component.adoc | 2 +- docs/components/modules/ROOT/pages/openstack.adoc | 12 +- .../modules/ROOT/pages/properties-component.adoc | 30 +- .../modules/ROOT/pages/protobuf-dataformat.adoc | 4 +- .../modules/ROOT/pages/pubnub-component.adoc | 2 +- .../modules/ROOT/pages/quartz2-component.adoc | 16 +- .../modules/ROOT/pages/quickfix-component.adoc | 2 +- .../modules/ROOT/pages/rest-component.adoc | 2 +- .../modules/ROOT/pages/rest-swagger-component.adoc | 24 +- .../modules/ROOT/pages/restlet-component.adoc | 2 +- .../modules/ROOT/pages/rss-component.adoc | 2 +- .../ROOT/pages/sap-netweaver-component.adoc | 2 +- .../modules/ROOT/pages/scheduler-component.adoc | 6 +- .../modules/ROOT/pages/scp-component.adoc | 4 +- .../modules/ROOT/pages/seda-component.adoc | 16 +- .../modules/ROOT/pages/servlet-component.adoc | 16 +- .../modules/ROOT/pages/sftp-component.adoc | 14 +- docs/components/modules/ROOT/pages/shiro.adoc | 2 +- .../modules/ROOT/pages/sjms-batch-component.adoc | 4 +- .../modules/ROOT/pages/soapjaxb-dataformat.adoc | 4 +- .../modules/ROOT/pages/solr-component.adoc | 10 +- .../modules/ROOT/pages/spring-security.adoc | 4 +- .../modules/ROOT/pages/spring-ws-component.adoc | 8 +- docs/components/modules/ROOT/pages/spring.adoc | 6 +- .../modules/ROOT/pages/sql-component.adoc | 2 +- .../modules/ROOT/pages/ssh-component.adoc | 4 +- .../modules/ROOT/pages/stub-component.adoc | 8 +- .../modules/ROOT/pages/syslog-dataformat.adoc | 4 +- .../modules/ROOT/pages/test-blueprint.adoc | 2 +- docs/components/modules/ROOT/pages/test-cdi.adoc | 10 +- .../components/modules/ROOT/pages/test-spring.adoc | 6 +- .../modules/ROOT/pages/timer-component.adoc | 8 +- docs/components/modules/ROOT/pages/twitter.adoc | 22 +- .../modules/ROOT/pages/undertow-component.adoc | 8 +- .../modules/ROOT/pages/validator-component.adoc | 4 +- .../modules/ROOT/pages/vm-component.adoc | 10 +- .../modules/ROOT/pages/websocket-component.adoc | 8 +- .../ROOT/pages/websocket-jsr356-component.adoc | 2 +- .../modules/ROOT/pages/xmlsecurity-component.adoc | 2 +- .../modules/ROOT/pages/xpath-language.adoc | 14 +- .../modules/ROOT/pages/xslt-component.adoc | 4 +- .../modules/ROOT/pages/zookeeper-component.adoc | 2 +- docs/user-manual/en/security-advisories.adoc | 73 ---- .../en/security-advisories/CVE-2013-4330.txt.asc | 46 --- .../en/security-advisories/CVE-2014-0002.txt.asc | 46 --- .../en/security-advisories/CVE-2014-0003.txt.asc | 46 --- .../en/security-advisories/CVE-2015-0263.txt.asc | 38 -- .../en/security-advisories/CVE-2015-0264.txt.asc | 38 -- .../en/security-advisories/CVE-2015-5344.txt.asc | 52 --- .../en/security-advisories/CVE-2015-5348.txt.asc | 37 -- .../en/security-advisories/CVE-2016-8749.txt.asc | 35 -- .../en/security-advisories/CVE-2017-12633.txt.asc | 33 -- .../en/security-advisories/CVE-2017-12634.txt.asc | 33 -- .../en/security-advisories/CVE-2017-3159.txt.asc | 33 -- .../en/security-advisories/CVE-2017-5643.txt.asc | 30 -- .../en/security-advisories/CVE-2018-8027.txt.asc | 31 -- .../en/security-advisories/CVE-2018-8041.txt.asc | 32 -- .../en/security-advisories/CVE-2019-0188.txt.asc | 25 -- .../en/security-advisories/CVE-2019-0194.txt.asc | 27 -- .../modules/ROOT/pages/aggregate-eip.adoc | 24 +- docs/user-manual/modules/ROOT/pages/async.adoc | 36 +- .../ROOT/pages/asynchronous-routing-engine.adoc | 40 +- .../modules/ROOT/pages/backlog-tracer.adoc | 4 +- .../modules/ROOT/pages/backlogdebugger.adoc | 2 +- .../modules/ROOT/pages/bam-example.adoc | 8 +- .../modules/ROOT/pages/batch-consumer.adoc | 22 +- docs/user-manual/modules/ROOT/pages/bean-eip.adoc | 22 +- .../modules/ROOT/pages/bean-integration.adoc | 6 +- .../modules/ROOT/pages/book-getting-started.adoc | 2 +- .../modules/ROOT/pages/browsable-endpoint.adoc | 8 +- .../user-manual/modules/ROOT/pages/camel-boot.adoc | 6 +- .../ROOT/pages/camel-configuration-utilities.adoc | 18 +- .../user-manual/modules/ROOT/pages/choice-eip.adoc | 6 +- .../modules/ROOT/pages/claimCheck-eip.adoc | 4 +- ...ing-route-startup-ordering-and-autostartup.adoc | 2 +- .../modules/ROOT/pages/constant-language.adoc | 2 +- .../ROOT/pages/content-based-router-eip.adoc | 18 +- .../modules/ROOT/pages/content-filter-eip.adoc | 32 +- .../modules/ROOT/pages/correlation-identifier.adoc | 4 +- .../modules/ROOT/pages/data-format.adoc | 86 ++-- .../modules/ROOT/pages/dead-letter-channel.adoc | 32 +- .../modules/ROOT/pages/defaulterrorhandler.adoc | 6 +- docs/user-manual/modules/ROOT/pages/delay-eip.adoc | 2 +- .../modules/ROOT/pages/dynamic-router.adoc | 6 +- .../modules/ROOT/pages/dynamicRouter-eip.adoc | 2 +- .../pages/enterprise-integration-patterns.adoc | 8 +- .../ROOT/pages/error-handling-in-camel.adoc | 24 +- .../modules/ROOT/pages/event-message.adoc | 4 +- .../ROOT/pages/eventDrivenConsumer-eip.adoc | 26 +- .../modules/ROOT/pages/exception-clause.adoc | 30 +- .../modules/ROOT/pages/exchange-pattern.adoc | 2 +- .../user-manual/modules/ROOT/pages/expression.adoc | 48 +-- docs/user-manual/modules/ROOT/pages/faq.adoc | 4 +- .../faq/how-can-i-stop-a-route-from-a-route.adoc | 4 +- .../pages/faq/how-do-i-configure-endpoints.adoc | 6 +- ...en-consuming-for-example-from-a-ftp-server.adoc | 8 +- .../faq/how-do-i-let-jetty-match-wildcards.adoc | 8 +- ...ow-do-i-make-my-jms-endpoint-transactional.adoc | 8 +- .../how-do-i-retry-failed-messages-forever.adoc | 2 +- ...om-a-certain-point-back-or-an-entire-route.adoc | 2 +- ...-contexttestsupport-class-in-my-unit-tests.adoc | 2 +- ...ify-time-period-in-a-human-friendly-syntax.adoc | 2 +- ...h-method-to-use-when-using-beans-in-routes.adoc | 2 +- ...spring-property-placeholder-with-camel-xml.adoc | 4 +- ...om-processor-which-sends-multiple-messages.adoc | 4 +- ...direct-event-seda-and-vm-endpoints-compare.adoc | 10 +- ...-do-the-timer-and-quartz-endpoints-compare.adoc | 4 +- .../pages/faq/how-does-camel-compare-to-mule.adoc | 4 +- .../how-does-camel-compare-to-servicemix-eip.adoc | 2 +- ...how-does-camel-look-up-beans-and-endpoints.adoc | 8 +- .../faq/how-does-camel-work-with-activemq.adoc | 8 +- .../faq/how-does-the-camel-api-compare-to.adoc | 10 +- ...-avoid-sending-some-or-all-message-headers.adoc | 6 +- ...end-the-same-message-to-multiple-endpoints.adoc | 8 +- ...-without-touching-the-spring-configuration.adoc | 4 +- .../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc | 10 +- ...f-i-use-servicemix-when-should-i-use-camel.adoc | 2 +- ...-activemq-broker-or-in-another-application.adoc | 2 +- .../using-getin-or-getout-methods-on-exchange.adoc | 8 +- .../modules/ROOT/pages/faq/what-is-a-router.adoc | 10 +- .../modules/ROOT/pages/faq/what-is-camel.adoc | 6 +- ...se-when-or-otherwise-in-a-java-camel-route.adoc | 18 +- ...-does-ftp-component-not-download-any-files.adoc | 2 +- ...-file-consumer-use-the-camel-error-handler.adoc | 6 +- ...jms-route-only-consume-one-message-at-once.adoc | 4 +- ...ge-with-error-handler-not-work-as-expected.adoc | 8 +- .../pages/faq/why-use-multiple-camelcontext.adoc | 4 +- .../modules/ROOT/pages/file-language.adoc | 34 +- .../user-manual/modules/ROOT/pages/filter-eip.adoc | 20 +- docs/user-manual/modules/ROOT/pages/from-eip.adoc | 2 +- .../modules/ROOT/pages/graceful-shutdown.adoc | 4 +- .../modules/ROOT/pages/guaranteed-delivery.adoc | 12 +- .../modules/ROOT/pages/hystrix-eip.adoc | 6 +- .../modules/ROOT/pages/idempotentConsumer-eip.adoc | 22 +- docs/user-manual/modules/ROOT/pages/index.adoc | 26 +- docs/user-manual/modules/ROOT/pages/injector.adoc | 2 +- docs/user-manual/modules/ROOT/pages/intercept.adoc | 4 +- docs/user-manual/modules/ROOT/pages/json.adoc | 2 +- docs/user-manual/modules/ROOT/pages/languages.adoc | 48 +-- docs/user-manual/modules/ROOT/pages/log-eip.adoc | 12 +- .../modules/ROOT/pages/marshal-eip.adoc | 4 +- .../modules/ROOT/pages/message-bus.adoc | 2 +- .../modules/ROOT/pages/message-channel.adoc | 4 +- .../modules/ROOT/pages/message-translator.adoc | 6 +- .../modules/ROOT/pages/multicast-eip.adoc | 2 +- .../modules/ROOT/pages/oncompletion.adoc | 2 +- .../modules/ROOT/pages/otherwise-eip.adoc | 4 +- .../modules/ROOT/pages/pipeline-eip.adoc | 6 +- .../modules/ROOT/pages/point-to-point-channel.adoc | 10 +- docs/user-manual/modules/ROOT/pages/predicate.adoc | 4 +- .../modules/ROOT/pages/process-eip.adoc | 20 +- docs/user-manual/modules/ROOT/pages/processor.adoc | 8 +- .../ROOT/pages/publish-subscribe-channel.adoc | 8 +- .../modules/ROOT/pages/recipientList-eip.adoc | 2 +- .../modules/ROOT/pages/requestReply-eip.adoc | 4 +- .../modules/ROOT/pages/resequence-eip.adoc | 2 +- docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 26 +- .../modules/ROOT/pages/return-address.adoc | 2 +- .../modules/ROOT/pages/rollback-eip.adoc | 40 +- .../modules/ROOT/pages/routingSlip-eip.adoc | 2 +- .../ROOT/pages/scala-dsl-supported-languages.adoc | 4 +- .../user-manual/modules/ROOT/pages/script-eip.adoc | 2 +- .../modules/ROOT/pages/scripting-languages.adoc | 4 +- .../modules/ROOT/pages/security-advisories.adoc | 55 --- .../modules/ROOT/pages/servlet-tomcat-example.adoc | 10 +- .../modules/ROOT/pages/setHeader-eip.adoc | 2 +- .../modules/ROOT/pages/setProperty-eip.adoc | 4 +- .../modules/ROOT/pages/simple-language.adoc | 30 +- docs/user-manual/modules/ROOT/pages/split-eip.adoc | 2 +- .../modules/ROOT/pages/spring-testing.adoc | 14 +- docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +- .../modules/ROOT/pages/stream-caching.adoc | 4 +- docs/user-manual/modules/ROOT/pages/testing.adoc | 16 +- docs/user-manual/modules/ROOT/pages/to-eip.adoc | 12 +- docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 18 +- .../modules/ROOT/pages/transactional-client.adoc | 20 +- .../ROOT/pages/transactionerrorhandler.adoc | 2 +- .../modules/ROOT/pages/transform-eip.adoc | 2 +- .../modules/ROOT/pages/transformer.adoc | 4 +- .../modules/ROOT/pages/try-catch-finally.adoc | 4 +- .../modules/ROOT/pages/unmarshal-eip.adoc | 6 +- .../ROOT/pages/using-propertyplaceholder.adoc | 24 +- docs/user-manual/modules/ROOT/pages/validator.adoc | 2 +- docs/user-manual/modules/ROOT/pages/when-eip.adoc | 4 +- .../modules/ROOT/pages/wireTap-eip.adoc | 60 +-- .../modules/ROOT/pages/writing-components.adoc | 2 +- .../resources/META-INF/spring/camel-context.xml | 46 +-- .../apache/camel/example/cdi/osgi/CdiOsgiIT.java | 103 ----- .../readme.adoc | 2 +- .../camel-example-fhir-spring-boot/readme.adoc | 2 +- .../resources/META-INF/spring/camel-context.xml | 4 +- .../README.adoc | 69 ++++ .../camel-example-kafka-offsetrepository/pom.xml | 128 ++++++ .../kafka/offsetRepository/KafkaProcessor.java | 34 +- .../kafka/offsetRepository/OffsetRepoApp.java | 35 +- .../src/main/resources/application.properties | 33 ++ .../src/main}/resources/log4j2.properties | 0 .../src/main/resources/offsetStateRepo.dat | 1 + .../src/main/resources/spring/camel-context.xml | 55 +++ .../META-INF/spring/camel-context-mina1.xml | 2 +- .../META-INF/spring/camel-context-mina2.xml | 2 +- .../META-INF/spring-configuration-metadata.json | 67 +-- examples/camel-example-main-tiny/pom.xml | 4 +- .../META-INF/spring-configuration-metadata.json | 9 +- examples/camel-example-main/pom.xml | 4 +- .../META-INF/spring-configuration-metadata.json | 9 +- .../resources/META-INF/spring/camel-context.xml | 2 +- .../README.adoc | 2 +- .../main/resources/OSGI-INF/blueprint/camel.xml | 2 +- examples/pom.xml | 1 + parent/pom.xml | 52 +-- .../s3/springboot/S3ComponentConfiguration.java | 16 +- .../springboot/MailComponentConfiguration.java | 13 - .../RestSwaggerComponentConfiguration.java | 2 +- .../ssh/springboot/SshComponentConfiguration.java | 4 +- .../camel-spring-boot-dependencies/pom.xml | 17 +- .../blueprint/CxfPayloadProviderRouterBeans.xml | 4 +- .../greeter/JettyRecipientListCxfIssueTest.xml | 2 +- .../jetty/JettySpringFailoverRoundRobinTest.xml | 4 +- .../packaging/PackageArchetypeCatalogMojo.java | 31 +- .../maven/packaging/SpringBootStarterMojo.java | 1 + .../camel/maven/packaging/UpdateReadmeMojo.java | 455 ++++----------------- .../src/main/resources/component-options.mvel | 4 +- .../src/main/resources/dataformat-options.mvel | 2 +- .../src/main/resources/eip-options.mvel | 2 +- .../src/main/resources/endpoint-options.mvel | 4 +- .../src/main/resources/language-options.mvel | 2 +- .../src/main/resources/readme-components.mvel | 2 +- .../src/main/resources/readme-dataformats.mvel | 2 +- .../src/main/resources/readme-eips.mvel | 2 +- .../src/main/resources/readme-examples.mvel | 2 +- .../src/main/resources/readme-languages.mvel | 2 +- .../src/main/resources/readme-others.mvel | 2 +- .../spring-boot-auto-configure-options.mvel | 2 +- .../main/docs/camel-restdsl-swagger-plugin.adoc | 4 +- 813 files changed, 5189 insertions(+), 4856 deletions(-) create mode 100644 archetypes/camel-archetype-main/pom.xml create mode 100644 archetypes/camel-archetype-main/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml copy {tooling/maven/camel-package-maven-plugin => archetypes/camel-archetype-main}/src/main/resources/META-INF/LICENSE.txt (100%) copy {tooling/maven/camel-package-maven-plugin => archetypes/camel-archetype-main}/src/main/resources/META-INF/NOTICE.txt (100%) create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/ReadMe.txt copy archetypes/{camel-archetype-java => camel-archetype-main}/src/main/resources/archetype-resources/pom.xml (61%) create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyApplication.java create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyBean.java create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyConfiguration.java create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java create mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/application.properties copy {examples/camel-example-main => archetypes/camel-archetype-main/src/main/resources/archetype-resources}/src/main/resources/logback.xml (100%) create mode 100644 components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java delete mode 100644 components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java delete mode 100644 components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RSAKeyPairIdentity.java copy components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/{SftpKeyFileConsumeTest.java => SftpECKeyFileConsumeTest.java} (82%) copy components/{camel-ssh => camel-ftp}/src/test/resources/ec.pem (100%) create mode 100644 components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java delete mode 100644 components/camel-mail/src/main/java/org/apache/camel/component/mail/DummySSLSocketFactory.java delete mode 100644 components/camel-mail/src/main/java/org/apache/camel/component/mail/DummyTrustManager.java copy components/{camel-jdbc => camel-microprofile-config}/pom.xml (75%) create mode 100644 components/camel-microprofile-config/src/main/docs/microprofile-config.adoc create mode 100644 components/camel-microprofile-config/src/main/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSource.java create mode 100644 components/camel-microprofile-config/src/main/resources/META-INF/services/org/apache/camel/properties-source-factory create mode 100644 components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java create mode 100644 components/camel-microprofile-config/src/test/resources/log4j2.properties copy core/camel-core/src/main/java/org/apache/camel/reifier/WhenReifier.java => components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesSource.java (59%) create mode 100644 components/camel-testcontainers/src/main/java/org/apache/camel/test/junit5/testcontainers/ContainerAwareTestSupport.java create mode 100644 components/camel-testcontainers/src/test/java/org/apache/camel/test/junit5/testcontainers/ContainerAwareTestSupportIT.java create mode 100644 core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java create mode 100644 docs/components/modules/ROOT/pages/microprofile-config.adoc delete mode 100644 docs/user-manual/en/security-advisories.adoc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2013-4330.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2014-0002.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2014-0003.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2015-0263.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2015-0264.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2015-5344.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2015-5348.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2016-8749.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2017-12633.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2017-12634.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2017-3159.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2017-5643.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2018-8027.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2018-8041.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2019-0188.txt.asc delete mode 100644 docs/user-manual/en/security-advisories/CVE-2019-0194.txt.asc delete mode 100644 docs/user-manual/modules/ROOT/pages/security-advisories.adoc delete mode 100644 examples/camel-example-cdi-osgi/src/test/java/org/apache/camel/example/cdi/osgi/CdiOsgiIT.java create mode 100644 examples/camel-example-kafka-offsetrepository/README.adoc create mode 100644 examples/camel-example-kafka-offsetrepository/pom.xml copy core/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java => examples/camel-example-kafka-offsetrepository/src/main/java/org/apache/camel/example/kafka/offsetRepository/KafkaProcessor.java (52%) copy core/camel-core/src/test/java/org/apache/camel/util/ReflectionInjector.java => examples/camel-example-kafka-offsetrepository/src/main/java/org/apache/camel/example/kafka/offsetRepository/OffsetRepoApp.java (51%) create mode 100644 examples/camel-example-kafka-offsetrepository/src/main/resources/application.properties copy {tests/camel-itest-osgi/src/test => examples/camel-example-kafka-offsetrepository/src/main}/resources/log4j2.properties (100%) create mode 100644 examples/camel-example-kafka-offsetrepository/src/main/resources/offsetStateRepo.dat create mode 100644 examples/camel-example-kafka-offsetrepository/src/main/resources/spring/camel-context.xml