You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/23 13:37:41 UTC
[camel] branch main updated (05d1b980f54 -> 7a3b58b0981)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 05d1b980f54 (chores) ci: set full path to mvnw path in quick tests
new 88759d58aa3 CAMEL-19465 - Move Apache snapshots repository to a separate Maven profile for better build reproducibility
new 2923416b6fb CAMEL-19461 - Remove Checkstyle
new a1f5a26682b Build with compiler.fork=false by default
new c2ea1c1f507 Do not fork cxf-codegen-plugin
new 484c39e641c Remove mock-javamail_1.7 module which was disabled anyway
new dab0094b03f CAMEL-19466 - Skip Maven mojos in the fast profile properly
new 711fac89866 CAMEL-19461 - Newcomer friendly source formatting
new 7afe20a4c72 Do not run Maven plugin integration tests with -DskipTests
new f04bcf2ded5 Reformat Java after enabling the formatter plugin by default
new 50314d12312 CAMEL-19461 - Enable license-maven-plugin's format mojo in full profile
new 39455bfd81c CAMEL-19461 - Add missing license-maven-plugin configuration
new 80e7e2ff54b CAMEL-19461 - Rename test resources to match license-maven-plugin configuration
new 32f3f4b405e CAMEL-19461 - Reformat license headers with the new configuration
new 787810f8af8 CAMEL-19461 - Fix YAML DSL tests after reformatting the license headers
new 7a82031306d CAMEL-19461 - Make Cassandra tests aware of license headers in .cql files
new 16cfb52d4fe CAMEL-19461 - make camel-dependencies work with mvn license:format, copy only version properties to camel-dependencies
new 576e4772762 Workaround INFRA-24713 in the deploy script rather than for all possible builds
new 7a3b58b0981 Adapt CI scripts to new fast profile and the fact that source formatting happens during the default build
The 18 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:
.github/actions/component-test/component-test.sh | 2 +-
.github/actions/incremental-build/action.yaml | 2 +-
.../actions/incremental-build/incremental-build.sh | 19 +-
.github/pull_request_template.md | 8 +-
.github/workflows/alternative-os-build-main.yml | 6 +-
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-build-main.yml | 60 +-
.github/workflows/push-build-main.yml | 2 +-
.mvn/wrapper/maven-wrapper.properties | 2 +-
Jenkinsfile.deploy | 33 +-
Jenkinsfile.dryrun | 27 +-
Jenkinsfile.jdk17 | 27 +-
Jenkinsfile.ppc64le | 27 +-
Jenkinsfile.s390x | 27 +-
apache-camel/pom.xml | 81 +-
archetypes/pom.xml | 7 -
buildingtools/pom.xml | 112 --
.../resources/camel-checkstyle-suppressions.xml | 78 --
.../src/main/resources/camel-checkstyle.xml | 394 -------
.../src/main/resources/camel-eclipse-checkstyle | 27 -
buildingtools/src/main/resources/camel-eclipse-pmd | 32 +-
.../src/main/resources/header-properties.txt | 16 -
buildingtools/src/main/resources/header-xml.txt | 18 -
...on.xml => ldif-properties-headerdefinition.xml} | 10 +-
camel-dependencies/pom.xml | 851 ++++++++-------
catalog/camel-catalog-console/pom.xml | 1 -
catalog/camel-catalog/pom.xml | 56 +-
.../org/apache/camel/catalog/others.properties | 1 -
.../apache/camel/catalog/others/dsl-support.json | 15 -
.../apache/camel/catalog/DefaultCamelCatalog.java | 2 -
.../java/org/apache/camel/maven/GenerateMojo.java | 7 +-
.../org/apache/camel/maven/RouteCoverageMojo.java | 22 +-
.../java/org/apache/camel/maven/ValidateMojo.java | 83 +-
catalog/dummy-component/pom.xml | 1 -
catalog/pom.xml | 9 -
components/camel-as2/camel-as2-api/pom.xml | 1 -
.../src/main/resources/mdnDescription.vm | 32 +-
.../as2/AS2ClientManagerEndpointConfiguration.java | 1 -
.../as2/AS2ServerManagerEndpointConfiguration.java | 1 -
.../component/as2/internal/AS2ApiCollection.java | 1 -
.../camel/component/as2/internal/AS2ApiName.java | 1 -
.../as2/internal/AS2ClientManagerApiMethod.java | 1 -
.../as2/internal/AS2ServerManagerApiMethod.java | 1 -
components/camel-as2/pom.xml | 8 -
components/camel-asterisk/pom.xml | 35 +-
.../camel-atom/src/test/data/empty-feed.atom | 4 +-
components/camel-atom/src/test/data/feed.atom | 4 +-
.../camel-atom/src/test/data/unsortedfeed.atom | 4 +-
.../java/org/apache/camel/avro/generated/Key.java | 207 ++--
.../camel/avro/generated/KeyValueProtocol.java | 34 +-
.../org/apache/camel/avro/generated/Value.java | 208 ++--
components/camel-avro/pom.xml | 27 +-
.../camel/dataformat/avro/example/Value.java | 208 ++--
.../camel-aws/camel-aws-secrets-manager/pom.xml | 32 +-
.../camel/component/aws/xray/json/JsonParser.java | 2 -
components/camel-aws/camel-aws2-kms/pom.xml | 32 +-
components/camel-aws/camel-aws2-lambda/pom.xml | 32 +-
components/camel-aws/camel-aws2-sns/pom.xml | 32 +-
.../storage/blob/integration/BlobOperationsIT.java | 24 +-
.../{upload_test_file => upload_test_file.txt} | 0
.../camel-azure-storage-datalake/pom.xml | 4 +
components/camel-box/camel-box-api/pom.xml | 1 -
components/camel-box/camel-box-component/pom.xml | 43 +-
...CollaborationsManagerEndpointConfiguration.java | 1 -
.../BoxCommentsManagerEndpointConfiguration.java | 1 -
.../BoxEventLogsManagerEndpointConfiguration.java | 1 -
.../box/BoxEventsManagerEndpointConfiguration.java | 1 -
.../box/BoxFilesManagerEndpointConfiguration.java | 1 -
.../BoxFoldersManagerEndpointConfiguration.java | 1 -
.../box/BoxGroupsManagerEndpointConfiguration.java | 1 -
.../box/BoxSearchManagerEndpointConfiguration.java | 1 -
.../box/BoxTasksManagerEndpointConfiguration.java | 1 -
.../box/BoxUsersManagerEndpointConfiguration.java | 1 -
.../component/box/internal/BoxApiCollection.java | 1 -
.../camel/component/box/internal/BoxApiName.java | 1 -
.../BoxCollaborationsManagerApiMethod.java | 1 -
.../box/internal/BoxCommentsManagerApiMethod.java | 1 -
.../box/internal/BoxEventLogsManagerApiMethod.java | 1 -
.../box/internal/BoxEventsManagerApiMethod.java | 1 -
.../box/internal/BoxFilesManagerApiMethod.java | 1 -
.../box/internal/BoxFoldersManagerApiMethod.java | 1 -
.../box/internal/BoxGroupsManagerApiMethod.java | 1 -
.../box/internal/BoxSearchManagerApiMethod.java | 1 -
.../box/internal/BoxTasksManagerApiMethod.java | 1 -
.../box/internal/BoxUsersManagerApiMethod.java | 1 -
components/camel-box/pom.xml | 9 -
.../AddOnGatewayEndpointConfiguration.java | 1 -
.../AddressGatewayEndpointConfiguration.java | 1 -
.../ClientTokenGatewayEndpointConfiguration.java | 1 -
...rdVerificationGatewayEndpointConfiguration.java | 1 -
.../CustomerGatewayEndpointConfiguration.java | 1 -
.../DiscountGatewayEndpointConfiguration.java | 1 -
.../DisputeGatewayEndpointConfiguration.java | 1 -
...DocumentUploadGatewayEndpointConfiguration.java | 1 -
...erchantAccountGatewayEndpointConfiguration.java | 1 -
.../PaymentMethodGatewayEndpointConfiguration.java | 1 -
...entMethodNonceGatewayEndpointConfiguration.java | 1 -
.../PlanGatewayEndpointConfiguration.java | 1 -
.../ReportGatewayEndpointConfiguration.java | 1 -
...ntBatchSummaryGatewayEndpointConfiguration.java | 1 -
.../SubscriptionGatewayEndpointConfiguration.java | 1 -
.../TransactionGatewayEndpointConfiguration.java | 1 -
...okNotificationGatewayEndpointConfiguration.java | 1 -
.../braintree/internal/AddOnGatewayApiMethod.java | 1 -
.../internal/AddressGatewayApiMethod.java | 1 -
.../braintree/internal/BraintreeApiCollection.java | 1 -
.../braintree/internal/BraintreeApiName.java | 1 -
.../internal/ClientTokenGatewayApiMethod.java | 1 -
.../CreditCardVerificationGatewayApiMethod.java | 1 -
.../internal/CustomerGatewayApiMethod.java | 1 -
.../internal/DiscountGatewayApiMethod.java | 1 -
.../internal/DisputeGatewayApiMethod.java | 1 -
.../internal/DocumentUploadGatewayApiMethod.java | 1 -
.../internal/MerchantAccountGatewayApiMethod.java | 1 -
.../internal/PaymentMethodGatewayApiMethod.java | 1 -
.../PaymentMethodNonceGatewayApiMethod.java | 1 -
.../braintree/internal/PlanGatewayApiMethod.java | 1 -
.../braintree/internal/ReportGatewayApiMethod.java | 1 -
.../SettlementBatchSummaryGatewayApiMethod.java | 1 -
.../internal/SubscriptionGatewayApiMethod.java | 1 -
.../internal/TransactionGatewayApiMethod.java | 1 -
.../WebhookNotificationGatewayApiMethod.java | 1 -
.../cassandra/integration/BaseCassandra.java | 7 +-
.../src/test/resources/BasicDataSet.cql | 17 +
.../src/test/resources/IdempotentDataSet.cql | 17 +
.../src/test/resources/NamedIdempotentDataSet.cql | 17 +
.../src/test/resources/initScript.cql | 17 +
.../subfolderexample/subfile_example.file | 1 -
components/camel-couchbase/pom.xml | 80 +-
.../camel/language/csimple/joor/Constants.java | 2 -
components/camel-cxf/camel-cxf-common/pom.xml | 28 +-
components/camel-cxf/camel-cxf-rest/pom.xml | 39 +-
.../camel/component/cxf/jaxrs/testbean/jaxb.index | 6 +-
components/camel-cxf/camel-cxf-soap/pom.xml | 31 +-
.../src/test/resources/HelloWorld.wsdl | 2 +-
.../src/test/resources/MultiPartTest.wsdl | 18 +
.../camel-cxf-soap/src/test/resources/bare.wsdl | 2 +-
.../camel-cxf-soap/src/test/resources/order.wsdl | 4 +-
.../src/test/resources/person-non-wrapper.wsdl | 2 +-
.../camel-cxf-soap/src/test/resources/person.wsdl | 8 +-
.../src/test/resources/pizza_service.wsdl | 32 +-
.../src/test/resources/soap_header.wsdl | 32 +-
.../camel-cxf/camel-cxf-spring-common/pom.xml | 41 +-
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 29 +-
.../src/main/resources/META-INF/spring.handlers | 36 +-
.../src/main/resources/META-INF/spring.schemas | 36 +-
.../camel/component/cxf/jaxrs/testbean/jaxb.index | 6 +-
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 31 +-
components/camel-cxf/camel-cxf-spring-soap/rm.sh | 17 +
.../src/main/resources/META-INF/spring.handlers | 36 +-
.../src/main/resources/META-INF/spring.schemas | 36 +-
.../src/test/resources/GetToken.wsdl | 2 +-
.../src/test/resources/HelloWorld.wsdl | 2 +-
.../src/test/resources/MultiPartTest.wsdl | 18 +
.../src/test/resources/bare.wsdl | 2 +-
.../src/test/resources/hello/HelloWorld-DOC.wsdl | 2 +-
.../src/test/resources/hello_world_wssec.wsdl | 32 +-
.../src/test/resources/mtom.wsdl | 32 +-
.../src/test/resources/order.wsdl | 4 +-
.../src/test/resources/person-non-wrapper.wsdl | 2 +-
.../src/test/resources/person.wsdl | 8 +-
.../src/test/resources/pizza_service.wsdl | 32 +-
.../src/test/resources/soap_header.wsdl | 32 +-
.../camel-cxf/camel-cxf-spring-transport/pom.xml | 2 -
.../src/main/resources/META-INF/spring.handlers | 36 +-
.../src/main/resources/META-INF/spring.schemas | 36 +-
.../src/test/resources/person.wsdl | 8 +-
components/camel-cxf/camel-cxf-transport/pom.xml | 2 -
.../src/test/resources/person.wsdl | 8 +-
components/camel-datasonnet/pom.xml | 37 +-
.../configuration/ConfigurationValidation.java | 2 -
.../dhis2/Dhis2DeleteEndpointConfiguration.java | 1 -
.../dhis2/Dhis2GetEndpointConfiguration.java | 1 -
.../dhis2/Dhis2PostEndpointConfiguration.java | 1 -
.../dhis2/Dhis2PutEndpointConfiguration.java | 1 -
.../Dhis2ResourceTablesEndpointConfiguration.java | 1 -
.../dhis2/internal/Dhis2ApiCollection.java | 1 -
.../component/dhis2/internal/Dhis2ApiName.java | 1 -
.../dhis2/internal/Dhis2DeleteApiMethod.java | 1 -
.../dhis2/internal/Dhis2GetApiMethod.java | 1 -
.../dhis2/internal/Dhis2PostApiMethod.java | 1 -
.../dhis2/internal/Dhis2PutApiMethod.java | 1 -
.../internal/Dhis2ResourceTablesApiMethod.java | 1 -
components/camel-djl/pom.xml | 3 +-
components/camel-elasticsearch/pom.xml | 40 +-
components/camel-etcd3/pom.xml | 35 +-
components/camel-facebook/pom.xml | 40 +-
components/camel-fhir/camel-fhir-api/pom.xml | 1 -
.../FhirCapabilitiesEndpointConfiguration.java | 1 -
.../fhir/FhirCreateEndpointConfiguration.java | 1 -
.../fhir/FhirDeleteEndpointConfiguration.java | 1 -
.../fhir/FhirHistoryEndpointConfiguration.java | 1 -
.../fhir/FhirLoadPageEndpointConfiguration.java | 1 -
.../fhir/FhirMetaEndpointConfiguration.java | 1 -
.../fhir/FhirOperationEndpointConfiguration.java | 1 -
.../fhir/FhirPatchEndpointConfiguration.java | 1 -
.../fhir/FhirReadEndpointConfiguration.java | 1 -
.../fhir/FhirSearchEndpointConfiguration.java | 1 -
.../fhir/FhirTransactionEndpointConfiguration.java | 1 -
.../fhir/FhirUpdateEndpointConfiguration.java | 1 -
.../fhir/FhirValidateEndpointConfiguration.java | 1 -
.../component/fhir/internal/FhirApiCollection.java | 1 -
.../camel/component/fhir/internal/FhirApiName.java | 1 -
.../fhir/internal/FhirCapabilitiesApiMethod.java | 1 -
.../fhir/internal/FhirCreateApiMethod.java | 1 -
.../fhir/internal/FhirDeleteApiMethod.java | 1 -
.../fhir/internal/FhirHistoryApiMethod.java | 1 -
.../fhir/internal/FhirLoadPageApiMethod.java | 1 -
.../component/fhir/internal/FhirMetaApiMethod.java | 1 -
.../fhir/internal/FhirOperationApiMethod.java | 1 -
.../fhir/internal/FhirPatchApiMethod.java | 1 -
.../component/fhir/internal/FhirReadApiMethod.java | 1 -
.../fhir/internal/FhirSearchApiMethod.java | 1 -
.../fhir/internal/FhirTransactionApiMethod.java | 1 -
.../fhir/internal/FhirUpdateApiMethod.java | 1 -
.../fhir/internal/FhirValidateApiMethod.java | 1 -
components/camel-flink/pom.xml | 8 +-
components/camel-ftp/pom.xml | 98 +-
.../calendar/CalendarAclEndpointConfiguration.java | 1 -
.../CalendarCalendarListEndpointConfiguration.java | 1 -
.../CalendarCalendarsEndpointConfiguration.java | 1 -
.../CalendarChannelsEndpointConfiguration.java | 1 -
.../CalendarColorsEndpointConfiguration.java | 1 -
.../CalendarEventsEndpointConfiguration.java | 1 -
.../CalendarFreebusyEndpointConfiguration.java | 1 -
.../CalendarSettingsEndpointConfiguration.java | 1 -
.../calendar/internal/CalendarAclApiMethod.java | 1 -
.../internal/CalendarCalendarListApiMethod.java | 1 -
.../internal/CalendarCalendarsApiMethod.java | 1 -
.../internal/CalendarChannelsApiMethod.java | 1 -
.../calendar/internal/CalendarColorsApiMethod.java | 1 -
.../calendar/internal/CalendarEventsApiMethod.java | 1 -
.../internal/CalendarFreebusyApiMethod.java | 1 -
.../internal/CalendarSettingsApiMethod.java | 1 -
.../internal/GoogleCalendarApiCollection.java | 1 -
.../calendar/internal/GoogleCalendarApiName.java | 1 -
.../drive/DriveAboutEndpointConfiguration.java | 1 -
.../drive/DriveAppsEndpointConfiguration.java | 1 -
.../drive/DriveChangesEndpointConfiguration.java | 1 -
.../drive/DriveChannelsEndpointConfiguration.java | 1 -
.../drive/DriveChildrenEndpointConfiguration.java | 1 -
.../drive/DriveCommentsEndpointConfiguration.java | 1 -
.../drive/DriveDrivesEndpointConfiguration.java | 1 -
.../drive/DriveFilesEndpointConfiguration.java | 1 -
.../drive/DriveParentsEndpointConfiguration.java | 1 -
.../DrivePermissionsEndpointConfiguration.java | 1 -
.../DrivePropertiesEndpointConfiguration.java | 1 -
.../drive/DriveRepliesEndpointConfiguration.java | 1 -
.../drive/DriveRevisionsEndpointConfiguration.java | 1 -
.../DriveTeamdrivesEndpointConfiguration.java | 1 -
.../google/drive/internal/DriveAboutApiMethod.java | 1 -
.../google/drive/internal/DriveAppsApiMethod.java | 1 -
.../drive/internal/DriveChangesApiMethod.java | 1 -
.../drive/internal/DriveChannelsApiMethod.java | 1 -
.../drive/internal/DriveChildrenApiMethod.java | 1 -
.../drive/internal/DriveCommentsApiMethod.java | 1 -
.../drive/internal/DriveDrivesApiMethod.java | 1 -
.../google/drive/internal/DriveFilesApiMethod.java | 1 -
.../drive/internal/DriveParentsApiMethod.java | 1 -
.../drive/internal/DrivePermissionsApiMethod.java | 1 -
.../drive/internal/DrivePropertiesApiMethod.java | 1 -
.../drive/internal/DriveRepliesApiMethod.java | 1 -
.../drive/internal/DriveRevisionsApiMethod.java | 1 -
.../drive/internal/DriveTeamdrivesApiMethod.java | 1 -
.../drive/internal/GoogleDriveApiCollection.java | 1 -
.../google/drive/internal/GoogleDriveApiName.java | 1 -
.../camel-google/camel-google-functions/pom.xml | 38 +-
components/camel-google/camel-google-mail/pom.xml | 10 -
.../GmailUsersDraftsEndpointConfiguration.java | 1 -
.../mail/GmailUsersEndpointConfiguration.java | 1 -
.../GmailUsersHistoryEndpointConfiguration.java | 1 -
.../GmailUsersLabelsEndpointConfiguration.java | 1 -
...rsMessagesAttachmentsEndpointConfiguration.java | 1 -
.../GmailUsersMessagesEndpointConfiguration.java | 1 -
.../GmailUsersThreadsEndpointConfiguration.java | 1 -
.../google/mail/internal/GmailUsersApiMethod.java | 1 -
.../mail/internal/GmailUsersDraftsApiMethod.java | 1 -
.../mail/internal/GmailUsersHistoryApiMethod.java | 1 -
.../mail/internal/GmailUsersLabelsApiMethod.java | 1 -
.../mail/internal/GmailUsersMessagesApiMethod.java | 1 -
.../GmailUsersMessagesAttachmentsApiMethod.java | 1 -
.../mail/internal/GmailUsersThreadsApiMethod.java | 1 -
.../mail/internal/GoogleMailApiCollection.java | 1 -
.../google/mail/internal/GoogleMailApiName.java | 1 -
.../camel-google-secret-manager/pom.xml | 38 +-
.../SheetsSpreadsheetsEndpointConfiguration.java | 1 -
...etsSpreadsheetsValuesEndpointConfiguration.java | 1 -
.../sheets/internal/GoogleSheetsApiCollection.java | 1 -
.../sheets/internal/GoogleSheetsApiName.java | 1 -
.../internal/SheetsSpreadsheetsApiMethod.java | 1 -
.../SheetsSpreadsheetsValuesApiMethod.java | 1 -
.../camel-google/camel-google-storage/pom.xml | 38 +-
.../component/grok/GrokFileUnmarshalTest.java | 2 +-
.../grok/data/{access_log => access_log.txt} | 0
components/camel-grpc/pom.xml | 7 -
.../camel-grpc/src/test/proto/pingpong.proto | 2 +-
components/camel-hazelcast/pom.xml | 49 +-
.../test/resources/{image_file => image_file.txt} | 0
.../test/resources/test_configuration.properties | 6 +-
.../test/resources/{video_file => video_file.txt} | 0
.../camel-hyperledger-aries/docker-compose.yml | 4 +-
components/camel-ignite/pom.xml | 6 +-
.../camel-infinispan-embedded/pom.xml | 40 +-
.../camel-infinispan/camel-infinispan/pom.xml | 21 +-
components/camel-irc/src/test/unrealircd/ircd.motd | 3 +-
components/camel-jasypt/pom.xml | 22 -
.../resources/org/apache/camel/example/jaxb.index | 6 +-
components/camel-jcr/pom.xml | 34 +-
components/camel-jgroups-raft/pom.xml | 36 +-
components/camel-jgroups/pom.xml | 36 +-
components/camel-jms/pom.xml | 79 +-
components/camel-jmx/pom.xml | 2 -
components/camel-jooq/pom.xml | 2 -
components/camel-jpa/pom.xml | 96 +-
.../camel/component/scp/ScpSimpleProduceTest.java | 6 +-
.../{camel-key.priv => camel-key.priv.pem} | 0
.../org/apache/camel/jsonpath/JsonStreamTest.java | 4 +-
.../json_stream/{fourChar => fourChar.txt} | 0
.../resources/json_stream/{oneChar => oneChar.txt} | 0
components/camel-kafka/pom.xml | 97 +-
.../ConfigMapMountPropertiesFunctionTest.java | 4 +-
.../ConfigMapPropertiesFunctionLocalModeTest.java | 4 +-
.../ConfigMapPropertiesFunctionRouteTest.java | 2 +-
.../ConfigMapPropertiesFunctionTest.java | 4 +-
.../SecretMountPropertiesFunctionTest.java | 4 +-
.../src/test/resources/myconfig/{bar => bar.txt} | 0
.../src/test/resources/myconfig/{foo => foo.txt} | 0
.../test/resources/mysecret/{mypass => mypass.txt} | 0
.../test/resources/mysecret/{myuser => myuser.txt} | 0
components/camel-kudu/pom.xml | 6 +-
.../apache/camel/component/ldap/LdapRouteTest.ldif | 38 +-
.../apache/camel/component/ldif/AddDuplicate.ldif | 38 +-
.../camel/component/ldif/AddDuplicateSetup.ldif | 38 +-
.../org/apache/camel/component/ldif/AddOne.ldif | 38 +-
.../org/apache/camel/component/ldif/DeleteOne.ldif | 38 +-
.../camel/component/ldif/DeleteOneSetup.ldif | 38 +-
.../org/apache/camel/component/ldif/ModDn.ldif | 38 +-
.../apache/camel/component/ldif/ModDnSetup.ldif | 38 +-
.../org/apache/camel/component/ldif/ModRdn.ldif | 38 +-
.../apache/camel/component/ldif/ModRdnSetup.ldif | 38 +-
.../org/apache/camel/component/ldif/Modify.ldif | 38 +-
.../apache/camel/component/ldif/ModifySetup.ldif | 38 +-
...DBAggregateRecoverWithRedeliveryPolicyTest.java | 28 +-
.../camel/component/lumberjack/LumberjackUtil.java | 2 +-
.../io/LumberjackChannelInitializerTest.java | 4 +-
.../lumberjack/io/{window10 => window10.bin} | Bin
.../lumberjack/io/{window15 => window15.bin} | Bin
components/camel-mail/pom.xml | 32 +-
.../mail/AdditionalMailPropertiesTest.java | 1 -
.../camel/component/mail/AuthenticatorTest.java | 2 -
.../camel/component/mail/FromFileSendMailTest.java | 1 -
.../mail/MailAttachmentDuplicateNamesTest.java | 1 -
.../component/mail/MailAttachmentNamesTest.java | 3 -
.../mail/MailAttachmentRedeliveryTest.java | 1 -
.../camel/component/mail/MailAttachmentTest.java | 1 -
.../mail/MailAttachmentsUmlautIssueTest.java | 1 -
.../component/mail/MailBatchConsumerTest.java | 1 -
.../component/mail/MailCollectionHeaderTest.java | 1 -
.../component/mail/MailCommitOnCompletionTest.java | 1 -
.../mail/MailComponentRecipientSetTest.java | 5 -
.../mail/MailConsumerAuthenticatorTest.java | 1 -
.../mail/MailConsumerIdleMessageTest.java | 1 -
.../mail/MailConsumerUnsupportedCharsetTest.java | 1 -
.../mail/MailContentTypeResolverTest.java | 1 -
.../camel/component/mail/MailContentTypeTest.java | 1 -
.../camel/component/mail/MailConvertersTest.java | 1 -
.../camel/component/mail/MailCopyToTest.java | 1 -
.../component/mail/MailCustomContentTypeTest.java | 1 -
.../component/mail/MailCustomMailSenderTest.java | 1 -
.../mail/MailDefaultDelayForMailConsumeTest.java | 1 -
.../camel/component/mail/MailDisconnectTest.java | 1 -
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 1 -
.../camel/component/mail/MailFetchSizeTest.java | 1 -
.../component/mail/MailFetchSizeZeroTest.java | 1 -
...aderOverrulePreConfigurationRecipientsTest.java | 2 -
.../component/mail/MailHtmlAttachmentTest.java | 1 -
.../MailIdempotentRepositoryDuplicateTest.java | 1 -
.../mail/MailIdempotentRepositoryTest.java | 1 -
.../component/mail/MailMaxMessagesPerPollTest.java | 1 -
.../component/mail/MailMimeDecodeHeadersTest.java | 2 -
.../camel/component/mail/MailMoveToTest.java | 2 -
.../component/mail/MailMultipleRecipientsTest.java | 4 -
.../MailMultipleRecipientsUsingHeadersTest.java | 2 -
.../mail/MailNameAndEmailInRecipientTest.java | 2 -
.../component/mail/MailPollEnrichNoMailTest.java | 1 -
.../camel/component/mail/MailPollEnrichTest.java | 1 -
.../component/mail/MailPostProcessActionTest.java | 1 -
.../mail/MailProcessOnlyUnseenMessagesTest.java | 1 -
.../component/mail/MailProducerConcurrentTest.java | 2 -
.../camel/component/mail/MailProducerTest.java | 3 -
.../mail/MailProducerUnsupportedCharsetTest.java | 1 -
.../mail/MailRecipientsPipeIssueTest.java | 3 -
.../camel/component/mail/MailRecipientsTest.java | 6 -
.../camel/component/mail/MailReplyToTest.java | 1 -
.../apache/camel/component/mail/MailRouteTest.java | 3 -
.../camel/component/mail/MailSearchTermTest.java | 1 -
.../mail/MailSearchTermUriConfigBeanTest.java | 1 -
.../MailSearchTermUriConfigLast24HoursTest.java | 1 -
.../mail/MailSearchTermUriConfigTest.java | 1 -
.../mail/MailShutdownCompleteAllTasksTest.java | 1 -
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 1 -
.../camel/component/mail/MailSortTermTest.java | 1 -
.../component/mail/MailSortTermThreeTest.java | 1 -
.../mail/MailSortTermThreeUriConfigTest.java | 1 -
.../camel/component/mail/MailSortTermTwoTest.java | 1 -
.../mail/MailSortTermTwoUriConfigTest.java | 1 -
.../component/mail/MailSortTermUriConfigTest.java | 1 -
.../component/mail/MailSplitAttachmentsTest.java | 1 -
.../camel/component/mail/MailSubjectTest.java | 1 -
.../mail/MailToMultipleEndpointsTest.java | 6 -
.../component/mail/MailUsernameWithAtSignTest.java | 1 -
.../component/mail/MailUsingCustomSessionTest.java | 1 -
.../camel/component/mail/MailUsingHeadersTest.java | 1 -
.../component/mail/MailUsingOwnComponentTest.java | 2 -
.../component/mail/MimeMessageConsumeTest.java | 2 -
.../mail/MimeMultipartAlternativeTest.java | 1 -
...imeMultipartAlternativeWithContentTypeTest.java | 1 -
...MultipartAlternativeWithLongerFilenameTest.java | 1 -
.../mail/MultipleDestinationConsumeTest.java | 2 -
.../mail/NestedMimeMessageConsumeTest.java | 4 +-
.../camel/component/mail/RawMailMessageTest.java | 7 +-
.../mail/SpringMailSplitAttachmentsTest.java | 1 -
.../src/test/resources/META-INF/javamail.providers | 16 +
...TestCaseHurz.elm => SignedMailTestCaseHurz.txt} | 0
.../{nested-multipart.elm => nested-multipart.txt} | 0
components/camel-mapstruct/pom.xml | 1 -
components/camel-master/pom.xml | 38 +-
components/camel-mina/pom.xml | 57 +-
components/camel-mllp/pom.xml | 39 +-
.../integration/MongoDbBigDecimalConverterIT.java | 2 -
.../mongodb/integration/MongoDbConversionsIT.java | 2 -
.../component/mustache/MustacheComponentTest.java | 2 +-
.../src/test/resources/another.mustache | 16 +
.../src/test/resources/child.mustache | 16 +
.../src/test/resources/included.mustache | 16 +
.../src/test/resources/includer.mustache | 16 +
.../src/test/resources/letter.mustache | 16 +
.../src/test/resources/parent.mustache | 16 +
.../src/test/resources/simple.mustache | 16 +
.../camel/language/mvel/MvelComponentTest.java | 4 +-
.../camel-mvel/src/test/resources/template.mvel | 16 +
.../camel-mvel/src/test/resources/template2.mvel | 16 +
components/camel-netty/pom.xml | 33 +-
components/camel-observation/pom.xml | 80 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 1 -
.../camel-olingo2/camel-olingo2-component/pom.xml | 12 -
.../olingo2/Olingo2AppEndpointConfiguration.java | 1 -
.../olingo2/internal/Olingo2ApiCollection.java | 1 -
.../component/olingo2/internal/Olingo2ApiName.java | 1 -
.../olingo2/internal/Olingo2AppApiMethod.java | 1 -
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 11 +-
components/camel-olingo4/camel-olingo4-api/pom.xml | 1 -
.../olingo4/Olingo4AppEndpointConfiguration.java | 1 -
.../olingo4/internal/Olingo4ApiCollection.java | 1 -
.../component/olingo4/internal/Olingo4ApiName.java | 1 -
.../olingo4/internal/Olingo4AppApiMethod.java | 1 -
components/camel-opentelemetry/pom.xml | 79 +-
.../camel/component/printer/PrinterPrintTest.java | 2 +-
.../test/resources/{asf-logo.JPG => asf-logo.jpg} | Bin
components/camel-protobuf/pom.xml | 7 -
.../src/test/proto/addressbook.proto | 16 +
components/camel-pulsar/pom.xml | 61 +-
.../src/main/docs/quickfix-component.adoc | 8 +-
.../component/quickfixj/QuickfixjEngineTest.java | 2 +-
.../quickfixj/examples/AuthenticationExample.java | 6 +-
.../quickfixj/examples/DynamicRoutingExample.java | 12 +-
.../quickfixj/examples/RequestReplyExample.java | 6 +-
.../quickfixj/examples/RestartRouteExample.java | 4 +-
.../quickfixj/examples/SimpleMessagingExample.java | 8 +-
.../examples/trading/TradeExecutorExample.java | 12 +-
.../examples/{gateway.cfg => gateway.qf.cfg} | 7 +-
.../examples/{inprocess.cfg => inprocess.qf.cfg} | 7 +-
.../src/test/resources/alt-openapi.yaml | 17 +
.../src/test/resources/alt-petstore.yaml | 17 +
.../src/test/resources/openapi-v3.yaml | 17 +
.../src/test/resources/openapi.yaml | 17 +
.../src/test/resources/petstore-3.1.yaml | 17 +
components/camel-robotframework/pom.xml | 94 +-
...obot_with_camel_exchange_value_as_numeric.robot | 3 +
...robot_with_camel_exchange_value_as_string.robot | 3 +
...send_no_camel_exchnage_only_camel_configs.robot | 4 +-
.../robotframework/set_variable_camel_body.robot | 2 +
.../set_variable_camel_exchange.robot | 2 +
.../robotframework/set_variable_camel_header.robot | 2 +
.../set_variable_camel_property.robot | 2 +
components/camel-rocketmq/pom.xml | 73 +-
components/camel-rxjava/pom.xml | 35 +-
.../src/main/resources/sobject-picklist.vm | 6 +-
.../src/main/resources/sobject-pojo-optional.vm | 6 +-
.../src/main/resources/sobject-pojo.vm | 6 +-
.../resources/sobject-query-records-optional.vm | 6 +-
.../src/main/resources/sobject-query-records.vm | 6 +-
.../camel-salesforce-component/README.md | 4 +-
.../component/salesforce/SalesforceEndpoint.java | 2 -
.../salesforce/api/dto/AbstractSObjectBase.java | 2 -
.../component/salesforce/api/dto/RecentItem.java | 2 -
.../component/salesforce/api/dto/RestError.java | 2 -
.../component/salesforce/api/dto/SearchResult.java | 2 -
.../api/dto/analytics/reports/Report.java | 2 -
.../component/salesforce/api/dto/bulk/Error.java | 2 -
.../salesforce/api/dto/bulk/ResultError.java | 2 -
.../salesforce/internal/dto/LoginError.java | 2 -
.../salesforce/internal/dto/PushTopic.java | 2 -
.../component/salesforce/LoginConfigHelper.java | 2 +-
.../api/dto/composite/SObjectCompositeTest.java | 2 -
.../salesforce/dto/generated/Account.java | 2 -
.../dto/generated/Account_IndustryEnum.java | 2 -
.../component/salesforce/dto/generated/Asset.java | 2 -
.../salesforce/dto/generated/Contact.java | 2 -
.../salesforce/dto/generated/Document.java | 2 -
.../salesforce/dto/generated/Line_Item__c.java | 2 -
.../salesforce/dto/generated/MSPTest.java | 2 -
.../salesforce/dto/generated/Merchandise__c.java | 2 -
.../dto/generated/QueryRecordsLine_Item__c.java | 2 -
.../salesforce/dto/generated/StringMSPTest.java | 2 -
.../component/salesforce/dto/generated/Task.java | 2 -
.../camel-salesforce-maven-plugin/pom.xml | 1 -
.../src/it/customized-types/pom.xml | 2 +-
.../src/it/simple-it/pom.xml | 2 +-
.../src/main/resources/sobject-picklist.vm | 6 +-
.../src/main/resources/sobject-pojo-optional.vm | 6 +-
.../src/main/resources/sobject-pojo.vm | 6 +-
.../resources/sobject-query-records-optional.vm | 6 +-
.../src/main/resources/sobject-query-records.vm | 6 +-
...ple => test-salesforce-login.sample.properties} | 3 +-
.../src/test/resources/flight-info.vm | 32 +-
.../test/resources/custom-resolver/title-rules.sch | 26 +-
.../src/test/resources/sch/schematron-1.sch | 30 +-
.../src/test/resources/sch/schematron-2.sch | 30 +-
.../src/test/resources/sch/schematron-3.sch | 26 +-
components/camel-service/pom.xml | 38 +-
.../camel-servicenow-maven-plugin/pom.xml | 12 +-
.../src/test/resources/securityconfig.ini | 26 +-
components/camel-sjms/pom.xml | 26 +-
components/camel-sjms2/pom.xml | 26 +-
.../src/test/resources/data-dos.yaml | 17 +
.../camel-snakeyaml/src/test/resources/data.yaml | 17 +
components/camel-soap/pom.xml | 12 +-
.../camel/dataformat/soap/CustomerService.wsdl | 2 +-
.../camel/dataformat/soap/CustomerService2.wsdl | 2 +-
.../dataformat/soap/MultiPartCustomerService.wsdl | 2 +-
.../apache/camel/dataformat/soap/TestService.wsdl | 18 +
.../src/main/resources/META-INF/spring.handlers | 36 +-
.../src/main/resources/META-INF/spring.schemas | 32 +-
.../camel/component/spring/ws/jaxb/jaxb.index | 6 +-
.../component/spring/ws/soap-header-transform.xslt | 18 +
components/camel-spring-xml/pom.xml | 79 +-
.../xml/handler/ErrorHandlerDefinitionParser.java | 2 -
.../src/main/resources/META-INF/spring.handlers | 32 +-
.../src/main/resources/META-INF/spring.schemas | 32 +-
.../component/sql/stored/template/grammar/sspt.jj | 4 +-
.../sql/idempotentWithOrphanLockRemoval.sql | 17 +
.../camel/component/stax/StaxStreamXMLReader.java | 884 ++++++++--------
.../apache/camel/component/stax/model/jaxb.index | 6 +-
.../src/test/resources/jsse/createCertificate.sh | 17 +
.../apache/camel/test/junit5/CamelTestSupport.java | 2 -
.../twilio/AccountEndpointConfiguration.java | 1 -
...sDependentPhoneNumberEndpointConfiguration.java | 1 -
.../twilio/AddressEndpointConfiguration.java | 1 -
.../twilio/ApplicationEndpointConfiguration.java | 1 -
...blePhoneNumberCountryEndpointConfiguration.java | 1 -
...oneNumberCountryLocalEndpointConfiguration.java | 1 -
...neNumberCountryMobileEndpointConfiguration.java | 1 -
...NumberCountryTollFreeEndpointConfiguration.java | 1 -
.../twilio/CallEndpointConfiguration.java | 1 -
.../twilio/CallFeedbackEndpointConfiguration.java | 1 -
.../CallFeedbackSummaryEndpointConfiguration.java | 1 -
.../CallNotificationEndpointConfiguration.java | 1 -
.../twilio/CallRecordingEndpointConfiguration.java | 1 -
.../twilio/ConferenceEndpointConfiguration.java | 1 -
...ConferenceParticipantEndpointConfiguration.java | 1 -
.../twilio/ConnectAppEndpointConfiguration.java | 1 -
.../IncomingPhoneNumberEndpointConfiguration.java | 1 -
...omingPhoneNumberLocalEndpointConfiguration.java | 1 -
...mingPhoneNumberMobileEndpointConfiguration.java | 1 -
...ngPhoneNumberTollFreeEndpointConfiguration.java | 1 -
.../component/twilio/KeyEndpointConfiguration.java | 1 -
.../twilio/MessageEndpointConfiguration.java | 1 -
.../MessageFeedbackEndpointConfiguration.java | 1 -
.../twilio/MessageMediaEndpointConfiguration.java | 1 -
.../twilio/NewKeyEndpointConfiguration.java | 1 -
.../twilio/NewSigningKeyEndpointConfiguration.java | 1 -
.../twilio/NotificationEndpointConfiguration.java | 1 -
.../OutgoingCallerIdEndpointConfiguration.java | 1 -
.../twilio/QueueEndpointConfiguration.java | 1 -
.../twilio/QueueMemberEndpointConfiguration.java | 1 -
.../RecordingAddOnResultEndpointConfiguration.java | 1 -
...ingAddOnResultPayloadEndpointConfiguration.java | 1 -
.../twilio/RecordingEndpointConfiguration.java | 1 -
...ecordingTranscriptionEndpointConfiguration.java | 1 -
.../twilio/ShortCodeEndpointConfiguration.java | 1 -
.../twilio/SigningKeyEndpointConfiguration.java | 1 -
.../twilio/SipCredentialEndpointConfiguration.java | 1 -
.../SipCredentialListEndpointConfiguration.java | 1 -
...CredentialListMappingEndpointConfiguration.java | 1 -
.../twilio/SipDomainEndpointConfiguration.java | 1 -
...essControlListMappingEndpointConfiguration.java | 1 -
...ipIpAccessControlListEndpointConfiguration.java | 1 -
...sControlListIpAddressEndpointConfiguration.java | 1 -
.../twilio/TokenEndpointConfiguration.java | 1 -
.../twilio/TranscriptionEndpointConfiguration.java | 1 -
.../UsageRecordAllTimeEndpointConfiguration.java | 1 -
.../UsageRecordDailyEndpointConfiguration.java | 1 -
.../twilio/UsageRecordEndpointConfiguration.java | 1 -
.../UsageRecordLastMonthEndpointConfiguration.java | 1 -
.../UsageRecordMonthlyEndpointConfiguration.java | 1 -
.../UsageRecordThisMonthEndpointConfiguration.java | 1 -
.../UsageRecordTodayEndpointConfiguration.java | 1 -
.../UsageRecordYearlyEndpointConfiguration.java | 1 -
.../UsageRecordYesterdayEndpointConfiguration.java | 1 -
.../twilio/UsageTriggerEndpointConfiguration.java | 1 -
.../ValidationRequestEndpointConfiguration.java | 1 -
.../twilio/internal/AccountApiMethod.java | 1 -
.../twilio/internal/AddressApiMethod.java | 1 -
.../AddressDependentPhoneNumberApiMethod.java | 1 -
.../twilio/internal/ApplicationApiMethod.java | 1 -
.../AvailablePhoneNumberCountryApiMethod.java | 1 -
.../AvailablePhoneNumberCountryLocalApiMethod.java | 1 -
...AvailablePhoneNumberCountryMobileApiMethod.java | 1 -
...ailablePhoneNumberCountryTollFreeApiMethod.java | 1 -
.../component/twilio/internal/CallApiMethod.java | 1 -
.../twilio/internal/CallFeedbackApiMethod.java | 1 -
.../internal/CallFeedbackSummaryApiMethod.java | 1 -
.../twilio/internal/CallNotificationApiMethod.java | 1 -
.../twilio/internal/CallRecordingApiMethod.java | 1 -
.../twilio/internal/ConferenceApiMethod.java | 1 -
.../internal/ConferenceParticipantApiMethod.java | 1 -
.../twilio/internal/ConnectAppApiMethod.java | 1 -
.../internal/IncomingPhoneNumberApiMethod.java | 1 -
.../IncomingPhoneNumberLocalApiMethod.java | 1 -
.../IncomingPhoneNumberMobileApiMethod.java | 1 -
.../IncomingPhoneNumberTollFreeApiMethod.java | 1 -
.../component/twilio/internal/KeyApiMethod.java | 1 -
.../twilio/internal/MessageApiMethod.java | 1 -
.../twilio/internal/MessageFeedbackApiMethod.java | 1 -
.../twilio/internal/MessageMediaApiMethod.java | 1 -
.../component/twilio/internal/NewKeyApiMethod.java | 1 -
.../twilio/internal/NewSigningKeyApiMethod.java | 1 -
.../twilio/internal/NotificationApiMethod.java | 1 -
.../twilio/internal/OutgoingCallerIdApiMethod.java | 1 -
.../component/twilio/internal/QueueApiMethod.java | 1 -
.../twilio/internal/QueueMemberApiMethod.java | 1 -
.../internal/RecordingAddOnResultApiMethod.java | 1 -
.../RecordingAddOnResultPayloadApiMethod.java | 1 -
.../twilio/internal/RecordingApiMethod.java | 1 -
.../internal/RecordingTranscriptionApiMethod.java | 1 -
.../twilio/internal/ShortCodeApiMethod.java | 1 -
.../twilio/internal/SigningKeyApiMethod.java | 1 -
.../twilio/internal/SipCredentialApiMethod.java | 1 -
.../internal/SipCredentialListApiMethod.java | 1 -
.../twilio/internal/SipDomainApiMethod.java | 1 -
.../SipDomainCredentialListMappingApiMethod.java | 1 -
...pDomainIpAccessControlListMappingApiMethod.java | 1 -
.../internal/SipIpAccessControlListApiMethod.java | 1 -
.../SipIpAccessControlListIpAddressApiMethod.java | 1 -
.../component/twilio/internal/TokenApiMethod.java | 1 -
.../twilio/internal/TranscriptionApiMethod.java | 1 -
.../twilio/internal/TwilioApiCollection.java | 1 -
.../component/twilio/internal/TwilioApiName.java | 1 -
.../internal/UsageRecordAllTimeApiMethod.java | 1 -
.../twilio/internal/UsageRecordApiMethod.java | 1 -
.../twilio/internal/UsageRecordDailyApiMethod.java | 1 -
.../internal/UsageRecordLastMonthApiMethod.java | 1 -
.../internal/UsageRecordMonthlyApiMethod.java | 1 -
.../internal/UsageRecordThisMonthApiMethod.java | 1 -
.../twilio/internal/UsageRecordTodayApiMethod.java | 1 -
.../internal/UsageRecordYearlyApiMethod.java | 1 -
.../internal/UsageRecordYesterdayApiMethod.java | 1 -
.../twilio/internal/UsageTriggerApiMethod.java | 1 -
.../internal/ValidationRequestApiMethod.java | 1 -
components/camel-undertow/pom.xml | 33 +-
.../camel/component/velocity/AppleTemplate.vm | 6 +-
.../camel/component/velocity/BodyAsDomainObject.vm | 6 +-
.../apache/camel/component/velocity/Concurrent.vm | 6 +-
.../camel/component/velocity/OrangeTemplate.vm | 6 +-
.../org/apache/camel/component/velocity/escape.vm | 6 +-
.../org/apache/camel/component/velocity/example.vm | 6 +-
.../org/apache/camel/component/velocity/header.vm | 6 +-
.../org/apache/camel/component/velocity/letter.vm | 6 +-
.../org/apache/camel/component/velocity/letter2.vm | 6 +-
.../camel/component/velocity/letterWithParser.vm | 6 +-
.../component/velocity/letterWithoutHeader.vm | 6 +-
.../component/velocity/someValuesNotInExchange.vm | 6 +-
.../apache/camel/component/weka/WekaProducer.java | 1 -
.../org/apache/camel/component/xj/identity.xsl | 32 +-
.../camel-xj/src/test/resources/hellojson2xml.xsl | 32 +-
.../camel-xj/src/test/resources/helloxml2json.xsl | 32 +-
.../src/main/docs/xmlSecurity-dataformat.adoc | 6 +-
.../xmlsecurity/EncryptionAlgorithmTest.java | 12 +-
.../xmlsecurity/XMLEncryption11Test.java | 18 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 36 +-
.../SpringXmlSecurityDataFormatTest-context.xml | 4 +-
...curityDataFormatWithKeyPasswordTest-context.xml | 4 +-
...ey-pass.ks => recipient-with-key-pass.keystore} | Bin
.../resources/{recipient.ks => recipient.keystore} | Bin
.../resources/{sender.ts => sender.truststore} | Bin
components/camel-xmpp/pom.xml | 42 +-
.../apache/camel/component/xmpp/XmppTestUtil.java | 2 +-
.../{bogus_mina_tls.cert => bogus_mina_tls.cer} | Bin
.../component/xslt/extensions/extensions.xslt | 4 +-
.../src/test/resources/data/test1_definition.bpmn | 18 +
components/camel-zendesk/pom.xml | 1 -
.../zendesk/ZendeskEndpointConfiguration.java | 1 -
.../zendesk/internal/ZendeskApiCollection.java | 1 -
.../zendesk/internal/ZendeskApiMethod.java | 1 -
.../component/zendesk/internal/ZendeskApiName.java | 1 -
components/camel-zookeeper-master/pom.xml | 46 +-
components/camel-zookeeper/pom.xml | 47 +-
components/fix-eip-xrefs.sh | 17 +
components/pom.xml | 71 +-
.../java/org/apache/camel/ExchangePropertyKey.java | 2 -
.../camel/catalog/impl/AbstractCamelCatalog.java | 83 +-
.../org/apache/camel/catalog/impl/URISupport.java | 2 -
.../language/simple/SimplePredicateParser.java | 7 +-
.../language/simple/types/BinaryOperatorType.java | 38 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 9 +-
.../reifier/dataformat/DataFormatReifier.java | 2 -
.../core/xml/AbstractCamelContextFactoryBean.java | 29 +-
core/camel-core/pom.xml | 51 +-
.../apache/camel/language/simple/Constants.java | 2 -
...mpModelAsYamlSplitNestedChoiceEndRouteTest.java | 5 +-
.../util/DumpModelAsYamlTransformRouteTest.java | 5 +-
.../util/DumpModelAsYamlUriAsParametersTest.java | 5 +-
.../org/apache/camel/util/ObjectHelperTest.java | 18 +-
.../org/apache/camel/util/split-choice.yaml | 17 +
.../resources/org/apache/camel/util/transform.yaml | 17 +
.../org/apache/camel/util/uri-as-parameters.yaml | 17 +
core/camel-main/src/main/docs/main.adoc | 9 +
.../support/AsyncProcessorConverterHelper.java | 5 +-
.../camel/support/builder/ExpressionBuilder.java | 289 +++---
.../camel/support/builder/PredicateBuilder.java | 55 +-
core/camel-util/pom.xml | 37 +-
.../main/java/org/apache/camel/util/IOHelper.java | 28 +
.../java/org/apache/camel/util/ObjectHelper.java | 2 -
.../apache/camel/xml/io/util/XmlStreamReader.java | 330 +++---
.../xml/io/util/XmlStreamReaderException.java | 64 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 4 -
.../java/org/apache/camel/xml/out/ModelWriter.java | 4 -
.../java/org/apache/camel/xml/io/MXParser.java | 372 ++++---
.../org/apache/camel/xml/io/XmlPullParser.java | 801 ++++++--------
.../camel/xml/io/XmlPullParserException.java | 8 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 4 -
.../org/apache/camel/yaml/out/ModelWriterTest.java | 25 +-
.../yaml/out/ModelWriterUriAsParametersTest.java | 25 +-
core/camel-yaml-io/src/test/resources/route0.yaml | 17 +
core/camel-yaml-io/src/test/resources/route0b.yaml | 17 +
core/camel-yaml-io/src/test/resources/route1.yaml | 17 +
core/camel-yaml-io/src/test/resources/route2.yaml | 17 +
core/camel-yaml-io/src/test/resources/route3.yaml | 17 +
core/camel-yaml-io/src/test/resources/route4.yaml | 17 +
core/camel-yaml-io/src/test/resources/route5.yaml | 17 +
core/camel-yaml-io/src/test/resources/route6.yaml | 17 +
core/camel-yaml-io/src/test/resources/route7.yaml | 17 +
core/camel-yaml-io/src/test/resources/route8.yaml | 17 +
core/camel-yaml-io/src/test/resources/route8b.yaml | 17 +
core/camel-yaml-io/src/test/resources/route9.yaml | 17 +
core/pom.xml | 1 -
docs/pom.xml | 149 +--
dsl/camel-componentdsl/pom.xml | 47 +-
dsl/camel-endpointdsl/pom.xml | 46 +-
.../builder/endpoint/EndpointBuilderFactory.java | 4 +-
.../camel/builder/endpoint/EndpointBuilders.java | 4 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../test/resources/routes/MyRoutesWithPackage.java | 16 +
.../routes/MyRoutesWithPackageAndLineComment.java | 16 +
dsl/camel-jbang/camel-jbang-container/Dockerfile | 22 +-
.../dsl/jbang/core/commands/CamelCommand.java | 2 -
.../apache/camel/dsl/jbang/core/commands/Run.java | 20 +-
.../main/resources/quarkus-docker/Dockerfile.jvm | 17 +
.../resources/quarkus-docker/Dockerfile.legacy-jar | 17 +
.../resources/quarkus-docker/Dockerfile.native | 17 +
.../quarkus-docker/Dockerfile.native-micro | 17 +
dsl/camel-jbang/camel-jbang-main/pom.xml | 9 -
.../camel-js-dsl/src/test/resources/module.js | 1 +
dsl/camel-js-dsl/src/test/resources/module.mjs | 1 -
.../routes/routes-with-component-configuration.js | 16 +
.../test/resources/routes/routes-with-modules.js | 18 +-
.../resources/routes/routes-with-processors.js | 16 +
.../routes/routes-with-rest-configuration.js | 16 +
.../test/resources/routes/routes-with-rest-dsl.js | 16 +
.../src/test/resources/my-camel-k.yaml | 4 +-
.../src/test/resources/my-modeline.yaml | 4 +-
.../src/test/resources/my-route.yaml | 4 +-
dsl/camel-kotlin-dsl/pom.xml | 30 +-
.../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt | 2 +-
.../org/apache/camel/dsl/kotlin/support/MyBean.kt | 2 +-
.../camel-yaml-dsl-maven-plugin/pom.xml | 7 -
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 575 +++++-----
.../maven/dsl/yaml/GenerateYamlSchemaMojo.java | 14 +-
.../maven/dsl/yaml/GenerateYamlSupportMojo.java | 64 +-
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 1 -
.../apache/camel/dsl/yaml/LineNumberTest.groovy | 32 +-
.../org/apache/camel/dsl/yaml/MainTest.groovy | 2 +-
.../resources/kamelets/error-handler.kamelet.yaml | 4 +-
.../test/resources/kamelets/log-sink.kamelet.yaml | 5 +-
.../test/resources/kamelets/mySetBody.kamelet.yaml | 1 +
.../resources/kamelets/prefix-action.kamelet.yaml | 4 +-
.../kamelets/route-timer-source.kamelet.yaml | 4 +-
.../resources/kamelets/timer-source.kamelet.yaml | 4 +-
.../routes/rest-allowable-values-dsl.yaml | 17 +
.../src/test/resources/routes/rest-dsl.yaml | 17 +
.../src/test/resources/routes/routes.yaml | 1 +
.../src/test/resources/stuff/my-route-comment.yaml | 1 +
.../src/test/resources/stuff/my-route.yaml | 1 +
dsl/pom.xml | 1 -
etc/eclipse/Camel.importorder | 27 -
etc/eclipse/CamelCodeFormatter.xml | 264 -----
etc/eclipse/org.eclipse.jdt.core.prefs | 261 -----
etc/svn-auto-props | 83 --
parent/pom.xml | 298 ++----
pom.xml | 411 ++++++--
test-infra/camel-test-infra-arangodb/pom.xml | 10 -
test-infra/camel-test-infra-artemis/pom.xml | 9 -
.../camel/test/infra/artemis/services/Dockerfile | 23 +-
test-infra/camel-test-infra-aws-common/pom.xml | 9 -
test-infra/camel-test-infra-aws-v2/pom.xml | 10 -
test-infra/camel-test-infra-azure-common/pom.xml | 10 -
.../camel-test-infra-azure-storage-blob/pom.xml | 9 -
.../pom.xml | 13 +-
.../camel-test-infra-azure-storage-queue/pom.xml | 9 -
test-infra/camel-test-infra-cassandra/pom.xml | 8 -
test-infra/camel-test-infra-chatscript/pom.xml | 10 -
test-infra/camel-test-infra-common/pom.xml | 9 -
test-infra/camel-test-infra-consul/pom.xml | 9 -
test-infra/camel-test-infra-core/pom.xml | 32 +-
test-infra/camel-test-infra-couchbase/pom.xml | 9 -
test-infra/camel-test-infra-couchdb/pom.xml | 9 -
.../camel-test-infra-dispatch-router/pom.xml | 9 -
.../test/infra/dispatch/router/services/Dockerfile | 23 +-
test-infra/camel-test-infra-elasticsearch/pom.xml | 9 -
test-infra/camel-test-infra-etcd3/pom.xml | 9 -
test-infra/camel-test-infra-fhir/pom.xml | 9 -
test-infra/camel-test-infra-ftp/pom.xml | 9 -
test-infra/camel-test-infra-google-pubsub/pom.xml | 9 -
.../camel-test-infra-hashicorp-vault/pom.xml | 9 -
test-infra/camel-test-infra-hdfs/pom.xml | 9 -
test-infra/camel-test-infra-ignite/pom.xml | 9 -
test-infra/camel-test-infra-infinispan/pom.xml | 9 -
test-infra/camel-test-infra-jdbc/pom.xml | 9 -
test-infra/camel-test-infra-jetty/pom.xml | 9 -
test-infra/camel-test-infra-kafka/pom.xml | 9 -
.../camel-test-infra-messaging-common/pom.xml | 9 -
.../camel-test-infra-microprofile-lra/pom.xml | 9 -
test-infra/camel-test-infra-minio/pom.xml | 9 -
test-infra/camel-test-infra-mongodb/pom.xml | 9 -
test-infra/camel-test-infra-mosquitto/pom.xml | 9 -
test-infra/camel-test-infra-nats/pom.xml | 9 -
test-infra/camel-test-infra-openldap/pom.xml | 59 +-
test-infra/camel-test-infra-postgres/pom.xml | 9 -
test-infra/camel-test-infra-pulsar/pom.xml | 9 -
test-infra/camel-test-infra-rabbitmq/pom.xml | 9 -
test-infra/camel-test-infra-redis/pom.xml | 9 -
test-infra/camel-test-infra-xmpp/pom.xml | 9 -
test-infra/camel-test-infra-zookeeper/pom.xml | 9 -
tests/camel-itest/pom.xml | 40 +-
.../org/apache/camel/itest/jetty/header.vm | 6 +-
.../org/apache/camel/itest/jms/jaxb.index | 6 +-
.../apache/camel/itest/restlet/example/jaxb.index | 6 +-
.../src/test/resources/securityconfig.ini | 26 +-
.../test/resources/wsdl/CustomerService-1.0.0.wsdl | 4 +-
.../wsdl/CustomerService_noSoapAction.wsdl | 4 +-
.../src/test/resources/wsdl/hello_world.wsdl | 32 +-
tests/test-bundles/mock-javamail_1.7/pom.xml | 116 ---
.../jvnet/mock_javamail/provider/IMAPProvider.java | 31 -
.../jvnet/mock_javamail/provider/POP3Provider.java | 31 -
.../jvnet/mock_javamail/provider/SMTPProvider.java | 30 -
.../src/main/resources/META-INF/LICENSE.txt | 203 ----
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../resources/META-INF/javamail.default.providers | 22 -
.../src/main/resources/META-INF/services/imap | 18 -
.../services/org.jvnet.mock_javamail.MockStore | 18 -
.../services/org.jvnet.mock_javamail.MockTransport | 18 -
.../src/main/resources/META-INF/services/pop3 | 18 -
.../src/main/resources/META-INF/services/smtp | 18 -
tests/test-bundles/pom.xml | 1 -
.../java/org/apache/camel/util/json/Jsoner.java | 69 +-
.../java/org/apache/camel/util/json/Yylex.java | 7 +-
.../src/main/resources/api-collection.vm | 22 +-
.../src/main/resources/api-endpoint-config.vm | 22 +-
.../src/main/resources/api-method-enum.vm | 22 +-
.../src/main/resources/api-name-enum.vm | 22 +-
.../src/main/resources/api-route-test.vm | 22 +-
.../src/test/resources/AddressGateway.java | 4 +-
.../src/test/resources/CustomGateway.java | 4 +-
.../src/test/resources/CustomerGateway.java | 4 +-
.../src/test/resources/DisputeGateway.java | 2 -
.../pom.xml | 36 +-
.../src/test/resources/enriched-camel-spring.xsd | 18 +
tooling/maven/camel-maven-plugin/pom.xml | 38 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 7 +-
.../camel/maven/packaging/ComponentDslMojo.java | 2 +-
.../camel/maven/packaging/EndpointDslMojo.java | 9 +-
.../packaging/EndpointSchemaGeneratorMojo.java | 25 +-
.../maven/packaging/ModelWriterGeneratorMojo.java | 105 +-
.../packaging/ModelXmlParserGeneratorMojo.java | 372 ++++---
.../camel/maven/packaging/PrepareCatalogMojo.java | 100 +-
.../packaging/generics/OwbTypeVariableImpl.java | 28 +-
.../src/main/resources/annotation-options.mvel | 16 +
.../src/main/resources/component-header.mvel | 16 +
.../src/main/resources/component-options.mvel | 16 +
.../src/main/resources/dataformat-options.mvel | 16 +
.../src/main/resources/eip-options.mvel | 16 +
.../src/main/resources/language-options.mvel | 16 +
.../src/main/resources/main-options.mvel | 16 +
.../src/main/resources/readme-examples.mvel | 16 +
.../apache/camel/maven/packaging/JavadocTest.java | 166 +--
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 117 ++-
.../src/it/expanded-v3-yaml/src/spec/openapi.yaml | 17 +
.../src/it/simple-v3-yaml/src/spec/openapi.yaml | 17 +
.../src/it/spring-boot-starter-support/pom.xml | 65 --
.../src/spec/openapi.json | 1093 --------------------
.../it/spring-boot-starter-support/verify.groovy | 22 -
tooling/maven/pom.xml | 2 -
tooling/maven/sync-properties-maven-plugin/pom.xml | 5 +
.../maven/sync/properties/SyncPropertiesMojo.java | 158 ++-
.../main/resources/camel-dependencies-template.xml | 25 +-
.../camel/generator/openapi/petstore-v3.yaml | 17 +
917 files changed, 7953 insertions(+), 10179 deletions(-)
delete mode 100644 buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
delete mode 100644 buildingtools/src/main/resources/camel-checkstyle.xml
delete mode 100644 buildingtools/src/main/resources/camel-eclipse-checkstyle
delete mode 100644 buildingtools/src/main/resources/header-properties.txt
delete mode 100644 buildingtools/src/main/resources/header-xml.txt
copy buildingtools/src/main/resources/{license-properties-headerdefinition.xml => ldif-properties-headerdefinition.xml} (83%)
delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
rename components/camel-azure/camel-azure-storage-blob/src/test/resources/{upload_test_file => upload_test_file.txt} (100%)
delete mode 100644 components/camel-chunk/src/test/resources/folderexample/subfolderexample/subfile_example.file
rename components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/{access_log => access_log.txt} (100%)
rename components/camel-huawei/camel-huaweicloud-frs/src/test/resources/{image_file => image_file.txt} (100%)
rename components/camel-huawei/camel-huaweicloud-frs/src/test/resources/{video_file => video_file.txt} (100%)
rename components/camel-jsch/src/test/resources/{camel-key.priv => camel-key.priv.pem} (100%)
rename components/camel-jsonpath/src/test/resources/json_stream/{fourChar => fourChar.txt} (100%)
rename components/camel-jsonpath/src/test/resources/json_stream/{oneChar => oneChar.txt} (100%)
rename components/camel-kubernetes/src/test/resources/myconfig/{bar => bar.txt} (100%)
rename components/camel-kubernetes/src/test/resources/myconfig/{foo => foo.txt} (100%)
rename components/camel-kubernetes/src/test/resources/mysecret/{mypass => mypass.txt} (100%)
rename components/camel-kubernetes/src/test/resources/mysecret/{myuser => myuser.txt} (100%)
rename components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/{window10 => window10.bin} (100%)
rename components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/{window15 => window15.bin} (100%)
rename components/camel-mail/src/test/resources/{SignedMailTestCaseHurz.elm => SignedMailTestCaseHurz.txt} (100%)
rename components/camel-mail/src/test/resources/{nested-multipart.elm => nested-multipart.txt} (100%)
rename components/camel-printer/src/test/resources/{asf-logo.JPG => asf-logo.jpg} (100%)
rename components/camel-quickfix/src/test/resources/examples/{gateway.cfg => gateway.qf.cfg} (92%)
rename components/camel-quickfix/src/test/resources/examples/{inprocess.cfg => inprocess.qf.cfg} (90%)
rename components/camel-salesforce/{test-salesforce-login.properties.sample => test-salesforce-login.sample.properties} (98%)
rename components/camel-xmlsecurity/src/test/resources/{recipient-with-key-pass.ks => recipient-with-key-pass.keystore} (100%)
rename components/camel-xmlsecurity/src/test/resources/{recipient.ks => recipient.keystore} (100%)
rename components/camel-xmlsecurity/src/test/resources/{sender.ts => sender.truststore} (100%)
rename components/camel-xmpp/src/test/resources/{bogus_mina_tls.cert => bogus_mina_tls.cer} (100%)
rename buildingtools/src/main/resources/header-java.txt => dsl/camel-js-dsl/src/test/resources/module.js (95%)
delete mode 100644 dsl/camel-js-dsl/src/test/resources/module.mjs
delete mode 100644 etc/eclipse/Camel.importorder
delete mode 100644 etc/eclipse/CamelCodeFormatter.xml
delete mode 100644 etc/eclipse/org.eclipse.jdt.core.prefs
delete mode 100644 etc/svn-auto-props
delete mode 100644 tests/test-bundles/mock-javamail_1.7/pom.xml
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/javamail.default.providers
delete mode 100755 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/imap
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockStore
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockTransport
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/pop3
delete mode 100644 tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/smtp
delete mode 100644 tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
delete mode 100644 tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/src/spec/openapi.json
delete mode 100644 tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/verify.groovy
[camel] 05/18: Remove mock-javamail_1.7 module which was disabled anyway
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 484c39e641c20fde9656a9652ff0762f5453e75f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 23:23:18 2023 +0200
Remove mock-javamail_1.7 module which was disabled anyway
---
tests/test-bundles/mock-javamail_1.7/pom.xml | 116 ------------
.../jvnet/mock_javamail/provider/IMAPProvider.java | 31 ----
.../jvnet/mock_javamail/provider/POP3Provider.java | 31 ----
.../jvnet/mock_javamail/provider/SMTPProvider.java | 30 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../resources/META-INF/javamail.default.providers | 22 ---
.../src/main/resources/META-INF/services/imap | 18 --
.../services/org.jvnet.mock_javamail.MockStore | 18 --
.../services/org.jvnet.mock_javamail.MockTransport | 18 --
.../src/main/resources/META-INF/services/pop3 | 18 --
.../src/main/resources/META-INF/services/smtp | 18 --
tests/test-bundles/pom.xml | 1 -
13 files changed, 535 deletions(-)
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
deleted file mode 100644
index 1f28e100f58..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel.tests.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.camel.tests</groupId>
- <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Integration Tests :: Test Bundles: ${pkgArtifactId}-${pkgVersion}</name>
- <description>
- This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
- </description>
-
- <properties>
- <pkgGroupId>org.jvnet.mock-javamail</pkgGroupId>
- <pkgArtifactId>mock-javamail</pkgArtifactId>
- <pkgVersion>1.7</pkgVersion>
- <servicemix.legal.version>1.0</servicemix.legal.version>
- </properties>
-
- <dependencies>
- <!-- using the new version of java mail -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>angus-mail</artifactId>
- <version>${angus-mail-version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- <exclude>META-INF/javamail.default.providers</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java b/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java
deleted file mode 100644
index fbc21b6b672..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jvnet.mock_javamail.provider;
-
-import jakarta.mail.Provider;
-
-public class IMAPProvider extends Provider {
-
- public IMAPProvider() {
- super(Type.STORE,
- "imap",
- "org.jvnet.mock_javamail.MockStore",
- "Apache Software Foundation",
- "1.0");
- }
-
-}
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java b/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java
deleted file mode 100644
index b52db51c6c5..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jvnet.mock_javamail.provider;
-
-import jakarta.mail.Provider;
-
-public class POP3Provider extends Provider {
-
- public POP3Provider() {
- super(Type.STORE,
- "pop3",
- "org.jvnet.mock_javamail.MockStore",
- "Apache Software Foundation",
- "1.0");
- }
-
-}
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java b/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java
deleted file mode 100644
index b09096fc4e6..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jvnet.mock_javamail.provider;
-
-import jakarta.mail.Provider;
-
-public class SMTPProvider extends Provider {
-
- public SMTPProvider() {
- super(Type.TRANSPORT,
- "smtp",
- "org.jvnet.mock_javamail.MockTransport",
- "Apache Software Foundation",
- "1.0");
- }
-}
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/LICENSE.txt b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/NOTICE.txt b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/javamail.default.providers b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/javamail.default.providers
deleted file mode 100644
index 965f734bce3..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/javamail.default.providers
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-protocol=smtp; type=transport; class=org.jvnet.mock_javamail.MockTransport; vendor=java.net mock-javamail project;
-protocol=pop3; type=store; class=org.jvnet.mock_javamail.MockStore; vendor=java.net mock-javamail project;
-protocol=imap; type=store; class=org.jvnet.mock_javamail.MockStore; vendor=java.net mock-javamail project;
-
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/imap b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/imap
deleted file mode 100755
index 40627ec29ca..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/imap
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jvnet.mock_javamail.provider.IMAPProvider
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockStore b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockStore
deleted file mode 100644
index 3bfc57e9bd8..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockStore
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jvnet.mock_javamail.MockStore
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockTransport b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockTransport
deleted file mode 100644
index cc84a330700..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/org.jvnet.mock_javamail.MockTransport
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jvnet.mock_javamail.MockTransport
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/pop3 b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/pop3
deleted file mode 100644
index 7051c748c8c..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/pop3
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jvnet.mock_javamail.provider.POP3Provider
diff --git a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/smtp b/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/smtp
deleted file mode 100644
index 757313258fd..00000000000
--- a/tests/test-bundles/mock-javamail_1.7/src/main/resources/META-INF/services/smtp
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jvnet.mock_javamail.provider.SMTPProvider
diff --git a/tests/test-bundles/pom.xml b/tests/test-bundles/pom.xml
index badfa2e089f..dadb9ea946f 100644
--- a/tests/test-bundles/pom.xml
+++ b/tests/test-bundles/pom.xml
@@ -140,7 +140,6 @@
</build>
<modules>
- <!--module>mock-javamail_1.7</module-->
<module>camel-validator-test-resources</module>
</modules>
</project>
[camel] 04/18: Do not fork cxf-codegen-plugin
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2ea1c1f50722c283fed59e13c0619befcdd51ad
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 22:46:15 2023 +0200
Do not fork cxf-codegen-plugin
---
camel-dependencies/pom.xml | 2 --
components/camel-cxf/camel-cxf-soap/pom.xml | 2 --
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 2 --
components/camel-cxf/camel-cxf-spring-transport/pom.xml | 2 --
components/camel-cxf/camel-cxf-transport/pom.xml | 2 --
components/camel-jmx/pom.xml | 2 --
components/camel-soap/pom.xml | 6 ------
parent/pom.xml | 2 --
tests/camel-itest/pom.xml | 2 --
9 files changed, 22 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 29032c87b21..ca63e47dd0a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -39,8 +39,6 @@
<!-- sync properties here from parent/pom.xml -->
<properties>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
- <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <cxf.codegen.jvmArgs />
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
<camel.surefire.forkCount>1</camel.surefire.forkCount>
<camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index c3538ae0101..1defc5f139e 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -288,8 +288,6 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 3099abc7220..8c8d5371230 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -322,8 +322,6 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-spring-transport/pom.xml b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
index 92ac84e30a0..82825e03804 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
@@ -89,8 +89,6 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index c5577d86929..938ca2e10d2 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -106,8 +106,6 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws</frontEnd>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 6a43383dbf8..4ca337b01aa 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -119,8 +119,6 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/xjc</sourceRoot>
<xsdOptions>
<xsdOption>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 443c8228756..b819b5fa6d4 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -136,8 +136,6 @@
<goal>xsdtojava-tests</goal>
</goals>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<xsdOptions>
<xsdOption>
@@ -165,8 +163,6 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/xjc</sourceRoot>
<extensions>
<extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
@@ -206,8 +202,6 @@
<id>generate-sources-wsdl</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws</frontEnd>
diff --git a/parent/pom.xml b/parent/pom.xml
index e201dff0a42..76a121bf7e2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,8 +34,6 @@
<properties>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
- <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <cxf.codegen.jvmArgs />
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
<camel.surefire.forkCount>1</camel.surefire.forkCount>
<camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 768d40c97df..25a15e2b974 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -422,8 +422,6 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>-Dlog4j.configurationFile=${project.basedir}/src/test/resources/log4j2.properties ${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<wsdlOptions>
<wsdlOption>
[camel] 09/18: Reformat Java after enabling the formatter plugin by default
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f04bcf2ded52276f0658ba1b6c99817ff389e02f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Jun 18 01:08:26 2023 +0200
Reformat Java after enabling the formatter plugin by default
---
.../java/org/apache/camel/maven/GenerateMojo.java | 4 +-
.../org/apache/camel/maven/RouteCoverageMojo.java | 20 +-
.../java/org/apache/camel/maven/ValidateMojo.java | 81 +-
.../java/org/apache/camel/avro/generated/Key.java | 206 ++---
.../camel/avro/generated/KeyValueProtocol.java | 33 +-
.../org/apache/camel/avro/generated/Value.java | 207 ++---
.../camel/dataformat/avro/example/Value.java | 207 ++---
...DBAggregateRecoverWithRedeliveryPolicyTest.java | 26 +-
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 10 +-
.../camel/component/stax/StaxStreamXMLReader.java | 882 ++++++++++-----------
.../camel/catalog/impl/AbstractCamelCatalog.java | 81 +-
.../language/simple/SimplePredicateParser.java | 3 +-
.../language/simple/types/BinaryOperatorType.java | 36 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 7 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 27 +-
.../org/apache/camel/util/ObjectHelperTest.java | 16 +-
.../support/AsyncProcessorConverterHelper.java | 3 +-
.../camel/support/builder/ExpressionBuilder.java | 286 +++----
.../camel/support/builder/PredicateBuilder.java | 54 +-
.../java/org/apache/camel/util/SensitiveUtils.java | 2 +-
.../apache/camel/xml/io/util/XmlStreamReader.java | 328 ++++----
.../xml/io/util/XmlStreamReaderException.java | 62 +-
.../java/org/apache/camel/xml/io/MXParser.java | 370 +++++----
.../org/apache/camel/xml/io/XmlPullParser.java | 799 ++++++++-----------
.../camel/xml/io/XmlPullParserException.java | 6 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 18 +-
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 575 +++++++-------
.../maven/dsl/yaml/GenerateYamlSchemaMojo.java | 14 +-
.../maven/dsl/yaml/GenerateYamlSupportMojo.java | 64 +-
.../java/org/apache/camel/util/json/Jsoner.java | 65 +-
.../java/org/apache/camel/util/json/Yylex.java | 5 +-
.../packaging/EndpointSchemaGeneratorMojo.java | 22 +-
.../maven/packaging/ModelWriterGeneratorMojo.java | 100 +--
.../packaging/ModelXmlParserGeneratorMojo.java | 366 +++++----
.../camel/maven/packaging/PrepareCatalogMojo.java | 80 +-
.../packaging/generics/OwbTypeVariableImpl.java | 27 +-
.../apache/camel/maven/packaging/JavadocTest.java | 164 ++--
37 files changed, 2704 insertions(+), 2552 deletions(-)
diff --git a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index 76af744df8c..afaf3b594c3 100644
--- a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++ b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -209,7 +209,6 @@ public class GenerateMojo extends AbstractExecMojo {
}
}
-
if (!csimpleExpressions.isEmpty()) {
getLog().info("Discovered " + csimpleExpressions.size() + " csimple expressions");
@@ -308,7 +307,8 @@ public class GenerateMojo extends AbstractExecMojo {
}
}
if (counter1 > 0 || counter2 > 0) {
- getLog().info("Loaded csimple language imports: " + counter1 + " and aliases: " + counter2 + " from configuration: " + configFile);
+ getLog().info("Loaded csimple language imports: " + counter1 + " and aliases: " + counter2 + " from configuration: "
+ + configFile);
}
}
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index 82fdcd208f5..e05dc7ac190 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -194,7 +194,8 @@ public class RouteCoverageMojo extends AbstractExecMojo {
long anonymous = routeTrees.stream().filter(t -> t.getRouteId() == null).count();
if (!anonymousRoutes && anonymous > 0) {
- getLog().warn("Discovered " + anonymous + " anonymous routes. Add route ids to these routes for route coverage support");
+ getLog().warn(
+ "Discovered " + anonymous + " anonymous routes. Add route ids to these routes for route coverage support");
}
final AtomicInteger notCovered = new AtomicInteger();
@@ -242,10 +243,11 @@ public class RouteCoverageMojo extends AbstractExecMojo {
// grab dump data for the route
try {
- List<CoverageData> coverageData = RouteCoverageHelper.parseDumpRouteCoverageByRouteId(project.getBasedir() + "/target/camel-route-coverage", routeId);
+ List<CoverageData> coverageData = RouteCoverageHelper
+ .parseDumpRouteCoverageByRouteId(project.getBasedir() + "/target/camel-route-coverage", routeId);
if (coverageData.isEmpty()) {
getLog().warn("No route coverage data found for route: " + routeId
- + ". Make sure to enable route coverage in your unit tests and assign unique route ids to your routes. Also remember to run unit tests first.");
+ + ". Make sure to enable route coverage in your unit tests and assign unique route ids to your routes. Also remember to run unit tests first.");
} else {
List<RouteCoverageNode> coverage = gatherRouteCoverageSummary(List.of(t), coverageData);
totalNumberOfNodes += coverage.size();
@@ -275,10 +277,11 @@ public class RouteCoverageMojo extends AbstractExecMojo {
if (anonymousRoutes && !anonymousRouteTrees.isEmpty()) {
// grab dump data for the route
try {
- Map<String, List<CoverageData>> datas = RouteCoverageHelper.parseDumpRouteCoverageByClassAndTestMethod(project.getBasedir() + "/target/camel-route-coverage");
+ Map<String, List<CoverageData>> datas = RouteCoverageHelper
+ .parseDumpRouteCoverageByClassAndTestMethod(project.getBasedir() + "/target/camel-route-coverage");
if (datas.isEmpty()) {
getLog().warn("No route coverage data found"
- + ". Make sure to enable route coverage in your unit tests. Also remember to run unit tests first.");
+ + ". Make sure to enable route coverage in your unit tests. Also remember to run unit tests first.");
} else {
Map<String, List<CamelNodeDetails>> routes = groupAnonymousRoutesByClassName(anonymousRouteTrees);
// attempt to match anonymous routes via the unit test class
@@ -300,7 +303,8 @@ public class RouteCoverageMojo extends AbstractExecMojo {
if (!coverage.isEmpty()) {
totalNumberOfNodes += coverage.size();
- String fileName = stripRootPath(asRelativeFile(t.getValue().get(0).getFileName(), project), project);
+ String fileName
+ = stripRootPath(asRelativeFile(t.getValue().get(0).getFileName(), project), project);
String out = templateCoverageData(fileName, null, coverage, notCovered, coveredNodes);
getLog().info("Route coverage summary:\n\n" + out);
getLog().info("");
@@ -360,7 +364,8 @@ public class RouteCoverageMojo extends AbstractExecMojo {
}
}
- private ListIterator<RouteCoverageNode> positionToLineNumber(ListIterator<RouteCoverageNode> it, List<RouteCoverageNode> coverage, int lineNumber) {
+ private ListIterator<RouteCoverageNode> positionToLineNumber(
+ ListIterator<RouteCoverageNode> it, List<RouteCoverageNode> coverage, int lineNumber) {
// restart
if (it == null || !it.hasNext()) {
it = coverage.listIterator();
@@ -376,7 +381,6 @@ public class RouteCoverageMojo extends AbstractExecMojo {
return it;
}
-
@SuppressWarnings("unchecked")
private String templateCoverageData(
String fileName, String routeId, List<RouteCoverageNode> model, AtomicInteger notCovered,
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 3c8fbfb5ba9..310f658cca9 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -326,11 +326,13 @@ public class ValidateMojo extends AbstractExecMojo {
String configurationSummary;
if (configurationErrors == 0) {
int ok = results.size() - configurationErrors - incapableErrors - unknownComponents;
- configurationSummary = String.format("Configuration validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ configurationSummary = String.format(
+ "Configuration validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
ok, configurationErrors, incapableErrors, unknownComponents, deprecatedOptions);
} else {
int ok = results.size() - configurationErrors - incapableErrors - unknownComponents;
- configurationSummary = String.format("Configuration validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ configurationSummary = String.format(
+ "Configuration validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
ok, configurationErrors, incapableErrors, unknownComponents, deprecatedOptions);
}
if (configurationErrors > 0) {
@@ -397,7 +399,8 @@ public class ValidateMojo extends AbstractExecMojo {
int deprecatedOptions = 0;
for (CamelEndpointDetails detail : endpoints) {
getLog().debug("Validating endpoint: " + detail.getEndpointUri());
- EndpointValidationResult result = catalog.validateEndpointProperties(detail.getEndpointUri(), ignoreLenientProperties);
+ EndpointValidationResult result
+ = catalog.validateEndpointProperties(detail.getEndpointUri(), ignoreLenientProperties);
int deprecated = result.getDeprecated() != null ? result.getDeprecated().size() : 0;
deprecatedOptions += deprecated;
@@ -434,7 +437,8 @@ public class ValidateMojo extends AbstractExecMojo {
getLog().info(msg);
}
}
- String endpointSummary = buildEndpointSummaryMessage(endpoints, endpointErrors, unknownComponents, incapableErrors, deprecatedOptions);
+ String endpointSummary
+ = buildEndpointSummaryMessage(endpoints, endpointErrors, unknownComponents, incapableErrors, deprecatedOptions);
if (endpointErrors > 0) {
getLog().warn(endpointSummary);
} else {
@@ -454,12 +458,15 @@ public class ValidateMojo extends AbstractExecMojo {
int sedaDirectErrors = 0;
String sedaDirectSummary = "";
if (directOrSedaPairCheck) {
- long sedaDirectEndpoints = (long) countEndpointPairs(endpoints, "direct") + (long) countEndpointPairs(endpoints, "seda");
+ long sedaDirectEndpoints
+ = (long) countEndpointPairs(endpoints, "direct") + (long) countEndpointPairs(endpoints, "seda");
sedaDirectErrors += validateEndpointPairs(endpoints, "direct") + validateEndpointPairs(endpoints, "seda");
if (sedaDirectErrors == 0) {
- sedaDirectSummary = String.format("Endpoint pair (seda/direct) validation success: (%s = pairs)", sedaDirectEndpoints);
+ sedaDirectSummary
+ = String.format("Endpoint pair (seda/direct) validation success: (%s = pairs)", sedaDirectEndpoints);
} else {
- sedaDirectSummary = String.format("Endpoint pair (seda/direct) validation error: (%s = pairs, %s = non-pairs)", sedaDirectEndpoints, sedaDirectErrors);
+ sedaDirectSummary = String.format("Endpoint pair (seda/direct) validation error: (%s = pairs, %s = non-pairs)",
+ sedaDirectEndpoints, sedaDirectErrors);
}
if (sedaDirectErrors > 0) {
getLog().warn(sedaDirectSummary);
@@ -475,7 +482,8 @@ public class ValidateMojo extends AbstractExecMojo {
if (duplicateRouteIdErrors == 0) {
routeIdSummary = String.format("Duplicate route id validation success: (%s = ids)", routeIds.size());
} else {
- routeIdSummary = String.format("Duplicate route id validation error: (%s = ids, %s = duplicates)", routeIds.size(), duplicateRouteIdErrors);
+ routeIdSummary = String.format("Duplicate route id validation error: (%s = ids, %s = duplicates)",
+ routeIds.size(), duplicateRouteIdErrors);
}
if (duplicateRouteIdErrors > 0) {
getLog().warn(routeIdSummary);
@@ -485,7 +493,8 @@ public class ValidateMojo extends AbstractExecMojo {
}
if (failOnError && (endpointErrors > 0 || simpleErrors > 0 || duplicateRouteIdErrors > 0) || sedaDirectErrors > 0) {
- throw new MojoExecutionException(endpointSummary + "\n" + simpleSummary + "\n" + routeIdSummary + "\n" + sedaDirectSummary);
+ throw new MojoExecutionException(
+ endpointSummary + "\n" + simpleSummary + "\n" + routeIdSummary + "\n" + sedaDirectSummary);
}
}
@@ -501,22 +510,27 @@ public class ValidateMojo extends AbstractExecMojo {
return simpleSummary;
}
- private String buildEndpointSummaryMessage(List<CamelEndpointDetails> endpoints, int endpointErrors, int unknownComponents, int incapableErrors, int deprecatedOptions) {
+ private String buildEndpointSummaryMessage(
+ List<CamelEndpointDetails> endpoints, int endpointErrors, int unknownComponents, int incapableErrors,
+ int deprecatedOptions) {
String endpointSummary;
if (endpointErrors == 0) {
int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
- endpointSummary = String.format("Endpoint validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
- ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
+ endpointSummary = String.format(
+ "Endpoint validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
} else {
int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
- endpointSummary = String.format("Endpoint validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
- ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
+ endpointSummary = String.format(
+ "Endpoint validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
}
return endpointSummary;
}
private String buildValidationPassedMessage(CamelEndpointDetails detail, EndpointValidationResult result) {
- StringBuilder sb = buildValidationSuccessMessage("Endpoint validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getUri());
+ StringBuilder sb = buildValidationSuccessMessage("Endpoint validation passed at: ", detail.getClassName(),
+ detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getUri());
return sb.toString();
}
@@ -532,7 +546,9 @@ public class ValidateMojo extends AbstractExecMojo {
return sb.toString();
}
- private void parseXmlRouteFile(List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions, List<CamelRouteDetails> routeIds, File file) {
+ private void parseXmlRouteFile(
+ List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions,
+ List<CamelRouteDetails> routeIds, File file) {
try {
List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
List<CamelSimpleExpressionDetails> fileSimpleExpressions = new ArrayList<>();
@@ -566,7 +582,9 @@ public class ValidateMojo extends AbstractExecMojo {
}
}
- private void parseJavaRouteFile(List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions, List<CamelRouteDetails> routeIds, File file) {
+ private void parseJavaRouteFile(
+ List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions,
+ List<CamelRouteDetails> routeIds, File file) {
try {
List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
List<CamelRouteDetails> fileRouteIds = new ArrayList<>();
@@ -603,12 +621,13 @@ public class ValidateMojo extends AbstractExecMojo {
}
}
-
private int countEndpointPairs(List<CamelEndpointDetails> endpoints, String scheme) {
int pairs = 0;
- Set<CamelEndpointDetails> consumers = endpoints.stream().filter(e -> e.isConsumerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
- Set<CamelEndpointDetails> producers = endpoints.stream().filter(e -> e.isProducerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
+ Set<CamelEndpointDetails> consumers = endpoints.stream()
+ .filter(e -> e.isConsumerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
+ Set<CamelEndpointDetails> producers = endpoints.stream()
+ .filter(e -> e.isProducerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
// find all pairs, eg producers that has a consumer (no need to check for opposite)
for (CamelEndpointDetails p : producers) {
@@ -624,8 +643,10 @@ public class ValidateMojo extends AbstractExecMojo {
private int validateEndpointPairs(List<CamelEndpointDetails> endpoints, String scheme) {
int errors = 0;
- Set<CamelEndpointDetails> consumers = endpoints.stream().filter(e -> e.isConsumerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
- Set<CamelEndpointDetails> producers = endpoints.stream().filter(e -> e.isProducerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
+ Set<CamelEndpointDetails> consumers = endpoints.stream()
+ .filter(e -> e.isConsumerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
+ Set<CamelEndpointDetails> producers = endpoints.stream()
+ .filter(e -> e.isProducerOnly() && e.getEndpointUri().startsWith(scheme + ":")).collect(Collectors.toSet());
// are there any producers that do not have a consumer pair
for (CamelEndpointDetails detail : producers) {
@@ -636,7 +657,9 @@ public class ValidateMojo extends AbstractExecMojo {
final String msg = buildEndpointValidationErrorMessage(detail);
getLog().warn(msg);
} else if (showAll) {
- StringBuilder sb = buildValidationSuccessMessage("Endpoint pair (seda/direct) validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), detail.getEndpointUri());
+ StringBuilder sb = buildValidationSuccessMessage("Endpoint pair (seda/direct) validation passed at: ",
+ detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(),
+ detail.getEndpointUri());
final String msg = sb.toString();
getLog().info(msg);
@@ -649,7 +672,8 @@ public class ValidateMojo extends AbstractExecMojo {
return errors;
}
- private StringBuilder buildValidationSuccessMessage(String str, String className, String lineNumber, String methodName, String fileName, String uri) {
+ private StringBuilder buildValidationSuccessMessage(
+ String str, String className, String lineNumber, String methodName, String fileName, String uri) {
StringBuilder sb = new StringBuilder();
sb.append(str);
buildErrorMessage(sb, className, lineNumber, methodName, fileName);
@@ -727,7 +751,8 @@ public class ValidateMojo extends AbstractExecMojo {
StringBuilder sb = new StringBuilder();
sb.append("Simple validation error at: ");
- buildErrorMessage(sb, detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName());
+ buildErrorMessage(sb, detail.getClassName(), detail.getLineNumber(), detail.getMethodName(),
+ detail.getFileName());
sb.append("\n");
String[] lines = result.getError().split("\n");
for (String line : lines) {
@@ -737,7 +762,8 @@ public class ValidateMojo extends AbstractExecMojo {
getLog().warn(sb.toString());
} else if (showAll) {
- StringBuilder sb = buildValidationSuccessMessage("Simple validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getText());
+ StringBuilder sb = buildValidationSuccessMessage("Simple validation passed at: ", detail.getClassName(),
+ detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getText());
getLog().info(sb.toString());
}
@@ -770,7 +796,8 @@ public class ValidateMojo extends AbstractExecMojo {
}
private String buildRouteIdValidationMessage(String str, CamelRouteDetails detail) {
- StringBuilder sb = buildValidationSuccessMessage(str, detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), detail.getRouteId());
+ StringBuilder sb = buildValidationSuccessMessage(str, detail.getClassName(), detail.getLineNumber(),
+ detail.getMethodName(), detail.getFileName(), detail.getRouteId());
return sb.toString();
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
index 9b5f45d223f..6d47cf8c180 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
@@ -20,118 +20,132 @@
* DO NOT EDIT DIRECTLY
*/
package org.apache.camel.avro.generated;
+
@SuppressWarnings("all")
public class Key extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse("{\"type\":\"record\",\"name\":\"Key\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]}");
- @Deprecated public java.lang.CharSequence key;
- public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
- public java.lang.Object get(int field$) {
- switch (field$) {
- case 0: return key;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
- // Used by DatumReader. Applications should not call.
- @SuppressWarnings(value="unchecked")
- public void put(int field$, java.lang.Object value$) {
- switch (field$) {
- case 0: key = (java.lang.CharSequence)value$; break;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
-
- /**
- * Gets the value of the 'key' field.
- */
- public java.lang.CharSequence getKey() {
- return key;
- }
-
- /**
- * Sets the value of the 'key' field.
- * @param value the value to set.
- */
- public void setKey(java.lang.CharSequence value) {
- this.key = value;
- }
-
- /** Creates a new Key RecordBuilder */
- public static org.apache.camel.avro.generated.Key.Builder newBuilder() {
- return new org.apache.camel.avro.generated.Key.Builder();
- }
-
- /** Creates a new Key RecordBuilder by copying an existing Builder */
- public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key.Builder other) {
- return new org.apache.camel.avro.generated.Key.Builder(other);
- }
-
- /** Creates a new Key RecordBuilder by copying an existing Key instance */
- public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key other) {
- return new org.apache.camel.avro.generated.Key.Builder(other);
- }
-
- /**
- * RecordBuilder for Key instances.
- */
- public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Key>
- implements org.apache.avro.data.RecordBuilder<Key> {
-
- private java.lang.CharSequence key;
-
- /** Creates a new Builder */
- private Builder() {
- super(org.apache.camel.avro.generated.Key.SCHEMA$);
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
+ "{\"type\":\"record\",\"name\":\"Key\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]}");
+ @Deprecated
+ public java.lang.CharSequence key;
+
+ public org.apache.avro.Schema getSchema() {
+ return SCHEMA$;
}
- /** Creates a Builder by copying an existing Builder */
- private Builder(org.apache.camel.avro.generated.Key.Builder other) {
- super(other);
+ // Used by DatumWriter. Applications should not call.
+ public java.lang.Object get(int field$) {
+ switch (field$) {
+ case 0:
+ return key;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Creates a Builder by copying an existing Key instance */
- private Builder(org.apache.camel.avro.generated.Key other) {
- super(org.apache.camel.avro.generated.Key.SCHEMA$);
- if (isValidValue(fields()[0], other.key)) {
- this.key = data().deepCopy(fields()[0].schema(), other.key);
- fieldSetFlags()[0] = true;
- }
+ // Used by DatumReader. Applications should not call.
+ @SuppressWarnings(value = "unchecked")
+ public void put(int field$, java.lang.Object value$) {
+ switch (field$) {
+ case 0:
+ key = (java.lang.CharSequence) value$;
+ break;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Gets the value of the 'key' field */
+ /**
+ * Gets the value of the 'key' field.
+ */
public java.lang.CharSequence getKey() {
- return key;
+ return key;
}
- /** Sets the value of the 'key' field */
- public org.apache.camel.avro.generated.Key.Builder setKey(java.lang.CharSequence value) {
- validate(fields()[0], value);
- this.key = value;
- fieldSetFlags()[0] = true;
- return this;
+ /**
+ * Sets the value of the 'key' field.
+ *
+ * @param value the value to set.
+ */
+ public void setKey(java.lang.CharSequence value) {
+ this.key = value;
}
- /** Checks whether the 'key' field has been set */
- public boolean hasKey() {
- return fieldSetFlags()[0];
+ /** Creates a new Key RecordBuilder */
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder() {
+ return new org.apache.camel.avro.generated.Key.Builder();
}
- /** Clears the value of the 'key' field */
- public org.apache.camel.avro.generated.Key.Builder clearKey() {
- key = null;
- fieldSetFlags()[0] = false;
- return this;
+ /** Creates a new Key RecordBuilder by copying an existing Builder */
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key.Builder other) {
+ return new org.apache.camel.avro.generated.Key.Builder(other);
}
- @Override
- public Key build() {
- try {
- Key record = new Key();
- record.key = fieldSetFlags()[0] ? this.key : (java.lang.CharSequence) defaultValue(fields()[0]);
- return record;
- } catch (Exception e) {
- throw new org.apache.avro.AvroRuntimeException(e);
- }
+ /** Creates a new Key RecordBuilder by copying an existing Key instance */
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key other) {
+ return new org.apache.camel.avro.generated.Key.Builder(other);
+ }
+
+ /**
+ * RecordBuilder for Key instances.
+ */
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Key>
+ implements org.apache.avro.data.RecordBuilder<Key> {
+
+ private java.lang.CharSequence key;
+
+ /** Creates a new Builder */
+ private Builder() {
+ super(org.apache.camel.avro.generated.Key.SCHEMA$);
+ }
+
+ /** Creates a Builder by copying an existing Builder */
+ private Builder(org.apache.camel.avro.generated.Key.Builder other) {
+ super(other);
+ }
+
+ /** Creates a Builder by copying an existing Key instance */
+ private Builder(org.apache.camel.avro.generated.Key other) {
+ super(org.apache.camel.avro.generated.Key.SCHEMA$);
+ if (isValidValue(fields()[0], other.key)) {
+ this.key = data().deepCopy(fields()[0].schema(), other.key);
+ fieldSetFlags()[0] = true;
+ }
+ }
+
+ /** Gets the value of the 'key' field */
+ public java.lang.CharSequence getKey() {
+ return key;
+ }
+
+ /** Sets the value of the 'key' field */
+ public org.apache.camel.avro.generated.Key.Builder setKey(java.lang.CharSequence value) {
+ validate(fields()[0], value);
+ this.key = value;
+ fieldSetFlags()[0] = true;
+ return this;
+ }
+
+ /** Checks whether the 'key' field has been set */
+ public boolean hasKey() {
+ return fieldSetFlags()[0];
+ }
+
+ /** Clears the value of the 'key' field */
+ public org.apache.camel.avro.generated.Key.Builder clearKey() {
+ key = null;
+ fieldSetFlags()[0] = false;
+ return this;
+ }
+
+ @Override
+ public Key build() {
+ try {
+ Key record = new Key();
+ record.key = fieldSetFlags()[0] ? this.key : (java.lang.CharSequence) defaultValue(fields()[0]);
+ return record;
+ } catch (Exception e) {
+ throw new org.apache.avro.AvroRuntimeException(e);
+ }
+ }
}
- }
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
index 3b966587485..b7471ec9e5d 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
@@ -23,14 +23,27 @@ package org.apache.camel.avro.generated;
@SuppressWarnings("all")
public interface KeyValueProtocol {
- org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"KeyValueProtocol\",\"namespace\":\"org.apache.camel.avro.generated\",\"types\":[{\"type\":\"record\",\"name\":\"Key\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Value\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}],\"messages\":{\"put\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"},{\"name\":\"value\",\"type\":\"Value\"}],\"response\":\"null\"},\"g [...]
- java.lang.Void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value) throws org.apache.avro.AvroRemoteException;
- org.apache.camel.avro.generated.Value get(org.apache.camel.avro.generated.Key key) throws org.apache.avro.AvroRemoteException;
+ org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse(
+ "{\"protocol\":\"KeyValueProtocol\",\"namespace\":\"org.apache.camel.avro.generated\",\"types\":[{\"type\":\"record\",\"name\":\"Key\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Value\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}],\"messages\":{\"put\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"},{\"name\":\"value\",\"type\":\"Value\"}],\"response\":\"null\"},\"get\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"}],\ [...]
- @SuppressWarnings("all")
- public interface Callback extends KeyValueProtocol {
- org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL;
- void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value, org.apache.avro.ipc.Callback<java.lang.Void> callback) throws java.io.IOException;
- void get(org.apache.camel.avro.generated.Key key, org.apache.avro.ipc.Callback<org.apache.camel.avro.generated.Value> callback) throws java.io.IOException;
- }
-}
\ No newline at end of file
+ java.lang.Void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value)
+ throws org.apache.avro.AvroRemoteException;
+
+ org.apache.camel.avro.generated.Value get(org.apache.camel.avro.generated.Key key)
+ throws org.apache.avro.AvroRemoteException;
+
+ @SuppressWarnings("all")
+ public interface Callback extends KeyValueProtocol {
+ org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL;
+
+ void put(
+ org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value,
+ org.apache.avro.ipc.Callback<java.lang.Void> callback)
+ throws java.io.IOException;
+
+ void get(
+ org.apache.camel.avro.generated.Key key,
+ org.apache.avro.ipc.Callback<org.apache.camel.avro.generated.Value> callback)
+ throws java.io.IOException;
+ }
+}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
index d90ba156f78..6f8d90d8243 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
@@ -20,118 +20,133 @@
* DO NOT EDIT DIRECTLY
*/
package org.apache.camel.avro.generated;
+
@SuppressWarnings("all")
public class Value extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse("{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
- @Deprecated public java.lang.CharSequence value;
- public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
- public java.lang.Object get(int field$) {
- switch (field$) {
- case 0: return value;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
- // Used by DatumReader. Applications should not call.
- @SuppressWarnings(value="unchecked")
- public void put(int field$, java.lang.Object value$) {
- switch (field$) {
- case 0: value = (java.lang.CharSequence)value$; break;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
-
- /**
- * Gets the value of the 'value' field.
- */
- public java.lang.CharSequence getValue() {
- return value;
- }
-
- /**
- * Sets the value of the 'value' field.
- * @param value the value to set.
- */
- public void setValue(java.lang.CharSequence value) {
- this.value = value;
- }
-
- /** Creates a new Value RecordBuilder */
- public static org.apache.camel.avro.generated.Value.Builder newBuilder() {
- return new org.apache.camel.avro.generated.Value.Builder();
- }
-
- /** Creates a new Value RecordBuilder by copying an existing Builder */
- public static org.apache.camel.avro.generated.Value.Builder newBuilder(org.apache.camel.avro.generated.Value.Builder other) {
- return new org.apache.camel.avro.generated.Value.Builder(other);
- }
-
- /** Creates a new Value RecordBuilder by copying an existing Value instance */
- public static org.apache.camel.avro.generated.Value.Builder newBuilder(org.apache.camel.avro.generated.Value other) {
- return new org.apache.camel.avro.generated.Value.Builder(other);
- }
-
- /**
- * RecordBuilder for Value instances.
- */
- public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
- implements org.apache.avro.data.RecordBuilder<Value> {
-
- private java.lang.CharSequence value;
-
- /** Creates a new Builder */
- private Builder() {
- super(org.apache.camel.avro.generated.Value.SCHEMA$);
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
+ "{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
+ @Deprecated
+ public java.lang.CharSequence value;
+
+ public org.apache.avro.Schema getSchema() {
+ return SCHEMA$;
}
- /** Creates a Builder by copying an existing Builder */
- private Builder(org.apache.camel.avro.generated.Value.Builder other) {
- super(other);
+ // Used by DatumWriter. Applications should not call.
+ public java.lang.Object get(int field$) {
+ switch (field$) {
+ case 0:
+ return value;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Creates a Builder by copying an existing Value instance */
- private Builder(org.apache.camel.avro.generated.Value other) {
- super(org.apache.camel.avro.generated.Value.SCHEMA$);
- if (isValidValue(fields()[0], other.value)) {
- this.value = data().deepCopy(fields()[0].schema(), other.value);
- fieldSetFlags()[0] = true;
- }
+ // Used by DatumReader. Applications should not call.
+ @SuppressWarnings(value = "unchecked")
+ public void put(int field$, java.lang.Object value$) {
+ switch (field$) {
+ case 0:
+ value = (java.lang.CharSequence) value$;
+ break;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Gets the value of the 'value' field */
+ /**
+ * Gets the value of the 'value' field.
+ */
public java.lang.CharSequence getValue() {
- return value;
+ return value;
}
- /** Sets the value of the 'value' field */
- public org.apache.camel.avro.generated.Value.Builder setValue(java.lang.CharSequence value) {
- validate(fields()[0], value);
- this.value = value;
- fieldSetFlags()[0] = true;
- return this;
+ /**
+ * Sets the value of the 'value' field.
+ *
+ * @param value the value to set.
+ */
+ public void setValue(java.lang.CharSequence value) {
+ this.value = value;
}
- /** Checks whether the 'value' field has been set */
- public boolean hasValue() {
- return fieldSetFlags()[0];
+ /** Creates a new Value RecordBuilder */
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder() {
+ return new org.apache.camel.avro.generated.Value.Builder();
}
- /** Clears the value of the 'value' field */
- public org.apache.camel.avro.generated.Value.Builder clearValue() {
- value = null;
- fieldSetFlags()[0] = false;
- return this;
+ /** Creates a new Value RecordBuilder by copying an existing Builder */
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder(
+ org.apache.camel.avro.generated.Value.Builder other) {
+ return new org.apache.camel.avro.generated.Value.Builder(other);
}
- @Override
- public Value build() {
- try {
- Value record = new Value();
- record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
- return record;
- } catch (Exception e) {
- throw new org.apache.avro.AvroRuntimeException(e);
- }
+ /** Creates a new Value RecordBuilder by copying an existing Value instance */
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder(org.apache.camel.avro.generated.Value other) {
+ return new org.apache.camel.avro.generated.Value.Builder(other);
+ }
+
+ /**
+ * RecordBuilder for Value instances.
+ */
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
+ implements org.apache.avro.data.RecordBuilder<Value> {
+
+ private java.lang.CharSequence value;
+
+ /** Creates a new Builder */
+ private Builder() {
+ super(org.apache.camel.avro.generated.Value.SCHEMA$);
+ }
+
+ /** Creates a Builder by copying an existing Builder */
+ private Builder(org.apache.camel.avro.generated.Value.Builder other) {
+ super(other);
+ }
+
+ /** Creates a Builder by copying an existing Value instance */
+ private Builder(org.apache.camel.avro.generated.Value other) {
+ super(org.apache.camel.avro.generated.Value.SCHEMA$);
+ if (isValidValue(fields()[0], other.value)) {
+ this.value = data().deepCopy(fields()[0].schema(), other.value);
+ fieldSetFlags()[0] = true;
+ }
+ }
+
+ /** Gets the value of the 'value' field */
+ public java.lang.CharSequence getValue() {
+ return value;
+ }
+
+ /** Sets the value of the 'value' field */
+ public org.apache.camel.avro.generated.Value.Builder setValue(java.lang.CharSequence value) {
+ validate(fields()[0], value);
+ this.value = value;
+ fieldSetFlags()[0] = true;
+ return this;
+ }
+
+ /** Checks whether the 'value' field has been set */
+ public boolean hasValue() {
+ return fieldSetFlags()[0];
+ }
+
+ /** Clears the value of the 'value' field */
+ public org.apache.camel.avro.generated.Value.Builder clearValue() {
+ value = null;
+ fieldSetFlags()[0] = false;
+ return this;
+ }
+
+ @Override
+ public Value build() {
+ try {
+ Value record = new Value();
+ record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
+ return record;
+ } catch (Exception e) {
+ throw new org.apache.avro.AvroRuntimeException(e);
+ }
+ }
}
- }
}
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
index aa013f29ac7..a285fc2db7f 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
@@ -23,116 +23,131 @@ package org.apache.camel.dataformat.avro.example;
@SuppressWarnings("all")
public class Value extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse("{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.dataformat.avro.example\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
- @Deprecated public java.lang.CharSequence value;
- public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
- public java.lang.Object get(int field$) {
- switch (field$) {
- case 0: return value;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
- // Used by DatumReader. Applications should not call.
- @SuppressWarnings(value="unchecked")
- public void put(int field$, java.lang.Object value$) {
- switch (field$) {
- case 0: value = (java.lang.CharSequence)value$; break;
- default: throw new org.apache.avro.AvroRuntimeException("Bad index");
- }
- }
-
- /**
- * Gets the value of the 'value' field.
- */
- public java.lang.CharSequence getValue() {
- return value;
- }
-
- /**
- * Sets the value of the 'value' field.
- * @param value the value to set.
- */
- public void setValue(java.lang.CharSequence value) {
- this.value = value;
- }
-
- /** Creates a new Value RecordBuilder */
- public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder() {
- return new org.apache.camel.dataformat.avro.example.Value.Builder();
- }
-
- /** Creates a new Value RecordBuilder by copying an existing Builder */
- public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(org.apache.camel.dataformat.avro.example.Value.Builder other) {
- return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
- }
-
- /** Creates a new Value RecordBuilder by copying an existing Value instance */
- public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(org.apache.camel.dataformat.avro.example.Value other) {
- return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
- }
-
- /**
- * RecordBuilder for Value instances.
- */
- public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
- implements org.apache.avro.data.RecordBuilder<Value> {
-
- private java.lang.CharSequence value;
-
- /** Creates a new Builder */
- private Builder() {
- super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
+ "{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.dataformat.avro.example\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
+ @Deprecated
+ public java.lang.CharSequence value;
+
+ public org.apache.avro.Schema getSchema() {
+ return SCHEMA$;
}
- /** Creates a Builder by copying an existing Builder */
- private Builder(org.apache.camel.dataformat.avro.example.Value.Builder other) {
- super(other);
+ // Used by DatumWriter. Applications should not call.
+ public java.lang.Object get(int field$) {
+ switch (field$) {
+ case 0:
+ return value;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Creates a Builder by copying an existing Value instance */
- private Builder(org.apache.camel.dataformat.avro.example.Value other) {
- super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
- if (isValidValue(fields()[0], other.value)) {
- this.value = data().deepCopy(fields()[0].schema(), other.value);
- fieldSetFlags()[0] = true;
- }
+ // Used by DatumReader. Applications should not call.
+ @SuppressWarnings(value = "unchecked")
+ public void put(int field$, java.lang.Object value$) {
+ switch (field$) {
+ case 0:
+ value = (java.lang.CharSequence) value$;
+ break;
+ default:
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
+ }
}
- /** Gets the value of the 'value' field */
+ /**
+ * Gets the value of the 'value' field.
+ */
public java.lang.CharSequence getValue() {
- return value;
+ return value;
+ }
+
+ /**
+ * Sets the value of the 'value' field.
+ *
+ * @param value the value to set.
+ */
+ public void setValue(java.lang.CharSequence value) {
+ this.value = value;
}
- /** Sets the value of the 'value' field */
- public org.apache.camel.dataformat.avro.example.Value.Builder setValue(java.lang.CharSequence value) {
- validate(fields()[0], value);
- this.value = value;
- fieldSetFlags()[0] = true;
- return this;
+ /** Creates a new Value RecordBuilder */
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder() {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder();
}
- /** Checks whether the 'value' field has been set */
- public boolean hasValue() {
- return fieldSetFlags()[0];
+ /** Creates a new Value RecordBuilder by copying an existing Builder */
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(
+ org.apache.camel.dataformat.avro.example.Value.Builder other) {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
}
- /** Clears the value of the 'value' field */
- public org.apache.camel.dataformat.avro.example.Value.Builder clearValue() {
- value = null;
- fieldSetFlags()[0] = false;
- return this;
+ /** Creates a new Value RecordBuilder by copying an existing Value instance */
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(
+ org.apache.camel.dataformat.avro.example.Value other) {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
}
- @Override
- public Value build() {
- try {
- Value record = new Value();
- record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
- return record;
- } catch (Exception e) {
- throw new org.apache.avro.AvroRuntimeException(e);
- }
+ /**
+ * RecordBuilder for Value instances.
+ */
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
+ implements org.apache.avro.data.RecordBuilder<Value> {
+
+ private java.lang.CharSequence value;
+
+ /** Creates a new Builder */
+ private Builder() {
+ super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
+ }
+
+ /** Creates a Builder by copying an existing Builder */
+ private Builder(org.apache.camel.dataformat.avro.example.Value.Builder other) {
+ super(other);
+ }
+
+ /** Creates a Builder by copying an existing Value instance */
+ private Builder(org.apache.camel.dataformat.avro.example.Value other) {
+ super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
+ if (isValidValue(fields()[0], other.value)) {
+ this.value = data().deepCopy(fields()[0].schema(), other.value);
+ fieldSetFlags()[0] = true;
+ }
+ }
+
+ /** Gets the value of the 'value' field */
+ public java.lang.CharSequence getValue() {
+ return value;
+ }
+
+ /** Sets the value of the 'value' field */
+ public org.apache.camel.dataformat.avro.example.Value.Builder setValue(java.lang.CharSequence value) {
+ validate(fields()[0], value);
+ this.value = value;
+ fieldSetFlags()[0] = true;
+ return this;
+ }
+
+ /** Checks whether the 'value' field has been set */
+ public boolean hasValue() {
+ return fieldSetFlags()[0];
+ }
+
+ /** Clears the value of the 'value' field */
+ public org.apache.camel.dataformat.avro.example.Value.Builder clearValue() {
+ value = null;
+ fieldSetFlags()[0] = false;
+ return this;
+ }
+
+ @Override
+ public Value build() {
+ try {
+ Value record = new Value();
+ record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
+ return record;
+ } catch (Exception e) {
+ throw new org.apache.avro.AvroRuntimeException(e);
+ }
+ }
}
- }
}
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
index e6f80f6fb22..c2f477d812c 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
@@ -87,20 +87,20 @@ public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends LevelDBTest
public void configure() {
from("direct:start")
.aggregate(header("id"), new StringAggregationStrategy())
- .completionSize(5).aggregationRepository(getRepo())
- // this is the output from the aggregator
- .log("aggregated exchange id ${exchangeId} with ${body}")
- .to("mock:aggregated")
- // simulate errors the first three times
- .process(new Processor() {
- public void process(Exchange exchange) {
- int count = getCounter(getSerializerType()).incrementAndGet();
- if (count <= 3) {
- throw new IllegalArgumentException("Damn");
- }
+ .completionSize(5).aggregationRepository(getRepo())
+ // this is the output from the aggregator
+ .log("aggregated exchange id ${exchangeId} with ${body}")
+ .to("mock:aggregated")
+ // simulate errors the first three times
+ .process(new Processor() {
+ public void process(Exchange exchange) {
+ int count = getCounter(getSerializerType()).incrementAndGet();
+ if (count <= 3) {
+ throw new IllegalArgumentException("Damn");
}
- })
- .to("mock:result")
+ }
+ })
+ .to("mock:result")
.end();
}
};
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
index efced61cf78..3cea8d5a388 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
@@ -114,15 +114,15 @@ public class AbstractOlingo2AppAPITestSupport {
Object value = entry.getValue();
if (value instanceof Map) {
@SuppressWarnings("unchecked")
- final Map<String, Object> objectMap = (Map<String, Object>)value;
+ final Map<String, Object> objectMap = (Map<String, Object>) value;
value = prettyPrint(objectMap, level + 1);
b.append(value).append(NEW_LINE);
} else if (value instanceof Calendar) {
- Calendar cal = (Calendar)value;
+ Calendar cal = (Calendar) value;
value = DateFormat.getInstance().format(cal.getTime());
b.append(value).append(NEW_LINE);
} else if (value instanceof ODataDeltaFeed) {
- ODataDeltaFeed feed = (ODataDeltaFeed)value;
+ ODataDeltaFeed feed = (ODataDeltaFeed) value;
List<ODataEntry> inlineEntries = feed.getEntries();
b.append("{");
for (ODataEntry oDataEntry : inlineEntries) {
@@ -167,9 +167,9 @@ public class AbstractOlingo2AppAPITestSupport {
this.response = response;
if (LOG.isDebugEnabled()) {
if (response instanceof ODataFeed) {
- LOG.debug("Received response: {}", prettyPrint((ODataFeed)response));
+ LOG.debug("Received response: {}", prettyPrint((ODataFeed) response));
} else if (response instanceof ODataEntry) {
- LOG.debug("Received response: {}", prettyPrint((ODataEntry)response));
+ LOG.debug("Received response: {}", prettyPrint((ODataEntry) response));
} else {
LOG.debug("Received response: {}", response);
}
diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
index 2899890e94a..81938cfad7c 100644
--- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
+++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
@@ -48,541 +48,533 @@ import org.apache.camel.util.ObjectHelper;
*/
public class StaxStreamXMLReader implements XMLReader {
- private static final String DEFAULT_XML_VERSION = "1.0";
+ private static final String DEFAULT_XML_VERSION = "1.0";
- private static final String NAMESPACES_FEATURE_NAME = "http://xml.org/sax/features/namespaces";
+ private static final String NAMESPACES_FEATURE_NAME = "http://xml.org/sax/features/namespaces";
- private static final String NAMESPACE_PREFIXES_FEATURE_NAME = "http://xml.org/sax/features/namespace-prefixes";
+ private static final String NAMESPACE_PREFIXES_FEATURE_NAME = "http://xml.org/sax/features/namespace-prefixes";
- private static final String IS_STANDALONE_FEATURE_NAME = "http://xml.org/sax/features/is-standalone";
+ private static final String IS_STANDALONE_FEATURE_NAME = "http://xml.org/sax/features/is-standalone";
- private DTDHandler dtdHandler;
+ private DTDHandler dtdHandler;
- private ContentHandler contentHandler;
+ private ContentHandler contentHandler;
- private EntityResolver entityResolver;
+ private EntityResolver entityResolver;
- private ErrorHandler errorHandler;
+ private ErrorHandler errorHandler;
- private LexicalHandler lexicalHandler;
+ private LexicalHandler lexicalHandler;
- private boolean namespacesFeature = true;
+ private boolean namespacesFeature = true;
- private boolean namespacePrefixesFeature = false;
+ private boolean namespacePrefixesFeature = false;
- private Boolean isStandalone;
+ private Boolean isStandalone;
- private final Map<String, String> namespaces = new LinkedHashMap<>();
+ private final Map<String, String> namespaces = new LinkedHashMap<>();
- private final XMLStreamReader reader;
+ private final XMLStreamReader reader;
- private String xmlVersion = DEFAULT_XML_VERSION;
+ private String xmlVersion = DEFAULT_XML_VERSION;
- private String encoding;
+ private String encoding;
- /**
- * Constructs a new instance of the <code>StaxStreamXmlReader</code> that reads from the given
- * <code>XMLStreamReader</code>. The supplied stream reader must be in <code>XMLStreamConstants.START_DOCUMENT</code>
- * or <code>XMLStreamConstants.START_ELEMENT</code> state.
- *
- * @param reader the <code>XMLEventReader</code> to read from
- * @throws IllegalStateException if the reader is not at the start of a document or element
- */
- StaxStreamXMLReader(XMLStreamReader reader) {
- if (reader == null) {
+ /**
+ * Constructs a new instance of the <code>StaxStreamXmlReader</code> that reads from the given
+ * <code>XMLStreamReader</code>. The supplied stream reader must be in
+ * <code>XMLStreamConstants.START_DOCUMENT</code> or <code>XMLStreamConstants.START_ELEMENT</code> state.
+ *
+ * @param reader the <code>XMLEventReader</code> to read from
+ * @throws IllegalStateException if the reader is not at the start of a document or element
+ */
+ StaxStreamXMLReader(XMLStreamReader reader) {
+ if (reader == null) {
throw new IllegalArgumentException("'reader' must not be null");
}
- int event = reader.getEventType();
- if (!(event == XMLStreamConstants.START_DOCUMENT || event == XMLStreamConstants.START_ELEMENT)) {
- throw new IllegalStateException("XMLEventReader not at start of document or element");
- }
- this.reader = reader;
- }
-
- protected void parseInternal() throws SAXException, XMLStreamException {
- boolean documentStarted = false;
- boolean documentEnded = false;
- int elementDepth = 0;
- int eventType = reader.getEventType();
- while (true) {
- if (eventType != XMLStreamConstants.START_DOCUMENT && eventType != XMLStreamConstants.END_DOCUMENT &&
- !documentStarted) {
- handleStartDocument();
- documentStarted = true;
- }
- switch (eventType) {
- case XMLStreamConstants.START_ELEMENT:
- elementDepth++;
- handleStartElement();
- break;
- case XMLStreamConstants.END_ELEMENT:
- elementDepth--;
- if (elementDepth >= 0) {
- handleEndElement();
- }
- break;
- case XMLStreamConstants.PROCESSING_INSTRUCTION:
- handleProcessingInstruction();
- break;
- case XMLStreamConstants.CHARACTERS:
- case XMLStreamConstants.SPACE:
- case XMLStreamConstants.CDATA:
- handleCharacters();
- break;
- case XMLStreamConstants.START_DOCUMENT:
- handleStartDocument();
- documentStarted = true;
- break;
- case XMLStreamConstants.END_DOCUMENT:
- handleEndDocument();
- documentEnded = true;
- break;
- case XMLStreamConstants.COMMENT:
- handleComment();
- break;
- case XMLStreamConstants.DTD:
- handleDtd();
- break;
- case XMLStreamConstants.ENTITY_REFERENCE:
- handleEntityReference();
- break;
- default:
- throw new IllegalStateException("unexpected eventType " + eventType);
- }
- if (reader.hasNext() && elementDepth >= 0) {
- eventType = reader.next();
- }
- else {
- break;
- }
- }
- if (!documentEnded) {
- handleEndDocument();
- }
- }
-
- private void handleStartDocument() throws SAXException {
- if (XMLStreamConstants.START_DOCUMENT == reader.getEventType()) {
- String xmlVersion = reader.getVersion();
- if (ObjectHelper.isNotEmpty(xmlVersion)) {
- this.xmlVersion = xmlVersion;
- }
- this.encoding = reader.getCharacterEncodingScheme();
- }
-
- if (getContentHandler() != null) {
- final Location location = reader.getLocation();
-
- getContentHandler().setDocumentLocator(new Locator2() {
+ int event = reader.getEventType();
+ if (!(event == XMLStreamConstants.START_DOCUMENT || event == XMLStreamConstants.START_ELEMENT)) {
+ throw new IllegalStateException("XMLEventReader not at start of document or element");
+ }
+ this.reader = reader;
+ }
+
+ protected void parseInternal() throws SAXException, XMLStreamException {
+ boolean documentStarted = false;
+ boolean documentEnded = false;
+ int elementDepth = 0;
+ int eventType = reader.getEventType();
+ while (true) {
+ if (eventType != XMLStreamConstants.START_DOCUMENT && eventType != XMLStreamConstants.END_DOCUMENT &&
+ !documentStarted) {
+ handleStartDocument();
+ documentStarted = true;
+ }
+ switch (eventType) {
+ case XMLStreamConstants.START_ELEMENT:
+ elementDepth++;
+ handleStartElement();
+ break;
+ case XMLStreamConstants.END_ELEMENT:
+ elementDepth--;
+ if (elementDepth >= 0) {
+ handleEndElement();
+ }
+ break;
+ case XMLStreamConstants.PROCESSING_INSTRUCTION:
+ handleProcessingInstruction();
+ break;
+ case XMLStreamConstants.CHARACTERS:
+ case XMLStreamConstants.SPACE:
+ case XMLStreamConstants.CDATA:
+ handleCharacters();
+ break;
+ case XMLStreamConstants.START_DOCUMENT:
+ handleStartDocument();
+ documentStarted = true;
+ break;
+ case XMLStreamConstants.END_DOCUMENT:
+ handleEndDocument();
+ documentEnded = true;
+ break;
+ case XMLStreamConstants.COMMENT:
+ handleComment();
+ break;
+ case XMLStreamConstants.DTD:
+ handleDtd();
+ break;
+ case XMLStreamConstants.ENTITY_REFERENCE:
+ handleEntityReference();
+ break;
+ default:
+ throw new IllegalStateException("unexpected eventType " + eventType);
+ }
+ if (reader.hasNext() && elementDepth >= 0) {
+ eventType = reader.next();
+ } else {
+ break;
+ }
+ }
+ if (!documentEnded) {
+ handleEndDocument();
+ }
+ }
- public int getColumnNumber() {
- return location != null ? location.getColumnNumber() : -1;
+ private void handleStartDocument() throws SAXException {
+ if (XMLStreamConstants.START_DOCUMENT == reader.getEventType()) {
+ String xmlVersion = reader.getVersion();
+ if (ObjectHelper.isNotEmpty(xmlVersion)) {
+ this.xmlVersion = xmlVersion;
+ }
+ this.encoding = reader.getCharacterEncodingScheme();
}
- public int getLineNumber() {
- return location != null ? location.getLineNumber() : -1;
+ if (getContentHandler() != null) {
+ final Location location = reader.getLocation();
+
+ getContentHandler().setDocumentLocator(new Locator2() {
+
+ public int getColumnNumber() {
+ return location != null ? location.getColumnNumber() : -1;
+ }
+
+ public int getLineNumber() {
+ return location != null ? location.getLineNumber() : -1;
+ }
+
+ public String getPublicId() {
+ return location != null ? location.getPublicId() : null;
+ }
+
+ public String getSystemId() {
+ return location != null ? location.getSystemId() : null;
+ }
+
+ public String getXMLVersion() {
+ return xmlVersion;
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+ });
+ getContentHandler().startDocument();
+ if (reader.standaloneSet()) {
+ setStandalone(reader.isStandalone());
+ }
}
+ }
- public String getPublicId() {
- return location != null ? location.getPublicId() : null;
+ private void handleStartElement() throws SAXException {
+ if (getContentHandler() != null) {
+ QName qName = reader.getName();
+ if (hasNamespacesFeature()) {
+ for (int i = 0; i < reader.getNamespaceCount(); i++) {
+ startPrefixMapping(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+ }
+ for (int i = 0; i < reader.getAttributeCount(); i++) {
+ String prefix = reader.getAttributePrefix(i);
+ String namespace = reader.getAttributeNamespace(i);
+ if (ObjectHelper.isNotEmpty(namespace)) {
+ startPrefixMapping(prefix, namespace);
+ }
+ }
+ getContentHandler().startElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName),
+ getAttributes());
+ } else {
+ getContentHandler().startElement("", "", toQualifiedName(qName), getAttributes());
+ }
}
+ }
- public String getSystemId() {
- return location != null ? location.getSystemId() : null;
+ private void handleEndElement() throws SAXException {
+ if (getContentHandler() != null) {
+ QName qName = reader.getName();
+ if (hasNamespacesFeature()) {
+ getContentHandler().endElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName));
+ for (int i = 0; i < reader.getNamespaceCount(); i++) {
+ String prefix = reader.getNamespacePrefix(i);
+ if (prefix == null) {
+ prefix = "";
+ }
+ endPrefixMapping(prefix);
+ }
+ } else {
+ getContentHandler().endElement("", "", toQualifiedName(qName));
+ }
}
+ }
- public String getXMLVersion() {
- return xmlVersion;
+ private void handleCharacters() throws SAXException {
+ if (getContentHandler() != null && reader.isWhiteSpace()) {
+ getContentHandler()
+ .ignorableWhitespace(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+ return;
}
+ if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
+ getLexicalHandler().startCDATA();
+ }
+ if (getContentHandler() != null) {
+ getContentHandler().characters(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+ }
+ if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
+ getLexicalHandler().endCDATA();
+ }
+ }
- public String getEncoding() {
- return encoding;
+ private void handleComment() throws SAXException {
+ if (getLexicalHandler() != null) {
+ getLexicalHandler().comment(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
}
- });
- getContentHandler().startDocument();
- if (reader.standaloneSet()) {
- setStandalone(reader.isStandalone());
- }
}
- }
- private void handleStartElement() throws SAXException {
- if (getContentHandler() != null) {
- QName qName = reader.getName();
- if (hasNamespacesFeature()) {
- for (int i = 0; i < reader.getNamespaceCount(); i++) {
- startPrefixMapping(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+ private void handleDtd() throws SAXException {
+ if (getLexicalHandler() != null) {
+ javax.xml.stream.Location location = reader.getLocation();
+ getLexicalHandler().startDTD(null, location.getPublicId(), location.getSystemId());
}
- for (int i = 0; i < reader.getAttributeCount(); i++) {
- String prefix = reader.getAttributePrefix(i);
- String namespace = reader.getAttributeNamespace(i);
- if (ObjectHelper.isNotEmpty(namespace)) {
- startPrefixMapping(prefix, namespace);
- }
- }
- getContentHandler().startElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName),
- getAttributes());
- }
- else {
- getContentHandler().startElement("", "", toQualifiedName(qName), getAttributes());
- }
- }
- }
-
- private void handleEndElement() throws SAXException {
- if (getContentHandler() != null) {
- QName qName = reader.getName();
- if (hasNamespacesFeature()) {
- getContentHandler().endElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName));
- for (int i = 0; i < reader.getNamespaceCount(); i++) {
- String prefix = reader.getNamespacePrefix(i);
- if (prefix == null) {
- prefix = "";
- }
- endPrefixMapping(prefix);
+ if (getLexicalHandler() != null) {
+ getLexicalHandler().endDTD();
}
- }
- else {
- getContentHandler().endElement("", "", toQualifiedName(qName));
- }
}
- }
- private void handleCharacters() throws SAXException {
- if (getContentHandler() != null && reader.isWhiteSpace()) {
- getContentHandler()
- .ignorableWhitespace(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
- return;
- }
- if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
- getLexicalHandler().startCDATA();
+ private void handleEntityReference() throws SAXException {
+ if (getLexicalHandler() != null) {
+ getLexicalHandler().startEntity(reader.getLocalName());
+ }
+ if (getLexicalHandler() != null) {
+ getLexicalHandler().endEntity(reader.getLocalName());
+ }
}
- if (getContentHandler() != null) {
- getContentHandler().characters(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+
+ private void handleEndDocument() throws SAXException {
+ if (getContentHandler() != null) {
+ getContentHandler().endDocument();
+ }
}
- if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
- getLexicalHandler().endCDATA();
+
+ private void handleProcessingInstruction() throws SAXException {
+ if (getContentHandler() != null) {
+ getContentHandler().processingInstruction(reader.getPITarget(), reader.getPIData());
+ }
}
- }
- private void handleComment() throws SAXException {
- if (getLexicalHandler() != null) {
- getLexicalHandler().comment(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+ private Attributes getAttributes() {
+ AttributesImpl attributes = new AttributesImpl();
+
+ for (int i = 0; i < reader.getAttributeCount(); i++) {
+ String namespace = reader.getAttributeNamespace(i);
+ if (namespace == null || !hasNamespacesFeature()) {
+ namespace = "";
+ }
+ String type = reader.getAttributeType(i);
+ if (type == null) {
+ type = "CDATA";
+ }
+ attributes.addAttribute(namespace, reader.getAttributeLocalName(i),
+ toQualifiedName(reader.getAttributeName(i)), type, reader.getAttributeValue(i));
+ }
+ if (hasNamespacePrefixesFeature()) {
+ for (int i = 0; i < reader.getNamespaceCount(); i++) {
+ String prefix = reader.getNamespacePrefix(i);
+ String namespaceUri = reader.getNamespaceURI(i);
+ String qName;
+ if (ObjectHelper.isNotEmpty(prefix)) {
+ qName = "xmlns:" + prefix;
+ } else {
+ qName = "xmlns";
+ }
+ attributes.addAttribute("", "", qName, "CDATA", namespaceUri);
+ }
+ }
+
+ return attributes;
}
- }
- private void handleDtd() throws SAXException {
- if (getLexicalHandler() != null) {
- javax.xml.stream.Location location = reader.getLocation();
- getLexicalHandler().startDTD(null, location.getPublicId(), location.getSystemId());
+ // AbstractStaxXmlReader
+ @Override
+ public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+ if (NAMESPACES_FEATURE_NAME.equals(name)) {
+ return this.namespacesFeature;
+ } else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) {
+ return this.namespacePrefixesFeature;
+ } else if (IS_STANDALONE_FEATURE_NAME.equals(name)) {
+ if (this.isStandalone != null) {
+ return this.isStandalone;
+ } else {
+ throw new SAXNotSupportedException("startDocument() callback not completed yet");
+ }
+ } else {
+ throw new SAXNotRecognizedException(name);
+ }
}
- if (getLexicalHandler() != null) {
- getLexicalHandler().endDTD();
+
+ @Override
+ public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
+ if (NAMESPACES_FEATURE_NAME.equals(name)) {
+ this.namespacesFeature = value;
+ } else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) {
+ this.namespacePrefixesFeature = value;
+ } else {
+ throw new SAXNotRecognizedException(name);
+ }
}
- }
- private void handleEntityReference() throws SAXException {
- if (getLexicalHandler() != null) {
- getLexicalHandler().startEntity(reader.getLocalName());
+ protected void setStandalone(boolean standalone) {
+ this.isStandalone = standalone;
}
- if (getLexicalHandler() != null) {
- getLexicalHandler().endEntity(reader.getLocalName());
+
+ /**
+ * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces</code> is turned on.
+ */
+ protected boolean hasNamespacesFeature() {
+ return this.namespacesFeature;
}
- }
- private void handleEndDocument() throws SAXException {
- if (getContentHandler() != null) {
- getContentHandler().endDocument();
+ /**
+ * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces-prefixes</code> is turned on.
+ */
+ protected boolean hasNamespacePrefixesFeature() {
+ return this.namespacePrefixesFeature;
}
- }
- private void handleProcessingInstruction() throws SAXException {
- if (getContentHandler() != null) {
- getContentHandler().processingInstruction(reader.getPITarget(), reader.getPIData());
+ /**
+ * Convert a <code>QName</code> to a qualified name, as used by DOM and SAX. The returned string has a format of
+ * <code>prefix:localName</code> if the prefix is set, or just <code>localName</code> if not.
+ *
+ * @param qName the <code>QName</code>
+ * @return the qualified name
+ */
+ protected String toQualifiedName(QName qName) {
+ String prefix = qName.getPrefix();
+ if (!ObjectHelper.isNotEmpty(prefix)) {
+ return qName.getLocalPart();
+ } else {
+ return prefix + ":" + qName.getLocalPart();
+ }
}
- }
- private Attributes getAttributes() {
- AttributesImpl attributes = new AttributesImpl();
+ /**
+ * Parse the StAX XML reader passed at construction-time.
+ * <p>
+ * <b>NOTE:</b>: The given <code>InputSource</code> is not read, but ignored.
+ *
+ * @param ignored is ignored
+ * @throws SAXException a SAX exception, possibly wrapping a <code>XMLStreamException</code>
+ */
+ @Override
+ public final void parse(InputSource ignored) throws SAXException {
+ parse();
+ }
- for (int i = 0; i < reader.getAttributeCount(); i++) {
- String namespace = reader.getAttributeNamespace(i);
- if (namespace == null || !hasNamespacesFeature()) {
- namespace = "";
- }
- String type = reader.getAttributeType(i);
- if (type == null) {
- type = "CDATA";
- }
- attributes.addAttribute(namespace, reader.getAttributeLocalName(i),
- toQualifiedName(reader.getAttributeName(i)), type, reader.getAttributeValue(i));
+ /**
+ * Parse the StAX XML reader passed at construction-time.
+ * <p>
+ * <b>NOTE:</b>: The given system identifier is not read, but ignored.
+ *
+ * @param ignored is ignored
+ * @throws SAXException A SAX exception, possibly wrapping a <code>XMLStreamException</code>
+ */
+ @Override
+ public final void parse(String ignored) throws SAXException {
+ parse();
+ }
+
+ private void parse() throws SAXException {
+ try {
+ parseInternal();
+ } catch (XMLStreamException ex) {
+ Locator locator = null;
+ if (ex.getLocation() != null) {
+ locator = new StaxLocator(ex.getLocation());
+ }
+ SAXParseException saxException = new SAXParseException(ex.getMessage(), locator, ex);
+ if (getErrorHandler() != null) {
+ getErrorHandler().fatalError(saxException);
+ } else {
+ throw saxException;
+ }
+ }
}
- if (hasNamespacePrefixesFeature()) {
- for (int i = 0; i < reader.getNamespaceCount(); i++) {
- String prefix = reader.getNamespacePrefix(i);
- String namespaceUri = reader.getNamespaceURI(i);
- String qName;
- if (ObjectHelper.isNotEmpty(prefix)) {
- qName = "xmlns:" + prefix;
+
+ /**
+ * Starts the prefix mapping for the given prefix.
+ *
+ * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String)
+ */
+ protected void startPrefixMapping(String prefix, String namespace) throws SAXException {
+ if (getContentHandler() != null) {
+ if (prefix == null) {
+ prefix = "";
+ }
+ if (!ObjectHelper.isNotEmpty(namespace)) {
+ return;
+ }
+ if (!namespace.equals(namespaces.get(prefix))) {
+ getContentHandler().startPrefixMapping(prefix, namespace);
+ namespaces.put(prefix, namespace);
+ }
}
- else {
- qName = "xmlns";
+ }
+
+ /**
+ * Ends the prefix mapping for the given prefix.
+ *
+ * @see org.xml.sax.ContentHandler#endPrefixMapping(String)
+ */
+ protected void endPrefixMapping(String prefix) throws SAXException {
+ if (getContentHandler() != null) {
+ if (namespaces.containsKey(prefix)) {
+ getContentHandler().endPrefixMapping(prefix);
+ namespaces.remove(prefix);
+ }
}
- attributes.addAttribute("", "", qName, "CDATA", namespaceUri);
- }
}
- return attributes;
- }
+ /**
+ * Implementation of the <code>Locator</code> interface that is based on a StAX <code>Location</code>.
+ *
+ * @see Locator
+ * @see Location
+ */
+ private static class StaxLocator implements Locator {
- // AbstractStaxXmlReader
- @Override
- public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
- if (NAMESPACES_FEATURE_NAME.equals(name)) {
- return this.namespacesFeature;
- }
- else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) {
- return this.namespacePrefixesFeature;
- }
- else if (IS_STANDALONE_FEATURE_NAME.equals(name)) {
- if (this.isStandalone != null) {
- return this.isStandalone;
- }
- else {
- throw new SAXNotSupportedException("startDocument() callback not completed yet");
- }
- }
- else {
- throw new SAXNotRecognizedException(name);
- }
- }
-
- @Override
- public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
- if (NAMESPACES_FEATURE_NAME.equals(name)) {
- this.namespacesFeature = value;
- }
- else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) {
- this.namespacePrefixesFeature = value;
- }
- else {
- throw new SAXNotRecognizedException(name);
- }
- }
-
- protected void setStandalone(boolean standalone) {
- this.isStandalone = standalone;
- }
-
- /**
- * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces</code> is turned on.
- */
- protected boolean hasNamespacesFeature() {
- return this.namespacesFeature;
- }
-
- /**
- * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces-prefixes</code> is turned on.
- */
- protected boolean hasNamespacePrefixesFeature() {
- return this.namespacePrefixesFeature;
- }
-
- /**
- * Convert a <code>QName</code> to a qualified name, as used by DOM and SAX.
- * The returned string has a format of <code>prefix:localName</code> if the
- * prefix is set, or just <code>localName</code> if not.
- * @param qName the <code>QName</code>
- * @return the qualified name
- */
- protected String toQualifiedName(QName qName) {
- String prefix = qName.getPrefix();
- if (!ObjectHelper.isNotEmpty(prefix)) {
- return qName.getLocalPart();
- }
- else {
- return prefix + ":" + qName.getLocalPart();
- }
- }
-
-
- /**
- * Parse the StAX XML reader passed at construction-time.
- * <p><b>NOTE:</b>: The given <code>InputSource</code> is not read, but ignored.
- * @param ignored is ignored
- * @throws SAXException a SAX exception, possibly wrapping a <code>XMLStreamException</code>
- */
- @Override
- public final void parse(InputSource ignored) throws SAXException {
- parse();
- }
-
- /**
- * Parse the StAX XML reader passed at construction-time.
- * <p><b>NOTE:</b>: The given system identifier is not read, but ignored.
- * @param ignored is ignored
- * @throws SAXException A SAX exception, possibly wrapping a <code>XMLStreamException</code>
- */
- @Override
- public final void parse(String ignored) throws SAXException {
- parse();
- }
-
- private void parse() throws SAXException {
- try {
- parseInternal();
- } catch (XMLStreamException ex) {
- Locator locator = null;
- if (ex.getLocation() != null) {
- locator = new StaxLocator(ex.getLocation());
- }
- SAXParseException saxException = new SAXParseException(ex.getMessage(), locator, ex);
- if (getErrorHandler() != null) {
- getErrorHandler().fatalError(saxException);
- }
- else {
- throw saxException;
- }
- }
- }
-
- /**
- * Starts the prefix mapping for the given prefix.
- * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String)
- */
- protected void startPrefixMapping(String prefix, String namespace) throws SAXException {
- if (getContentHandler() != null) {
- if (prefix == null) {
- prefix = "";
- }
- if (!ObjectHelper.isNotEmpty(namespace)) {
- return;
- }
- if (!namespace.equals(namespaces.get(prefix))) {
- getContentHandler().startPrefixMapping(prefix, namespace);
- namespaces.put(prefix, namespace);
- }
- }
- }
-
- /**
- * Ends the prefix mapping for the given prefix.
- * @see org.xml.sax.ContentHandler#endPrefixMapping(String)
- */
- protected void endPrefixMapping(String prefix) throws SAXException {
- if (getContentHandler() != null) {
- if (namespaces.containsKey(prefix)) {
- getContentHandler().endPrefixMapping(prefix);
- namespaces.remove(prefix);
- }
- }
- }
-
- /**
- * Implementation of the <code>Locator</code> interface that is based on a StAX <code>Location</code>.
- * @see Locator
- * @see Location
- */
- private static class StaxLocator implements Locator {
-
- private Location location;
-
- protected StaxLocator(Location location) {
- this.location = location;
- }
+ private Location location;
- @Override
+ protected StaxLocator(Location location) {
+ this.location = location;
+ }
+
+ @Override
public String getPublicId() {
- return location.getPublicId();
- }
+ return location.getPublicId();
+ }
- @Override
+ @Override
public String getSystemId() {
- return location.getSystemId();
- }
+ return location.getSystemId();
+ }
- @Override
+ @Override
public int getLineNumber() {
- return location.getLineNumber();
- }
+ return location.getLineNumber();
+ }
- @Override
+ @Override
public int getColumnNumber() {
- return location.getColumnNumber();
+ return location.getColumnNumber();
+ }
}
- }
// AbstractXMLReader
@Override
public ContentHandler getContentHandler() {
- return contentHandler;
- }
+ return contentHandler;
+ }
- @Override
+ @Override
public void setContentHandler(ContentHandler contentHandler) {
- this.contentHandler = contentHandler;
- }
+ this.contentHandler = contentHandler;
+ }
- @Override
+ @Override
public void setDTDHandler(DTDHandler dtdHandler) {
- this.dtdHandler = dtdHandler;
- }
+ this.dtdHandler = dtdHandler;
+ }
- @Override
+ @Override
public DTDHandler getDTDHandler() {
- return dtdHandler;
- }
+ return dtdHandler;
+ }
- @Override
+ @Override
public EntityResolver getEntityResolver() {
- return entityResolver;
- }
+ return entityResolver;
+ }
- @Override
+ @Override
public void setEntityResolver(EntityResolver entityResolver) {
- this.entityResolver = entityResolver;
- }
+ this.entityResolver = entityResolver;
+ }
- @Override
+ @Override
public ErrorHandler getErrorHandler() {
- return errorHandler;
- }
+ return errorHandler;
+ }
- @Override
+ @Override
public void setErrorHandler(ErrorHandler errorHandler) {
- this.errorHandler = errorHandler;
- }
-
- protected LexicalHandler getLexicalHandler() {
- return lexicalHandler;
- }
-
- /**
- * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
- * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
- */
- @Override
- public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
- if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
- return lexicalHandler;
+ this.errorHandler = errorHandler;
}
- else {
- throw new SAXNotRecognizedException(name);
+
+ protected LexicalHandler getLexicalHandler() {
+ return lexicalHandler;
}
- }
- /**
- * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
- * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
- */
- @Override
- public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
- if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
- lexicalHandler = (LexicalHandler) value;
+ /**
+ * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
+ * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
+ */
+ @Override
+ public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+ if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
+ return lexicalHandler;
+ } else {
+ throw new SAXNotRecognizedException(name);
+ }
}
- else {
- throw new SAXNotRecognizedException(name);
+
+ /**
+ * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
+ * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
+ */
+ @Override
+ public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
+ if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
+ lexicalHandler = (LexicalHandler) value;
+ } else {
+ throw new SAXNotRecognizedException(name);
+ }
}
- }
}
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index fa50a01dd6b..9d9b0bd4c55 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -62,7 +62,6 @@ import org.apache.camel.util.StringHelper;
@SuppressWarnings("unused")
public abstract class AbstractCamelCatalog {
-
private static final Pattern SYNTAX_PATTERN = Pattern.compile("([\\w.]+)");
private static final Pattern ENV_OR_SYS_PATTERN = Pattern.compile("\\{\\{(env|sys):\\w+\\}\\}");
private static final Pattern SYNTAX_DASH_PATTERN = Pattern.compile("([\\w.-]+)");
@@ -162,9 +161,10 @@ public abstract class AbstractCamelCatalog {
return validateProperties(scheme, properties, lenient, false, false);
}
- private EndpointValidationResult validateProperties(String scheme, Map<String, String> properties,
- boolean lenient, boolean consumerOnly,
- boolean producerOnly) {
+ private EndpointValidationResult validateProperties(
+ String scheme, Map<String, String> properties,
+ boolean lenient, boolean consumerOnly,
+ boolean producerOnly) {
EndpointValidationResult result = new EndpointValidationResult(scheme);
ComponentModel model = componentModel(scheme);
@@ -344,10 +344,12 @@ public abstract class AbstractCamelCatalog {
String key2 = apiSyntax.length > 1 ? properties.get(apiSyntax[1]) : null;
if (key1 != null && key2 != null) {
- ApiModel api = model.getApiOptions().stream().filter(o -> o.getName().equalsIgnoreCase(key1)).findFirst().orElse(null);
+ ApiModel api = model.getApiOptions().stream().filter(o -> o.getName().equalsIgnoreCase(key1)).findFirst()
+ .orElse(null);
if (api == null) {
result.addInvalidEnum(apiSyntax[0], key1);
- result.addInvalidEnumChoices(apiSyntax[0], model.getApiOptions().stream().map(ApiModel::getName).toArray(String[]::new));
+ result.addInvalidEnumChoices(apiSyntax[0],
+ model.getApiOptions().stream().map(ApiModel::getName).toArray(String[]::new));
} else {
// walk each method and match against its name/alias
boolean found = false;
@@ -404,7 +406,8 @@ public abstract class AbstractCamelCatalog {
}
}
- private void handleNotFound(ConfigurationPropertiesValidationResult result, String value, String longKey, List<String> enums) {
+ private void handleNotFound(
+ ConfigurationPropertiesValidationResult result, String value, String longKey, List<String> enums) {
result.addInvalidEnum(longKey, value);
result.addInvalidEnumChoices(longKey, enums.toArray(new String[0]));
if (suggestionStrategy != null) {
@@ -416,7 +419,8 @@ public abstract class AbstractCamelCatalog {
}
}
- public EndpointValidationResult validateEndpointProperties(String uri, boolean ignoreLenientProperties, boolean consumerOnly, boolean producerOnly) {
+ public EndpointValidationResult validateEndpointProperties(
+ String uri, boolean ignoreLenientProperties, boolean consumerOnly, boolean producerOnly) {
try {
URI u = URISupport.normalizeUri(uri);
String scheme = u.getScheme();
@@ -688,7 +692,8 @@ public abstract class AbstractCamelCatalog {
Map<String, Object> values = URISupport.extractProperties(parameters, prefix);
// build a string with the extra multi valued options with the prefix and & as separator
String csb = values.entrySet().stream()
- .map(multi -> prefix + multi.getKey() + "=" + (multi.getValue() != null ? multi.getValue().toString() : ""))
+ .map(multi -> prefix + multi.getKey() + "="
+ + (multi.getValue() != null ? multi.getValue().toString() : ""))
.collect(Collectors.joining("&"));
// append the extra multi-values to the existing (which contains the first multi value)
if (!csb.isEmpty()) {
@@ -715,7 +720,8 @@ public abstract class AbstractCamelCatalog {
String ecKey2 = StringHelper.asEnumConstantValue(key2);
for (ApiModel am : model.getApiOptions()) {
String aKey = am.getName();
- if (aKey.equalsIgnoreCase("DEFAULT") || aKey.equalsIgnoreCase(key) || aKey.equalsIgnoreCase(ecKey) || aKey.equalsIgnoreCase(dashKey)) {
+ if (aKey.equalsIgnoreCase("DEFAULT") || aKey.equalsIgnoreCase(key) || aKey.equalsIgnoreCase(ecKey)
+ || aKey.equalsIgnoreCase(dashKey)) {
am.getMethods().stream()
.filter(m -> {
if (key2 == null) {
@@ -723,7 +729,8 @@ public abstract class AbstractCamelCatalog {
return true;
}
String name = m.getName();
- if (name.equalsIgnoreCase(key2) || name.equalsIgnoreCase(ecKey2) || name.equalsIgnoreCase(dashKey2)) {
+ if (name.equalsIgnoreCase(key2) || name.equalsIgnoreCase(ecKey2)
+ || name.equalsIgnoreCase(dashKey2)) {
return true;
}
// is there an alias then we need to compute the alias key and compare against the key2
@@ -731,7 +738,8 @@ public abstract class AbstractCamelCatalog {
if (key3 != null) {
String dashKey3 = StringHelper.camelCaseToDash(key3);
String ecKey3 = StringHelper.asEnumConstantValue(key3);
- if (key2.equalsIgnoreCase(key3) || ecKey2.equalsIgnoreCase(ecKey3) || dashKey2.equalsIgnoreCase(dashKey3)) {
+ if (key2.equalsIgnoreCase(key3) || ecKey2.equalsIgnoreCase(ecKey3)
+ || dashKey2.equalsIgnoreCase(dashKey3)) {
return true;
}
}
@@ -822,7 +830,8 @@ public abstract class AbstractCamelCatalog {
return doAsEndpointUri(scheme, properties, "&", encode);
}
- String doAsEndpointUri(String scheme, Map<String, String> properties, String ampersand, boolean encode) throws URISyntaxException {
+ String doAsEndpointUri(String scheme, Map<String, String> properties, String ampersand, boolean encode)
+ throws URISyntaxException {
// grab the syntax
ComponentModel model = componentModel(scheme);
if (model == null) {
@@ -1087,12 +1096,12 @@ public abstract class AbstractCamelCatalog {
String name = key.substring(0, idx);
String option = key.substring(idx + 1);
- if (value != null) {
+ if (value != null) {
BaseModel<?> model = loader.apply(name);
- if (model == null) {
- result.addUnknownComponent(name);
- return result;
- }
+ if (model == null) {
+ result.addUnknownComponent(name);
+ return result;
+ }
Map<String, BaseOptionModel> rows = new HashMap<>();
model.getOptions().forEach(o -> rows.put(o.getName(), o));
@@ -1160,10 +1169,11 @@ public abstract class AbstractCamelCatalog {
return result;
}
- private void doValidateConfigurationProperty(ConfigurationPropertiesValidationResult result,
- Map<String, BaseOptionModel> rows,
- String name, String value, String longKey,
- String lookupKey, String suffix) {
+ private void doValidateConfigurationProperty(
+ ConfigurationPropertiesValidationResult result,
+ Map<String, BaseOptionModel> rows,
+ String name, String value, String longKey,
+ String lookupKey, String suffix) {
// find option
String rowKey = rows.keySet().stream()
@@ -1274,21 +1284,20 @@ public abstract class AbstractCamelCatalog {
}
}
-
private static boolean acceptConfigurationPropertyKey(String key) {
if (key == null) {
return false;
}
return key.startsWith("camel.component.")
- || key.startsWith("camel.dataformat.")
- || key.startsWith("camel.language.")
- || key.startsWith("camel.main.")
- || key.startsWith("camel.resilience4j.")
- || key.startsWith("camel.faulttolerance.")
- || key.startsWith("camel.threadpool.")
- || key.startsWith("camel.health.")
- || key.startsWith("camel.lra.")
- || key.startsWith("camel.rest.");
+ || key.startsWith("camel.dataformat.")
+ || key.startsWith("camel.language.")
+ || key.startsWith("camel.main.")
+ || key.startsWith("camel.resilience4j.")
+ || key.startsWith("camel.faulttolerance.")
+ || key.startsWith("camel.threadpool.")
+ || key.startsWith("camel.health.")
+ || key.startsWith("camel.lra.")
+ || key.startsWith("camel.rest.");
}
private LanguageValidationResult doValidateSimple(ClassLoader classLoader, String simple, boolean predicate) {
@@ -1405,7 +1414,8 @@ public abstract class AbstractCamelCatalog {
}
}
- private LanguageValidationResult doValidateLanguage(ClassLoader classLoader, String language, String text, boolean predicate) {
+ private LanguageValidationResult doValidateLanguage(
+ ClassLoader classLoader, String language, String text, boolean predicate) {
if (classLoader == null) {
classLoader = getClass().getClassLoader();
}
@@ -1553,8 +1563,8 @@ public abstract class AbstractCamelCatalog {
/**
* Converts the string from dash format into camel case (hello-great-world -> helloGreatWorld)
*
- * @param text the string
- * @return the string camel cased
+ * @param text the string
+ * @return the string camel cased
*/
private static String dashToCamelCase(String text) {
if (text == null) {
@@ -1582,5 +1592,4 @@ public abstract class AbstractCamelCatalog {
return sb.toString();
}
-
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index fea6a5e405f..49695a93d8f 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -708,7 +708,8 @@ public class SimplePredicateParser extends BaseSimpleParser {
expect(TokenType.whiteSpace);
}
} else {
- throw new SimpleParserException("Binary operator " + operatorType + " does not support token " + token, token.getIndex());
+ throw new SimpleParserException(
+ "Binary operator " + operatorType + " does not support token " + token, token.getIndex());
}
return true;
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
index 35e3cd6bcd2..46c24968580 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
@@ -145,16 +145,22 @@ public enum BinaryOperatorType {
/**
* Parameter types a binary operator supports on the right hand side.
* <ul>
- * <li>Literal - Only literals enclosed by single quotes</li>
- * <li>LiteralWithFunction - literals which may have embedded functions enclosed by single quotes</li>
- * <li>Function - A function</li>
- * <li>NumericValue - A numeric value</li>
- * <li>BooleanValue - A boolean value</li>
- * <li>NullValue - A null value</li>
+ * <li>Literal - Only literals enclosed by single quotes</li>
+ * <li>LiteralWithFunction - literals which may have embedded functions enclosed by single quotes</li>
+ * <li>Function - A function</li>
+ * <li>NumericValue - A numeric value</li>
+ * <li>BooleanValue - A boolean value</li>
+ * <li>NullValue - A null value</li>
* </ul>
*/
public enum ParameterType {
- Literal, LiteralWithFunction, Function, NumericValue, BooleanValue, NullValue, MinusValue;
+ Literal,
+ LiteralWithFunction,
+ Function,
+ NumericValue,
+ BooleanValue,
+ NullValue,
+ MinusValue;
public boolean isLiteralSupported() {
return this == Literal;
@@ -188,8 +194,8 @@ public enum BinaryOperatorType {
/**
* Returns the types of right hand side parameters this operator supports.
*
- * @param operator the operator
- * @return <tt>null</tt> if accepting all types, otherwise the array of accepted types
+ * @param operator the operator
+ * @return <tt>null</tt> if accepting all types, otherwise the array of accepted types
*/
public static ParameterType[] supportedParameterTypes(BinaryOperatorType operator) {
if (operator == EQ) {
@@ -217,21 +223,21 @@ public enum BinaryOperatorType {
} else if (operator == NOT_CONTAINS_IGNORECASE) {
return null;
} else if (operator == REGEX) {
- return new ParameterType[]{ParameterType.Literal, ParameterType.Function};
+ return new ParameterType[] { ParameterType.Literal, ParameterType.Function };
} else if (operator == NOT_REGEX) {
- return new ParameterType[]{ParameterType.Literal, ParameterType.Function};
+ return new ParameterType[] { ParameterType.Literal, ParameterType.Function };
} else if (operator == IN) {
return null;
} else if (operator == NOT_IN) {
return null;
} else if (operator == IS) {
- return new ParameterType[]{ParameterType.LiteralWithFunction, ParameterType.Function};
+ return new ParameterType[] { ParameterType.LiteralWithFunction, ParameterType.Function };
} else if (operator == NOT_IS) {
- return new ParameterType[]{ParameterType.LiteralWithFunction, ParameterType.Function};
+ return new ParameterType[] { ParameterType.LiteralWithFunction, ParameterType.Function };
} else if (operator == RANGE) {
- return new ParameterType[]{ParameterType.LiteralWithFunction, ParameterType.Function};
+ return new ParameterType[] { ParameterType.LiteralWithFunction, ParameterType.Function };
} else if (operator == NOT_RANGE) {
- return new ParameterType[]{ParameterType.LiteralWithFunction, ParameterType.Function};
+ return new ParameterType[] { ParameterType.LiteralWithFunction, ParameterType.Function };
} else if (operator == STARTS_WITH) {
return null;
} else if (operator == ENDS_WITH) {
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 90c9882a7ef..cac0f2cce9b 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -817,7 +817,8 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
protected Processor createProcessor(ProcessorDefinition<?> output) throws Exception {
// ensure node has id assigned
String outputId = output.idOrCreate(camelContext.getCamelContextExtension().getContextPlugin(NodeIdFactory.class));
- StartupStep step = camelContext.getCamelContextExtension().getStartupStepRecorder().beginStep(ProcessorReifier.class, outputId, "Create processor");
+ StartupStep step = camelContext.getCamelContextExtension().getStartupStepRecorder().beginStep(ProcessorReifier.class,
+ outputId, "Create processor");
Processor processor = null;
// at first use custom factory
@@ -902,8 +903,8 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
* configured executor services in the same coherent way.
*
* @param definition the node definition which may leverage aggregation strategy
- * @throws IllegalArgumentException is thrown if lookup of aggregation strategy in {@link org.apache.camel.spi.Registry}
- * was not found
+ * @throws IllegalArgumentException is thrown if lookup of aggregation strategy in
+ * {@link org.apache.camel.spi.Registry} was not found
*/
public AggregationStrategy getConfiguredAggregationStrategy(AggregationStrategyAwareDefinition definition) {
AggregationStrategy strategy = definition.getAggregationStrategyBean();
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index f20374b6462..92a0d7963ca 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -266,7 +266,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
AsyncProcessorAwaitManager asyncProcessorAwaitManager = getBeanForType(AsyncProcessorAwaitManager.class);
if (asyncProcessorAwaitManager != null) {
LOG.info("Using custom AsyncProcessorAwaitManager: {}", asyncProcessorAwaitManager);
- getContext().getCamelContextExtension().addContextPlugin(AsyncProcessorAwaitManager.class, asyncProcessorAwaitManager);
+ getContext().getCamelContextExtension().addContextPlugin(AsyncProcessorAwaitManager.class,
+ asyncProcessorAwaitManager);
}
ManagementStrategy managementStrategy = getBeanForType(ManagementStrategy.class);
if (managementStrategy != null) {
@@ -320,7 +321,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
}
// set endpoint strategies if defined
- Map<String, EndpointStrategy> endpointStrategies = getContext().getRegistry().findByTypeWithName(EndpointStrategy.class);
+ Map<String, EndpointStrategy> endpointStrategies
+ = getContext().getRegistry().findByTypeWithName(EndpointStrategy.class);
if (endpointStrategies != null && !endpointStrategies.isEmpty()) {
for (Entry<String, EndpointStrategy> entry : endpointStrategies.entrySet()) {
EndpointStrategy strategy = entry.getValue();
@@ -335,7 +337,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
getContext().setShutdownStrategy(shutdownStrategy);
}
// add global interceptors
- Map<String, InterceptStrategy> interceptStrategies = getContext().getRegistry().findByTypeWithName(InterceptStrategy.class);
+ Map<String, InterceptStrategy> interceptStrategies
+ = getContext().getRegistry().findByTypeWithName(InterceptStrategy.class);
if (interceptStrategies != null && !interceptStrategies.isEmpty()) {
for (Entry<String, InterceptStrategy> entry : interceptStrategies.entrySet()) {
InterceptStrategy strategy = entry.getValue();
@@ -347,7 +350,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
}
// set the lifecycle strategy if defined
- Map<String, LifecycleStrategy> lifecycleStrategies = getContext().getRegistry().findByTypeWithName(LifecycleStrategy.class);
+ Map<String, LifecycleStrategy> lifecycleStrategies
+ = getContext().getRegistry().findByTypeWithName(LifecycleStrategy.class);
if (lifecycleStrategies != null && !lifecycleStrategies.isEmpty()) {
for (Entry<String, LifecycleStrategy> entry : lifecycleStrategies.entrySet()) {
LifecycleStrategy strategy = entry.getValue();
@@ -359,19 +363,22 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
}
// set the node lifecycle strategy if defined
- Map<String, ModelLifecycleStrategy> modelLifecycleStrategies = getContext().getRegistry().findByTypeWithName(ModelLifecycleStrategy.class);
+ Map<String, ModelLifecycleStrategy> modelLifecycleStrategies
+ = getContext().getRegistry().findByTypeWithName(ModelLifecycleStrategy.class);
if (modelLifecycleStrategies != null && !modelLifecycleStrategies.isEmpty()) {
for (Entry<String, ModelLifecycleStrategy> entry : modelLifecycleStrategies.entrySet()) {
ModelLifecycleStrategy strategy = entry.getValue();
ModelCamelContext mcc = getContext();
if (!mcc.getModelLifecycleStrategies().contains(strategy)) {
- LOG.info("Using custom ModelLifecycleStrategy with id: {} and implementation: {}", entry.getKey(), strategy);
+ LOG.info("Using custom ModelLifecycleStrategy with id: {} and implementation: {}", entry.getKey(),
+ strategy);
mcc.addModelLifecycleStrategy(strategy);
}
}
}
// cluster service
- Map<String, CamelClusterService> clusterServices = getContext().getRegistry().findByTypeWithName(CamelClusterService.class);
+ Map<String, CamelClusterService> clusterServices
+ = getContext().getRegistry().findByTypeWithName(CamelClusterService.class);
if (clusterServices != null && !clusterServices.isEmpty()) {
for (Entry<String, CamelClusterService> entry : clusterServices.entrySet()) {
CamelClusterService service = entry.getValue();
@@ -394,7 +401,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
}
// add route policy factories
- Map<String, RoutePolicyFactory> routePolicyFactories = getContext().getRegistry().findByTypeWithName(RoutePolicyFactory.class);
+ Map<String, RoutePolicyFactory> routePolicyFactories
+ = getContext().getRegistry().findByTypeWithName(RoutePolicyFactory.class);
if (routePolicyFactories != null && !routePolicyFactories.isEmpty()) {
for (Entry<String, RoutePolicyFactory> entry : routePolicyFactories.entrySet()) {
RoutePolicyFactory factory = entry.getValue();
@@ -454,7 +462,8 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
if (logListeners != null && !logListeners.isEmpty()) {
for (Map.Entry<String, LogListener> entry : logListeners.entrySet()) {
LogListener logListener = entry.getValue();
- if (getContext().getCamelContextExtension().getLogListeners() == null || !getContext().getCamelContextExtension().getLogListeners().contains(logListener)) {
+ if (getContext().getCamelContextExtension().getLogListeners() == null
+ || !getContext().getCamelContextExtension().getLogListeners().contains(logListener)) {
LOG.info("Using custom LogListener with id: {} and implementation: {}", entry.getKey(), logListener);
getContext().getCamelContextExtension().addLogListener(logListener);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
index 45f19bb8679..e05d74e0ecf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
@@ -309,7 +309,7 @@ public class ObjectHelperTest {
@Test
void testCreateIteratorWithPrimitiveArrayTypes() {
- Iterator<?> it = ObjectHelper.createIterator(new byte[] {13, Byte.MAX_VALUE, 7, Byte.MIN_VALUE}, null);
+ Iterator<?> it = ObjectHelper.createIterator(new byte[] { 13, Byte.MAX_VALUE, 7, Byte.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals((byte) 13, it.next());
assertTrue(it.hasNext());
@@ -339,7 +339,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new short[] {13, Short.MAX_VALUE, 7, Short.MIN_VALUE}, null);
+ it = ObjectHelper.createIterator(new short[] { 13, Short.MAX_VALUE, 7, Short.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals((short) 13, it.next());
assertTrue(it.hasNext());
@@ -369,7 +369,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new int[] {13, Integer.MAX_VALUE, 7, Integer.MIN_VALUE}, null);
+ it = ObjectHelper.createIterator(new int[] { 13, Integer.MAX_VALUE, 7, Integer.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals(13, it.next());
assertTrue(it.hasNext());
@@ -399,7 +399,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new long[] {13L, Long.MAX_VALUE, 7L, Long.MIN_VALUE}, null);
+ it = ObjectHelper.createIterator(new long[] { 13L, Long.MAX_VALUE, 7L, Long.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals(13L, it.next());
assertTrue(it.hasNext());
@@ -429,7 +429,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new float[] {13.7F, Float.MAX_VALUE, 7.13F, Float.MIN_VALUE}, null);
+ it = ObjectHelper.createIterator(new float[] { 13.7F, Float.MAX_VALUE, 7.13F, Float.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals(13.7F, it.next());
assertTrue(it.hasNext());
@@ -459,7 +459,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new double[] {13.7D, Double.MAX_VALUE, 7.13D, Double.MIN_VALUE}, null);
+ it = ObjectHelper.createIterator(new double[] { 13.7D, Double.MAX_VALUE, 7.13D, Double.MIN_VALUE }, null);
assertTrue(it.hasNext());
assertEquals(13.7D, it.next());
assertTrue(it.hasNext());
@@ -489,7 +489,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new char[] {'C', 'a', 'm', 'e', 'l'}, null);
+ it = ObjectHelper.createIterator(new char[] { 'C', 'a', 'm', 'e', 'l' }, null);
assertTrue(it.hasNext());
assertEquals('C', it.next());
assertTrue(it.hasNext());
@@ -521,7 +521,7 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
- it = ObjectHelper.createIterator(new boolean[] {false, true, false, true, true}, null);
+ it = ObjectHelper.createIterator(new boolean[] { false, true, false, true, true }, null);
assertTrue(it.hasNext());
assertEquals(Boolean.FALSE, it.next());
assertTrue(it.hasNext());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
index 8eb5702774c..180c5a273f4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
@@ -46,7 +46,8 @@ public final class AsyncProcessorConverterHelper {
* Creates a {@link AsyncProcessor} that delegates to the given processor. It is important that this implements
* {@link DelegateProcessor}
*/
- private static class ProcessorToAsyncProcessorBridge implements DelegateProcessor, AsyncProcessor, Navigate<Processor>, Service {
+ private static class ProcessorToAsyncProcessorBridge
+ implements DelegateProcessor, AsyncProcessor, Navigate<Processor>, Service {
protected final Processor processor;
private ProcessorToAsyncProcessorBridge(Processor processor) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index b2674ead567..136a206b3c1 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -67,8 +67,8 @@ public class ExpressionBuilder {
* <p/>
* Will fallback and look in properties if not found in headers.
*
- * @param headerName the name of the header the expression will return
- * @return an expression object which will return the header value
+ * @param headerName the name of the header the expression will return
+ * @return an expression object which will return the header value
*/
public static Expression headerExpression(final String headerName) {
return headerExpression(simpleExpression(headerName));
@@ -79,8 +79,8 @@ public class ExpressionBuilder {
* <p/>
* Will fallback and look in properties if not found in headers.
*
- * @param headerName the name of the header the expression will return
- * @return an expression object which will return the header value
+ * @param headerName the name of the header the expression will return
+ * @return an expression object which will return the header value
*/
public static Expression headerExpression(final Expression headerName) {
return new ExpressionAdapter() {
@@ -112,9 +112,9 @@ public class ExpressionBuilder {
* <p/>
* Will fallback and look in properties if not found in headers.
*
- * @param headerName the name of the header the expression will return
- * @param type the type to convert to
- * @return an expression object which will return the header value
+ * @param headerName the name of the header the expression will return
+ * @param type the type to convert to
+ * @return an expression object which will return the header value
*/
public static <T> Expression headerExpression(final String headerName, final Class<T> type) {
return headerExpression(simpleExpression(headerName), constantExpression(type.getName()));
@@ -125,9 +125,9 @@ public class ExpressionBuilder {
* <p/>
* Will fallback and look in properties if not found in headers.
*
- * @param headerName the name of the header the expression will return
- * @param typeName the type to convert to as a FQN class name
- * @return an expression object which will return the header value
+ * @param headerName the name of the header the expression will return
+ * @param typeName the type to convert to as a FQN class name
+ * @return an expression object which will return the header value
*/
public static Expression headerExpression(final String headerName, final String typeName) {
return headerExpression(simpleExpression(headerName), simpleExpression(typeName));
@@ -138,9 +138,9 @@ public class ExpressionBuilder {
* <p/>
* Will fallback and look in properties if not found in headers.
*
- * @param headerName the name of the header the expression will return
- * @param typeName the type to convert to as a FQN class name
- * @return an expression object which will return the header value
+ * @param headerName the name of the header the expression will return
+ * @param typeName the type to convert to as a FQN class name
+ * @return an expression object which will return the header value
*/
public static Expression headerExpression(final Expression headerName, final Expression typeName) {
return new ExpressionAdapter() {
@@ -200,7 +200,7 @@ public class ExpressionBuilder {
/**
* Returns an expression for the exchange pattern
*
- * @see Exchange#getPattern()
+ * @see Exchange#getPattern()
* @return an expression object which will return the exchange pattern
*/
public static Expression exchangePatternExpression() {
@@ -220,7 +220,7 @@ public class ExpressionBuilder {
/**
* Returns an expression for an exception set on the exchange
*
- * @see Exchange#getException()
+ * @see Exchange#getException()
* @return an expression object which will return the exception set on the exchange
*/
public static Expression exchangeExceptionExpression() {
@@ -244,11 +244,11 @@ public class ExpressionBuilder {
/**
* Returns an expression for an exception set on the exchange
* <p/>
- * Is used to get the caused exception that typically have been wrapped in some sort
- * of Camel wrapper exception
- * @param type the exception type
- * @see Exchange#getException(Class)
- * @return an expression object which will return the exception set on the exchange
+ * Is used to get the caused exception that typically have been wrapped in some sort of Camel wrapper exception
+ *
+ * @param type the exception type
+ * @see Exchange#getException(Class)
+ * @return an expression object which will return the exception set on the exchange
*/
public static Expression exchangeExceptionExpression(final Class<Exception> type) {
return new ExpressionAdapter() {
@@ -464,8 +464,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for the property value of exchange with the given name
*
- * @param propertyName the name of the property the expression will return
- * @return an expression object which will return the property value
+ * @param propertyName the name of the property the expression will return
+ * @return an expression object which will return the property value
*/
public static Expression exchangePropertyExpression(final String propertyName) {
return exchangePropertyExpression(simpleExpression(propertyName));
@@ -474,8 +474,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for the property value of exchange with the given name
*
- * @param propertyName the name of the property the expression will return
- * @return an expression object which will return the property value
+ * @param propertyName the name of the property the expression will return
+ * @return an expression object which will return the property value
*/
public static Expression exchangePropertyExpression(final Expression propertyName) {
return new ExpressionAdapter() {
@@ -545,8 +545,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for the property value of the camel context with the given name
*
- * @param propertyName the name of the property the expression will return
- * @return an expression object which will return the property value
+ * @param propertyName the name of the property the expression will return
+ * @return an expression object which will return the property value
*/
public static Expression camelContextPropertyExpression(final String propertyName) {
return camelContextPropertyExpression(simpleExpression(propertyName));
@@ -555,8 +555,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for the property value of the camel context with the given name
*
- * @param propertyName the name of the property the expression will return
- * @return an expression object which will return the property value
+ * @param propertyName the name of the property the expression will return
+ * @return an expression object which will return the property value
*/
public static Expression camelContextPropertyExpression(final Expression propertyName) {
return new ExpressionAdapter() {
@@ -581,8 +581,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system property value with the given name
*
- * @param propertyName the name of the system property the expression will return
- * @return an expression object which will return the system property value
+ * @param propertyName the name of the system property the expression will return
+ * @return an expression object which will return the system property value
*/
public static Expression systemPropertyExpression(final String propertyName) {
return systemPropertyExpression(propertyName, null);
@@ -591,12 +591,13 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system property value with the given name
*
- * @param propertyName the name of the system property the expression will return
- * @param defaultValue default value to return if no system property exists
- * @return an expression object which will return the system property value
+ * @param propertyName the name of the system property the expression will return
+ * @param defaultValue default value to return if no system property exists
+ * @return an expression object which will return the system property value
*/
- public static Expression systemPropertyExpression(final String propertyName,
- final String defaultValue) {
+ public static Expression systemPropertyExpression(
+ final String propertyName,
+ final String defaultValue) {
Expression exprName = simpleExpression(propertyName);
Expression exprDefault = simpleExpression(defaultValue);
return systemPropertyExpression(exprName, exprDefault);
@@ -605,12 +606,13 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system property value with the given name
*
- * @param exprName the name of the system property the expression will return
- * @param defaultValue default value to return if no system property exists
- * @return an expression object which will return the system property value
+ * @param exprName the name of the system property the expression will return
+ * @param defaultValue default value to return if no system property exists
+ * @return an expression object which will return the system property value
*/
- public static Expression systemPropertyExpression(final Expression exprName,
- final Expression defaultValue) {
+ public static Expression systemPropertyExpression(
+ final Expression exprName,
+ final Expression defaultValue) {
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
@@ -635,8 +637,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system environment value with the given name
*
- * @param propertyName the name of the system environment the expression will return
- * @return an expression object which will return the system property value
+ * @param propertyName the name of the system environment the expression will return
+ * @return an expression object which will return the system property value
*/
public static Expression systemEnvironmentExpression(final String propertyName) {
return systemEnvironmentExpression(propertyName, null);
@@ -645,12 +647,13 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system environment value with the given name
*
- * @param propertyName the name of the system environment the expression will return
- * @param defaultValue default value to return if no system environment exists
- * @return an expression object which will return the system environment value
+ * @param propertyName the name of the system environment the expression will return
+ * @param defaultValue default value to return if no system environment exists
+ * @return an expression object which will return the system environment value
*/
- public static Expression systemEnvironmentExpression(final String propertyName,
- final String defaultValue) {
+ public static Expression systemEnvironmentExpression(
+ final String propertyName,
+ final String defaultValue) {
Expression exprName = simpleExpression(propertyName);
Expression expDefault = simpleExpression(defaultValue);
return systemEnvironmentExpression(exprName, expDefault);
@@ -659,12 +662,13 @@ public class ExpressionBuilder {
/**
* Returns an expression for a system environment value with the given name
*
- * @param propertyName the name of the system environment the expression will return
- * @param defaultValue default value to return if no system environment exists
- * @return an expression object which will return the system environment value
+ * @param propertyName the name of the system environment the expression will return
+ * @param defaultValue default value to return if no system environment exists
+ * @return an expression object which will return the system environment value
*/
- public static Expression systemEnvironmentExpression(final Expression propertyName,
- final Expression defaultValue) {
+ public static Expression systemEnvironmentExpression(
+ final Expression propertyName,
+ final Expression defaultValue) {
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
@@ -693,11 +697,11 @@ public class ExpressionBuilder {
/**
* Returns an expression for the constant value
*
- * @param value the value the expression will return
- * @return an expression object which will return the constant value
+ * @param value the value the expression will return
+ * @return an expression object which will return the constant value
*/
public static Expression constantExpression(final Object value) {
- return new ConstantExpressionAdapter() {
+ return new ConstantExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
return value;
@@ -718,10 +722,10 @@ public class ExpressionBuilder {
/**
* Returns an expression for evaluating the expression/predicate using the given language
*
- * @param languageName the language name
- * @param language the language
- * @param expression the expression or predicate
- * @return an expression object which will evaluate the expression/predicate using the given language
+ * @param languageName the language name
+ * @param language the language
+ * @param expression the expression or predicate
+ * @return an expression object which will evaluate the expression/predicate using the given language
*/
public static Expression languageExpression(final String languageName, final Language language, final String expression) {
return new ExpressionAdapter() {
@@ -748,8 +752,8 @@ public class ExpressionBuilder {
/**
* Returns an expression for evaluating the expression/predicate using the given language
*
- * @param expression the expression or predicate
- * @return an expression object which will evaluate the expression/predicate using the given language
+ * @param expression the expression or predicate
+ * @return an expression object which will evaluate the expression/predicate using the given language
*/
public static Expression languageExpression(final String language, final String expression) {
return new ExpressionAdapter() {
@@ -810,6 +814,7 @@ public class ExpressionBuilder {
return new ExpressionAdapter() {
private boolean enabled;
+
@Override
public Object evaluate(Exchange exchange) {
if (enabled) {
@@ -845,8 +850,7 @@ public class ExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
return function.apply(
- exchange.getIn().getBody()
- );
+ exchange.getIn().getBody());
}
@Override
@@ -864,9 +868,8 @@ public class ExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
return function.apply(
- exchange.getIn().getBody(),
- exchange.getIn().getHeaders()
- );
+ exchange.getIn().getBody(),
+ exchange.getIn().getHeaders());
}
@Override
@@ -884,8 +887,7 @@ public class ExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
return function.apply(
- exchange.getIn().getBody(bodyType)
- );
+ exchange.getIn().getBody(bodyType));
}
@Override
@@ -898,14 +900,14 @@ public class ExpressionBuilder {
/**
* Returns a functional expression for the exchanges inbound message body converted to a desired type and headers
*/
- public static <T> Expression bodyExpression(final Class<T> bodyType, final BiFunction<T, Map<String, Object>, Object> function) {
+ public static <
+ T> Expression bodyExpression(final Class<T> bodyType, final BiFunction<T, Map<String, Object>, Object> function) {
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
return function.apply(
- exchange.getIn().getBody(bodyType),
- exchange.getIn().getHeaders()
- );
+ exchange.getIn().getBody(bodyType),
+ exchange.getIn().getHeaders());
}
@Override
@@ -916,8 +918,7 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the exchanges inbound message body converted
- * to the given type
+ * Returns the expression for the exchanges inbound message body converted to the given type
*/
public static <T> Expression bodyExpression(final Class<T> type) {
return new ExpressionAdapter() {
@@ -934,16 +935,14 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the exchanges inbound message body converted
- * to the given type
+ * Returns the expression for the exchanges inbound message body converted to the given type
*/
public static Expression bodyExpression(final String name) {
return bodyExpression(simpleExpression(name));
}
/**
- * Returns the expression for the exchanges inbound message body converted
- * to the given type
+ * Returns the expression for the exchanges inbound message body converted to the given type
*/
public static Expression bodyExpression(final Expression name) {
return new ExpressionAdapter() {
@@ -975,10 +974,11 @@ public class ExpressionBuilder {
}
/**
- * @param headerName the name of the header from which the input data must be extracted if not empty.
- * @param propertyName the name of the property from which the input data must be extracted if not empty and {@code headerName} is empty.
- * @return a header expression if {@code headerName} is not empty, otherwise a property expression if {@code propertyName} is not empty
- * or finally a body expression.
+ * @param headerName the name of the header from which the input data must be extracted if not empty.
+ * @param propertyName the name of the property from which the input data must be extracted if not empty and
+ * {@code headerName} is empty.
+ * @return a header expression if {@code headerName} is not empty, otherwise a property expression if
+ * {@code propertyName} is not empty or finally a body expression.
*/
public static Expression singleInputExpression(String headerName, String propertyName) {
final Expression exp;
@@ -1052,8 +1052,7 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the exchanges inbound message body converted
- * to the given type.
+ * Returns the expression for the exchanges inbound message body converted to the given type.
* <p/>
* Does <b>not</b> allow null bodies.
*/
@@ -1062,12 +1061,11 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the exchanges inbound message body converted
- * to the given type
+ * Returns the expression for the exchanges inbound message body converted to the given type
*
- * @param type the type
- * @param nullBodyAllowed whether null bodies is allowed and if so a null is returned,
- * otherwise an exception is thrown
+ * @param type the type
+ * @param nullBodyAllowed whether null bodies is allowed and if so a null is returned, otherwise an exception is
+ * thrown
*/
public static <T> Expression mandatoryBodyExpression(final Class<T> type, final boolean nullBodyAllowed) {
return new ExpressionAdapter() {
@@ -1220,8 +1218,7 @@ public class ExpressionBuilder {
}
/**
- * Returns an expression which converts the given expression to the given type the type
- * expression is evaluated to
+ * Returns an expression which converts the given expression to the given type the type expression is evaluated to
*/
public static Expression convertToExpression(final Expression expression, final Expression type) {
return new ExpressionAdapter() {
@@ -1249,20 +1246,20 @@ public class ExpressionBuilder {
}
/**
- * Returns a tokenize expression which will tokenize the string with the
- * given token
+ * Returns a tokenize expression which will tokenize the string with the given token
*/
- public static Expression tokenizeExpression(final Expression expression,
- final String token) {
+ public static Expression tokenizeExpression(
+ final Expression expression,
+ final String token) {
return tokenizeExpression(expression, simpleExpression(token));
}
/**
- * Returns a tokenize expression which will tokenize the string with the
- * given token
+ * Returns a tokenize expression which will tokenize the string with the given token
*/
- public static Expression tokenizeExpression(final Expression expression,
- final Expression token) {
+ public static Expression tokenizeExpression(
+ final Expression expression,
+ final Expression token) {
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
@@ -1318,11 +1315,11 @@ public class ExpressionBuilder {
}
/**
- * Returns a tokenize expression which will tokenize the string with the
- * given regex
+ * Returns a tokenize expression which will tokenize the string with the given regex
*/
- public static Expression regexTokenizeExpression(final Expression expression,
- final String regexTokenizer) {
+ public static Expression regexTokenizeExpression(
+ final Expression expression,
+ final String regexTokenizer) {
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
@@ -1350,12 +1347,15 @@ public class ExpressionBuilder {
public Object evaluate(Exchange exchange) {
// evaluate expression as iterator
Iterator<?> it = expression.evaluate(exchange, Iterator.class);
- ObjectHelper.notNull(it, "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
+ ObjectHelper.notNull(it,
+ "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
// must use GroupTokenIterator in xml mode as we want to concat the xml parts into a single message
// the group can be a simple expression so evaluate it as a number
Integer parts = groupExp.evaluate(exchange, Integer.class);
if (parts == null) {
- throw new RuntimeExchangeException("Group evaluated as null, must be evaluated as a positive Integer value from expression: " + group, exchange);
+ throw new RuntimeExchangeException(
+ "Group evaluated as null, must be evaluated as a positive Integer value from expression: " + group,
+ exchange);
} else if (parts <= 0) {
throw new RuntimeExchangeException("Group must be a positive number, was: " + parts, exchange);
}
@@ -1376,7 +1376,8 @@ public class ExpressionBuilder {
};
}
- public static Expression groupIteratorExpression(final Expression expression, final String token, final String group, final boolean skipFirst) {
+ public static Expression groupIteratorExpression(
+ final Expression expression, final String token, final String group, final boolean skipFirst) {
return new ExpressionAdapter() {
private Expression groupExp;
@@ -1384,11 +1385,14 @@ public class ExpressionBuilder {
public Object evaluate(Exchange exchange) {
// evaluate expression as iterator
Iterator<?> it = expression.evaluate(exchange, Iterator.class);
- ObjectHelper.notNull(it, "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
+ ObjectHelper.notNull(it,
+ "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
// the group can be a simple expression so evaluate it as a number
Integer parts = groupExp.evaluate(exchange, Integer.class);
if (parts == null) {
- throw new RuntimeExchangeException("Group evaluated as null, must be evaluated as a positive Integer value from expression: " + group, exchange);
+ throw new RuntimeExchangeException(
+ "Group evaluated as null, must be evaluated as a positive Integer value from expression: " + group,
+ exchange);
} else if (parts <= 0) {
throw new RuntimeExchangeException("Group must be a positive number, was: " + parts, exchange);
}
@@ -1421,7 +1425,8 @@ public class ExpressionBuilder {
public Object evaluate(Exchange exchange) {
// evaluate expression as iterator
Iterator<?> it = expression.evaluate(exchange, Iterator.class);
- ObjectHelper.notNull(it, "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
+ ObjectHelper.notNull(it,
+ "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
StringBuilder sb = new StringBuilder();
while (it.hasNext()) {
@@ -1465,7 +1470,7 @@ public class ExpressionBuilder {
* <p/>
* The expression is evaluated as a {@link List} object to allow sorting.
*/
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static Expression sortExpression(final Expression expression, final Comparator comparator) {
return new ExpressionAdapter() {
@Override
@@ -1488,11 +1493,12 @@ public class ExpressionBuilder {
}
/**
- * Transforms the expression into a String then performs the regex
- * replaceAll to transform the String and return the result
+ * Transforms the expression into a String then performs the regex replaceAll to transform the String and return the
+ * result
*/
- public static Expression regexReplaceAll(final Expression expression,
- final String regex, final String replacement) {
+ public static Expression regexReplaceAll(
+ final Expression expression,
+ final String regex, final String replacement) {
final Pattern pattern = Pattern.compile(regex);
return new ExpressionAdapter() {
@Override
@@ -1517,11 +1523,12 @@ public class ExpressionBuilder {
}
/**
- * Transforms the expression into a String then performs the regex
- * replaceAll to transform the String and return the result
+ * Transforms the expression into a String then performs the regex replaceAll to transform the String and return the
+ * result
*/
- public static Expression regexReplaceAll(final Expression expression,
- final String regex, final Expression replacementExpression) {
+ public static Expression regexReplaceAll(
+ final Expression expression,
+ final String regex, final Expression replacementExpression) {
final Pattern pattern = Pattern.compile(regex);
return new ExpressionAdapter() {
@@ -1595,23 +1602,21 @@ public class ExpressionBuilder {
}
/**
- * Returns an expression which returns the string concatenation value of the various
- * expressions
+ * Returns an expression which returns the string concatenation value of the various expressions
*
- * @param expressions the expression to be concatenated dynamically
- * @return an expression which when evaluated will return the concatenated values
+ * @param expressions the expression to be concatenated dynamically
+ * @return an expression which when evaluated will return the concatenated values
*/
public static Expression concatExpression(final Collection<Expression> expressions) {
return concatExpression(expressions, null);
}
/**
- * Returns an expression which returns the string concatenation value of the various
- * expressions
+ * Returns an expression which returns the string concatenation value of the various expressions
*
- * @param expressions the expression to be concatenated dynamically
- * @param description the text description of the expression
- * @return an expression which when evaluated will return the concatenated values
+ * @param expressions the expression to be concatenated dynamically
+ * @param description the text description of the expression
+ * @return an expression which when evaluated will return the concatenated values
*/
public static Expression concatExpression(final Collection<Expression> expressions, final String description) {
for (Expression expression : expressions) {
@@ -1623,12 +1628,11 @@ public class ExpressionBuilder {
}
/**
- * Returns an expression which returns the string concatenation value of the various
- * expressions
+ * Returns an expression which returns the string concatenation value of the various expressions
*
- * @param expressions the expression to be concatenated dynamically
- * @param description the text description of the expression
- * @return an expression which when evaluated will return the concatenated values
+ * @param expressions the expression to be concatenated dynamically
+ * @param description the text description of the expression
+ * @return an expression which when evaluated will return the concatenated values
*/
private static Expression concatExpressionUnoptimized(final Collection<Expression> expressions, final String description) {
return new ExpressionAdapter() {
@@ -1664,12 +1668,11 @@ public class ExpressionBuilder {
}
/**
- * Returns an optimized expression which returns the string concatenation value of the various.
- * expressions
+ * Returns an optimized expression which returns the string concatenation value of the various. expressions
*
- * @param expressions the expression to be concatenated dynamically
- * @param description the text description of the expression
- * @return an expression which when evaluated will return the concatenated values
+ * @param expressions the expression to be concatenated dynamically
+ * @param description the text description of the expression
+ * @return an expression which when evaluated will return the concatenated values
*/
private static Expression concatExpressionOptimized(final Collection<Expression> expressions, final String description) {
return new ExpressionAdapter() {
@@ -1871,7 +1874,7 @@ public class ExpressionBuilder {
@Override
public void init(CamelContext context) {
final Language language = context.resolveLanguage("bean");
- this.exp = language.createExpression(null, new Object[]{bean, method});
+ this.exp = language.createExpression(null, new Object[] { bean, method });
this.exp.init(context);
}
@@ -1888,7 +1891,7 @@ public class ExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
Object bean = expression.evaluate(exchange, Object.class);
- Expression exp = language.createExpression(null, new Object[]{bean, method});
+ Expression exp = language.createExpression(null, new Object[] { bean, method });
exp.init(exchange.getContext());
return exp.evaluate(exchange, Object.class);
}
@@ -1991,7 +1994,8 @@ public class ExpressionBuilder {
return tokenizeXMLAwareExpression(null, path, mode, group, namespaces);
}
- public static Expression tokenizeXMLAwareExpression(String headerName, String path, char mode, int group, Namespaces namespaces) {
+ public static Expression tokenizeXMLAwareExpression(
+ String headerName, String path, char mode, int group, Namespaces namespaces) {
StringHelper.notEmpty(path, "path");
return new ExpressionAdapter() {
private Expression exp;
@@ -2004,7 +2008,7 @@ public class ExpressionBuilder {
@Override
public void init(CamelContext context) {
final Language language = context.resolveLanguage("xtokenize");
- this.exp = language.createExpression(path, new Object[]{headerName, mode, group, namespaces});
+ this.exp = language.createExpression(path, new Object[] { headerName, mode, group, namespaces });
this.exp.init(context);
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
index 559026f6a2a..48435031045 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
@@ -89,8 +89,8 @@ public class PredicateBuilder {
}
/**
- * A helper method to combine two predicates by a logical OR.
- * If you want to combine multiple predicates see {@link #in(Predicate...)}
+ * A helper method to combine two predicates by a logical OR. If you want to combine multiple predicates see
+ * {@link #in(Predicate...)}
*/
public static Predicate or(final Predicate left, final Predicate right) {
notNull(left, "left");
@@ -114,11 +114,10 @@ public class PredicateBuilder {
}
/**
- * Concat the given predicates into a single predicate, which matches
- * if at least one predicates matches.
+ * Concat the given predicates into a single predicate, which matches if at least one predicates matches.
*
- * @param predicates predicates
- * @return a single predicate containing all the predicates
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
*/
public static Predicate or(List<Predicate> predicates) {
Predicate answer = null;
@@ -133,11 +132,10 @@ public class PredicateBuilder {
}
/**
- * Concat the given predicates into a single predicate, which matches
- * if at least one predicates matches.
+ * Concat the given predicates into a single predicate, which matches if at least one predicates matches.
*
- * @param predicates predicates
- * @return a single predicate containing all the predicates
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
*/
public static Predicate or(Predicate... predicates) {
return or(Arrays.asList(predicates));
@@ -458,24 +456,22 @@ public class PredicateBuilder {
}
/**
- * Returns a predicate which is true if the expression matches the given
- * regular expression
+ * Returns a predicate which is true if the expression matches the given regular expression
*
- * @param expression the expression to evaluate
- * @param regex the regular expression to match against
- * @return a new predicate
+ * @param expression the expression to evaluate
+ * @param regex the regular expression to match against
+ * @return a new predicate
*/
public static Predicate regex(final Expression expression, final String regex) {
return regex(expression, Pattern.compile(regex));
}
/**
- * Returns a predicate which is true if the expression matches the given
- * regular expression
+ * Returns a predicate which is true if the expression matches the given regular expression
*
- * @param expression the expression to evaluate
- * @param pattern the regular expression to match against
- * @return a new predicate
+ * @param expression the expression to evaluate
+ * @param pattern the regular expression to match against
+ * @return a new predicate
*/
public static Predicate regex(final Expression expression, final Pattern pattern) {
notNull(expression, "expression");
@@ -504,11 +500,10 @@ public class PredicateBuilder {
}
/**
- * Concat the given predicates into a single predicate, which
- * only matches if all the predicates matches.
+ * Concat the given predicates into a single predicate, which only matches if all the predicates matches.
*
- * @param predicates predicates
- * @return a single predicate containing all the predicates
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
*/
public static Predicate and(List<Predicate> predicates) {
Predicate answer = null;
@@ -523,11 +518,10 @@ public class PredicateBuilder {
}
/**
- * Concat the given predicates into a single predicate, which only matches
- * if all the predicates matches.
+ * Concat the given predicates into a single predicate, which only matches if all the predicates matches.
*
- * @param predicates predicates
- * @return a single predicate containing all the predicates
+ * @param predicates predicates
+ * @return a single predicate containing all the predicates
*/
public static Predicate and(Predicate... predicates) {
return and(Arrays.asList(predicates));
@@ -536,8 +530,8 @@ public class PredicateBuilder {
/**
* A constant predicate.
*
- * @param answer the constant matches
- * @return a predicate that always returns the given answer.
+ * @param answer the constant matches
+ * @return a predicate that always returns the given answer.
*/
public static Predicate constant(final boolean answer) {
return new Predicate() {
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index dbf6f20183a..265ffb1fc92 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -178,7 +178,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+ "|\\Qwebhookverifytoken\\E"
+ "|\\Qzookeeperpassword\\E"
- // SENSITIVE-PATTERN: END
+ // SENSITIVE-PATTERN: END
;
private SensitiveUtils() {
diff --git a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
index 9222ae0d6aa..3cc9b37345b 100644
--- a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
+++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
@@ -52,26 +52,21 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Character stream that handles (or at least attempts to) all the necessary
- * Voodoo to figure out the charset encoding of the XML document within the
- * stream.
+ * Character stream that handles (or at least attempts to) all the necessary Voodoo to figure out the charset encoding
+ * of the XML document within the stream.
* <p>
- * IMPORTANT: This class is not related in any way to the org.xml.sax.XMLReader.
- * This one IS a character stream.
+ * IMPORTANT: This class is not related in any way to the org.xml.sax.XMLReader. This one IS a character stream.
* <p>
- * All this has to be done without consuming characters from the stream, if not
- * the XML parser will not recognized the document as a valid XML. This is not
- * 100% true, but it's close enough (UTF-8 BOM is not handled by all parsers
- * right now, XmlReader handles it and things work in all parsers).
+ * All this has to be done without consuming characters from the stream, if not the XML parser will not recognized the
+ * document as a valid XML. This is not 100% true, but it's close enough (UTF-8 BOM is not handled by all parsers right
+ * now, XmlReader handles it and things work in all parsers).
* <p>
- * The XmlReader class handles the charset encoding of XML documents in Files,
- * raw streams and HTTP streams by offering a wide set of constructors.
+ * The XmlReader class handles the charset encoding of XML documents in Files, raw streams and HTTP streams by offering
+ * a wide set of constructors.
* <P>
- * By default the charset encoding detection is lenient, the constructor with
- * the lenient flag can be used for an script (following HTTP MIME and XML
- * specifications). All this is nicely explained by Mark Pilgrim in his blog,
- * <a href=
- * "https://web.archive.org/web/20060706153721/http://diveintomark.org/archives/2004/02/13/xml-media-types">
+ * By default the charset encoding detection is lenient, the constructor with the lenient flag can be used for an script
+ * (following HTTP MIME and XML specifications). All this is nicely explained by Mark Pilgrim in his blog,
+ * <a href= "https://web.archive.org/web/20060706153721/http://diveintomark.org/archives/2004/02/13/xml-media-types">
* Determining the character encoding of a feed</a>.
*/
public class XmlStreamReader extends Reader {
@@ -84,12 +79,18 @@ public class XmlStreamReader extends Reader {
private static final String UTF_16 = "UTF-16";
private static final String CP1047 = "CP1047";
private static final Pattern CHARSET_PATTERN = Pattern.compile("charset=([.[^; ]]*)");
- private static final Pattern ENCODING_PATTERN = Pattern.compile("<\\?xml.*encoding[\\s]*=[\\s]*((?:\".[^\"]*\")|(?:'.[^']*'))", Pattern.MULTILINE);
- private static final MessageFormat RAW_EX_1 = new MessageFormat("Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}] encoding mismatch");
- private static final MessageFormat RAW_EX_2 = new MessageFormat("Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}] unknown BOM");
- private static final MessageFormat HTTP_EX_1 = new MessageFormat("Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], BOM must be NULL");
- private static final MessageFormat HTTP_EX_2 = new MessageFormat("Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], encoding mismatch");
- private static final MessageFormat HTTP_EX_3 = new MessageFormat("Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], Invalid MIME");
+ private static final Pattern ENCODING_PATTERN
+ = Pattern.compile("<\\?xml.*encoding[\\s]*=[\\s]*((?:\".[^\"]*\")|(?:'.[^']*'))", Pattern.MULTILINE);
+ private static final MessageFormat RAW_EX_1
+ = new MessageFormat("Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}] encoding mismatch");
+ private static final MessageFormat RAW_EX_2
+ = new MessageFormat("Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}] unknown BOM");
+ private static final MessageFormat HTTP_EX_1 = new MessageFormat(
+ "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], BOM must be NULL");
+ private static final MessageFormat HTTP_EX_2 = new MessageFormat(
+ "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], encoding mismatch");
+ private static final MessageFormat HTTP_EX_3 = new MessageFormat(
+ "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], Invalid MIME");
private static String staticDefaultEncoding = null;
@@ -101,14 +102,13 @@ public class XmlStreamReader extends Reader {
/**
* Creates a Reader for a File.
* <p>
- * It looks for the UTF-8 BOM first, if none sniffs the XML prolog charset,
- * if this is also missing defaults to UTF-8.
+ * It looks for the UTF-8 BOM first, if none sniffs the XML prolog charset, if this is also missing defaults to
+ * UTF-8.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param file File to create a Reader from.
+ * @param file File to create a Reader from.
* @throws IOException thrown if there is a problem reading the file.
*/
public XmlStreamReader(final File file) throws IOException {
@@ -120,11 +120,10 @@ public class XmlStreamReader extends Reader {
* <p>
* It follows the same logic used for files.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param is InputStream to create a Reader from.
+ * @param is InputStream to create a Reader from.
* @throws IOException thrown if there is a problem reading the stream.
*/
public XmlStreamReader(final InputStream is) throws IOException {
@@ -132,16 +131,14 @@ public class XmlStreamReader extends Reader {
}
/**
- * Creates a Reader for a raw InputStream and uses the provided default
- * encoding if none is determined.
+ * Creates a Reader for a raw InputStream and uses the provided default encoding if none is determined.
* <p>
* It follows the same logic used for files.
* <p>
- * If lenient detection is indicated and the detection above fails as per
- * specifications it then attempts the following:
+ * If lenient detection is indicated and the detection above fails as per specifications it then attempts the
+ * following:
* <p>
- * If the content type was 'text/html' it replaces it with 'text/xml' and
- * tries the detection again.
+ * If the content type was 'text/html' it replaces it with 'text/xml' and tries the detection again.
* <p>
* Else if the XML prolog had a charset encoding that encoding is used.
* <p>
@@ -149,19 +146,17 @@ public class XmlStreamReader extends Reader {
* <p>
* Else 'UTF-8' is used.
* <p>
- * If lenient detection is indicated an XmlStreamReaderException is never
- * thrown.
+ * If lenient detection is indicated an XmlStreamReaderException is never thrown.
* <p>
*
- * @param is InputStream to create a Reader from.
- * @param lenient indicates if the charset encoding detection should be
- * relaxed.
- * @param defaultEncoding default encoding to use if one cannot be detected.
- * @throws IOException thrown if there is a problem reading the stream.
- * @throws XmlStreamReaderException thrown if the charset encoding could not
- * be determined according to the specs.
+ * @param is InputStream to create a Reader from.
+ * @param lenient indicates if the charset encoding detection should be relaxed.
+ * @param defaultEncoding default encoding to use if one cannot be detected.
+ * @throws IOException thrown if there is a problem reading the stream.
+ * @throws XmlStreamReaderException thrown if the charset encoding could not be determined according to the specs.
*/
- public XmlStreamReader(final InputStream is, final boolean lenient, final String defaultEncoding) throws IOException, XmlStreamReaderException {
+ public XmlStreamReader(final InputStream is, final boolean lenient, final String defaultEncoding) throws IOException,
+ XmlStreamReaderException {
if (defaultEncoding == null) {
this.defaultEncoding = staticDefaultEncoding;
} else {
@@ -183,11 +178,10 @@ public class XmlStreamReader extends Reader {
* <p>
* It follows the same logic used for files.
* <p>
- * If lenient detection is indicated and the detection above fails as per
- * specifications it then attempts the following:
+ * If lenient detection is indicated and the detection above fails as per specifications it then attempts the
+ * following:
* <p>
- * If the content type was 'text/html' it replaces it with 'text/xml' and
- * tries the detection again.
+ * If the content type was 'text/html' it replaces it with 'text/xml' and tries the detection again.
* <p>
* Else if the XML prolog had a charset encoding that encoding is used.
* <p>
@@ -195,16 +189,13 @@ public class XmlStreamReader extends Reader {
* <p>
* Else 'UTF-8' is used.
* <p>
- * If lenient detection is indicated an XmlStreamReaderException is never
- * thrown.
+ * If lenient detection is indicated an XmlStreamReaderException is never thrown.
* <p>
*
- * @param is InputStream to create a Reader from.
- * @param lenient indicates if the charset encoding detection should be
- * relaxed.
- * @throws IOException thrown if there is a problem reading the stream.
- * @throws XmlStreamReaderException thrown if the charset encoding could not
- * be determined according to the specs.
+ * @param is InputStream to create a Reader from.
+ * @param lenient indicates if the charset encoding detection should be relaxed.
+ * @throws IOException thrown if there is a problem reading the stream.
+ * @throws XmlStreamReaderException thrown if the charset encoding could not be determined according to the specs.
*/
public XmlStreamReader(final InputStream is, final boolean lenient) throws IOException, XmlStreamReaderException {
this(is, lenient, null);
@@ -213,20 +204,17 @@ public class XmlStreamReader extends Reader {
/**
* Creates a Reader using the InputStream of a URL.
* <p>
- * If the URL is not of type HTTP and there is not 'content-type' header in
- * the fetched data it uses the same logic used for Files.
+ * If the URL is not of type HTTP and there is not 'content-type' header in the fetched data it uses the same logic
+ * used for Files.
* <p>
- * If the URL is a HTTP Url or there is a 'content-type' header in the
- * fetched data it uses the same logic used for an InputStream with
- * content-type.
+ * If the URL is a HTTP Url or there is a 'content-type' header in the fetched data it uses the same logic used for
+ * an InputStream with content-type.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param url URL to create a Reader from.
- * @throws IOException thrown if there is a problem reading the stream of
- * the URL.
+ * @param url URL to create a Reader from.
+ * @throws IOException thrown if there is a problem reading the stream of the URL.
*/
public XmlStreamReader(final URL url) throws IOException {
this(url, null);
@@ -235,21 +223,18 @@ public class XmlStreamReader extends Reader {
/**
* Creates a Reader using the InputStream of a URL.
* <p>
- * If the URL is not of type HTTP and there is not 'content-type' header in
- * the fetched data it uses the same logic used for Files.
+ * If the URL is not of type HTTP and there is not 'content-type' header in the fetched data it uses the same logic
+ * used for Files.
* <p>
- * If the URL is a HTTP Url or there is a 'content-type' header in the
- * fetched data it uses the same logic used for an InputStream with
- * content-type.
+ * If the URL is a HTTP Url or there is a 'content-type' header in the fetched data it uses the same logic used for
+ * an InputStream with content-type.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param url URL to create a Reader from.
- * @param requestHeaders optional Map of headers to set on http request.
- * @throws IOException thrown if there is a problem reading the stream of
- * the URL.
+ * @param url URL to create a Reader from.
+ * @param requestHeaders optional Map of headers to set on http request.
+ * @throws IOException thrown if there is a problem reading the stream of the URL.
*/
public XmlStreamReader(final URL url, final Map<String, String> requestHeaders) throws IOException {
this(url.openConnection(), requestHeaders);
@@ -258,21 +243,17 @@ public class XmlStreamReader extends Reader {
/**
* Creates a Reader using the InputStream of a URLConnection.
* <p>
- * If the URLConnection is not of type HttpURLConnection and there is not
- * 'content-type' header in the fetched data it uses the same logic used for
- * files.
+ * If the URLConnection is not of type HttpURLConnection and there is not 'content-type' header in the fetched data
+ * it uses the same logic used for files.
* <p>
- * If the URLConnection is a HTTP Url or there is a 'content-type' header in
- * the fetched data it uses the same logic used for an InputStream with
- * content-type.
+ * If the URLConnection is a HTTP Url or there is a 'content-type' header in the fetched data it uses the same logic
+ * used for an InputStream with content-type.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param conn URLConnection to create a Reader from.
- * @throws IOException thrown if there is a problem reading the stream of
- * the URLConnection.
+ * @param conn URLConnection to create a Reader from.
+ * @throws IOException thrown if there is a problem reading the stream of the URLConnection.
*/
public XmlStreamReader(final URLConnection conn) throws IOException {
this(conn, null);
@@ -281,22 +262,18 @@ public class XmlStreamReader extends Reader {
/**
* Creates a Reader using the InputStream of a URLConnection.
* <p>
- * If the URLConnection is not of type HttpURLConnection and there is not
- * 'content-type' header in the fetched data it uses the same logic used for
- * files.
+ * If the URLConnection is not of type HttpURLConnection and there is not 'content-type' header in the fetched data
+ * it uses the same logic used for files.
* <p>
- * If the URLConnection is a HTTP Url or there is a 'content-type' header in
- * the fetched data it uses the same logic used for an InputStream with
- * content-type.
+ * If the URLConnection is a HTTP Url or there is a 'content-type' header in the fetched data it uses the same logic
+ * used for an InputStream with content-type.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param conn URLConnection to create a Reader from.
- * @param requestHeaders optional Map of headers to set on http request.
- * @throws IOException thrown if there is a problem reading the stream of
- * the URLConnection.
+ * @param conn URLConnection to create a Reader from.
+ * @param requestHeaders optional Map of headers to set on http request.
+ * @throws IOException thrown if there is a problem reading the stream of the URLConnection.
*/
public XmlStreamReader(final URLConnection conn, final Map<String, String> requestHeaders) throws IOException {
defaultEncoding = staticDefaultEncoding;
@@ -324,41 +301,34 @@ public class XmlStreamReader extends Reader {
}
/**
- * Creates a Reader using an InputStream and the associated content-type
- * header.
+ * Creates a Reader using an InputStream and the associated content-type header.
* <p>
- * First it checks if the stream has BOM. If there is not BOM checks the
- * content-type encoding. If there is not content-type encoding checks the
- * XML prolog encoding. If there is not XML prolog encoding uses the default
+ * First it checks if the stream has BOM. If there is not BOM checks the content-type encoding. If there is not
+ * content-type encoding checks the XML prolog encoding. If there is not XML prolog encoding uses the default
* encoding mandated by the content-type MIME type.
* <p>
- * It does a lenient charset encoding detection, check the constructor with
- * the lenient parameter for details.
+ * It does a lenient charset encoding detection, check the constructor with the lenient parameter for details.
* <p>
*
- * @param is InputStream to create the reader from.
- * @param httpContentType content-type header to use for the resolution of
- * the charset encoding.
- * @throws IOException thrown if there is a problem reading the file.
+ * @param is InputStream to create the reader from.
+ * @param httpContentType content-type header to use for the resolution of the charset encoding.
+ * @throws IOException thrown if there is a problem reading the file.
*/
public XmlStreamReader(final InputStream is, final String httpContentType) throws IOException {
this(is, httpContentType, true);
}
/**
- * Creates a Reader using an InputStream and the associated content-type
- * header.
+ * Creates a Reader using an InputStream and the associated content-type header.
* <p>
- * First it checks if the stream has BOM. If there is not BOM checks the
- * content-type encoding. If there is not content-type encoding checks the
- * XML prolog encoding. If there is not XML prolog encoding uses the default
+ * First it checks if the stream has BOM. If there is not BOM checks the content-type encoding. If there is not
+ * content-type encoding checks the XML prolog encoding. If there is not XML prolog encoding uses the default
* encoding mandated by the content-type MIME type.
* <p>
- * If lenient detection is indicated and the detection above fails as per
- * specifications it then attempts the following:
+ * If lenient detection is indicated and the detection above fails as per specifications it then attempts the
+ * following:
* <p>
- * If the content type was 'text/html' it replaces it with 'text/xml' and
- * tries the detection again.
+ * If the content type was 'text/html' it replaces it with 'text/xml' and tries the detection again.
* <p>
* Else if the XML prolog had a charset encoding that encoding is used.
* <p>
@@ -366,21 +336,18 @@ public class XmlStreamReader extends Reader {
* <p>
* Else 'UTF-8' is used.
* <p>
- * If lenient detection is indicated and XmlStreamReaderException is never
- * thrown.
+ * If lenient detection is indicated and XmlStreamReaderException is never thrown.
* <p>
*
- * @param is InputStream to create the reader from.
- * @param httpContentType content-type header to use for the resolution of
- * the charset encoding.
- * @param lenient indicates if the charset encoding detection should be
- * relaxed.
- * @param defaultEncoding default encoding to use if one cannot be detected.
- * @throws IOException thrown if there is a problem reading the file.
- * @throws XmlStreamReaderException thrown if the charset encoding could not
- * be determined according to the specs.
+ * @param is InputStream to create the reader from.
+ * @param httpContentType content-type header to use for the resolution of the charset encoding.
+ * @param lenient indicates if the charset encoding detection should be relaxed.
+ * @param defaultEncoding default encoding to use if one cannot be detected.
+ * @throws IOException thrown if there is a problem reading the file.
+ * @throws XmlStreamReaderException thrown if the charset encoding could not be determined according to the specs.
*/
- public XmlStreamReader(final InputStream is, final String httpContentType, final boolean lenient, final String defaultEncoding) throws IOException, XmlStreamReaderException {
+ public XmlStreamReader(final InputStream is, final String httpContentType, final boolean lenient,
+ final String defaultEncoding) throws IOException, XmlStreamReaderException {
if (defaultEncoding == null) {
this.defaultEncoding = staticDefaultEncoding;
} else {
@@ -398,19 +365,16 @@ public class XmlStreamReader extends Reader {
}
/**
- * Creates a Reader using an InputStream and the associated content-type
- * header.
+ * Creates a Reader using an InputStream and the associated content-type header.
* <p>
- * First it checks if the stream has BOM. If there is not BOM checks the
- * content-type encoding. If there is not content-type encoding checks the
- * XML prolog encoding. If there is not XML prolog encoding uses the default
+ * First it checks if the stream has BOM. If there is not BOM checks the content-type encoding. If there is not
+ * content-type encoding checks the XML prolog encoding. If there is not XML prolog encoding uses the default
* encoding mandated by the content-type MIME type.
* <p>
- * If lenient detection is indicated and the detection above fails as per
- * specifications it then attempts the following:
+ * If lenient detection is indicated and the detection above fails as per specifications it then attempts the
+ * following:
* <p>
- * If the content type was 'text/html' it replaces it with 'text/xml' and
- * tries the detection again.
+ * If the content type was 'text/html' it replaces it with 'text/xml' and tries the detection again.
* <p>
* Else if the XML prolog had a charset encoding that encoding is used.
* <p>
@@ -418,26 +382,23 @@ public class XmlStreamReader extends Reader {
* <p>
* Else 'UTF-8' is used.
* <p>
- * If lenient detection is indicated and XmlStreamReaderException is never
- * thrown.
+ * If lenient detection is indicated and XmlStreamReaderException is never thrown.
* <p>
*
- * @param is InputStream to create the reader from.
- * @param httpContentType content-type header to use for the resolution of
- * the charset encoding.
- * @param lenient indicates if the charset encoding detection should be
- * relaxed.
- * @throws IOException thrown if there is a problem reading the file.
- * @throws XmlStreamReaderException thrown if the charset encoding could not
- * be determined according to the specs.
+ * @param is InputStream to create the reader from.
+ * @param httpContentType content-type header to use for the resolution of the charset encoding.
+ * @param lenient indicates if the charset encoding detection should be relaxed.
+ * @throws IOException thrown if there is a problem reading the file.
+ * @throws XmlStreamReaderException thrown if the charset encoding could not be determined according to the specs.
*/
- public XmlStreamReader(final InputStream is, final String httpContentType, final boolean lenient) throws IOException, XmlStreamReaderException {
+ public XmlStreamReader(final InputStream is, final String httpContentType, final boolean lenient) throws IOException,
+ XmlStreamReaderException {
this(is, httpContentType, lenient, null);
}
/**
- * Returns the default encoding to use if none is set in HTTP content-type,
- * XML prolog and the rules based on content-type are not adequate.
+ * Returns the default encoding to use if none is set in HTTP content-type, XML prolog and the rules based on
+ * content-type are not adequate.
* <p/>
* If it is NULL the content-type based rules are used.
* <p/>
@@ -449,8 +410,8 @@ public class XmlStreamReader extends Reader {
}
/**
- * Sets the default encoding to use if none is set in HTTP content-type, XML
- * prolog and the rules based on content-type are not adequate.
+ * Sets the default encoding to use if none is set in HTTP content-type, XML prolog and the rules based on
+ * content-type are not adequate.
* <p/>
* If it is set to NULL the content-type based rules are used.
* <p/>
@@ -544,7 +505,9 @@ public class XmlStreamReader extends Reader {
}
// InputStream is passed for XmlStreamReaderException creation only
- private String calculateRawEncoding(final String bomEnc, final String xmlGuessEnc, final String xmlEnc, final InputStream is) throws IOException {
+ private String calculateRawEncoding(
+ final String bomEnc, final String xmlGuessEnc, final String xmlEnc, final InputStream is)
+ throws IOException {
String retEncoding;
if (bomEnc == null) {
if (xmlGuessEnc == null || xmlEnc == null) {
@@ -560,22 +523,26 @@ public class XmlStreamReader extends Reader {
}
} else if (bomEnc.equals(UTF_8)) {
if (xmlGuessEnc != null && !xmlGuessEnc.equals(UTF_8)) {
- throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] {bomEnc, xmlGuessEnc, xmlEnc}), bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ RAW_EX_1.format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
}
if (xmlEnc != null && !xmlEnc.equals(UTF_8)) {
- throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] {bomEnc, xmlGuessEnc, xmlEnc}), bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ RAW_EX_1.format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
}
retEncoding = UTF_8;
} else if (bomEnc.equals(UTF_16BE) || bomEnc.equals(UTF_16LE)) {
if (xmlGuessEnc != null && !xmlGuessEnc.equals(bomEnc)) {
- throw new IOException(RAW_EX_1.format(new Object[] {bomEnc, xmlGuessEnc, xmlEnc}));
+ throw new IOException(RAW_EX_1.format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }));
}
if (xmlEnc != null && !xmlEnc.equals(UTF_16) && !xmlEnc.equals(bomEnc)) {
- throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] {bomEnc, xmlGuessEnc, xmlEnc}), bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ RAW_EX_1.format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
}
retEncoding = bomEnc;
} else {
- throw new XmlStreamReaderException(RAW_EX_2.format(new Object[] {bomEnc, xmlGuessEnc, xmlEnc}), bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ RAW_EX_2.format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
}
return retEncoding;
}
@@ -595,9 +562,11 @@ public class XmlStreamReader extends Reader {
}
// InputStream is passed for XmlStreamReaderException creation only
- private String calculateHttpEncoding(final String cTMime, final String cTEnc, final String bomEnc, final String xmlGuessEnc, final String xmlEnc, final InputStream is,
- final boolean lenient)
- throws IOException {
+ private String calculateHttpEncoding(
+ final String cTMime, final String cTEnc, final String bomEnc, final String xmlGuessEnc, final String xmlEnc,
+ final InputStream is,
+ final boolean lenient)
+ throws IOException {
String retEncoding;
if (lenient && xmlEnc != null) {
retEncoding = xmlEnc;
@@ -616,19 +585,25 @@ public class XmlStreamReader extends Reader {
}
}
} else if (bomEnc != null && (cTEnc.equals(UTF_16BE) || cTEnc.equals(UTF_16LE))) {
- throw new XmlStreamReaderException(HTTP_EX_1.format(new Object[] {cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc}), cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ HTTP_EX_1.format(new Object[] { cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
+ bomEnc, xmlGuessEnc, xmlEnc, is);
} else if (cTEnc.equals(UTF_16)) {
if (bomEnc != null && bomEnc.startsWith(UTF_16)) {
retEncoding = bomEnc;
} else {
- throw new XmlStreamReaderException(HTTP_EX_2.format(new Object[] {cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc}), cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc,
- is);
+ throw new XmlStreamReaderException(
+ HTTP_EX_2.format(new Object[] { cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
+ bomEnc, xmlGuessEnc, xmlEnc,
+ is);
}
} else {
retEncoding = cTEnc;
}
} else {
- throw new XmlStreamReaderException(HTTP_EX_3.format(new Object[] {cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc}), cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc, is);
+ throw new XmlStreamReaderException(
+ HTTP_EX_3.format(new Object[] { cTMime, cTEnc, bomEnc, xmlGuessEnc, xmlEnc }), cTMime, cTEnc, bomEnc,
+ xmlGuessEnc, xmlEnc, is);
}
}
return retEncoding;
@@ -664,7 +639,8 @@ public class XmlStreamReader extends Reader {
encoding = encoding.toUpperCase(Locale.ENGLISH);
}
}
- if (encoding != null && (encoding.startsWith("\"") && encoding.endsWith("\"") || encoding.startsWith("'") && encoding.endsWith("'"))) {
+ if (encoding != null && (encoding.startsWith("\"") && encoding.endsWith("\"")
+ || encoding.startsWith("'") && encoding.endsWith("'"))) {
encoding = encoding.substring(1, encoding.length() - 1);
}
}
@@ -762,13 +738,15 @@ public class XmlStreamReader extends Reader {
// indicates if the MIME type belongs to the APPLICATION XML family
private static boolean isAppXml(final String mime) {
- return mime != null && (mime.equals("application/xml") || mime.equals("application/xml-dtd") || mime.equals("application/xml-external-parsed-entity")
- || mime.startsWith("application/") && mime.endsWith("+xml"));
+ return mime != null && (mime.equals("application/xml") || mime.equals("application/xml-dtd")
+ || mime.equals("application/xml-external-parsed-entity")
+ || mime.startsWith("application/") && mime.endsWith("+xml"));
}
// indicates if the MIME type belongs to the TEXT XML family
private static boolean isTextXml(final String mime) {
- return mime != null && (mime.equals("text/xml") || mime.equals("text/xml-external-parsed-entity") || mime.startsWith("text/") && mime.endsWith("+xml"));
+ return mime != null && (mime.equals("text/xml") || mime.equals("text/xml-external-parsed-entity")
+ || mime.startsWith("text/") && mime.endsWith("+xml"));
}
}
diff --git a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
index a6e1e302064..76d04fb4bda 100644
--- a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
+++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
@@ -38,14 +38,11 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * The XmlReaderException is thrown by the XmlReader constructors if the charset
- * encoding can not be determined according to the XML 1.0 specification and RFC
- * 3023.
+ * The XmlReaderException is thrown by the XmlReader constructors if the charset encoding can not be determined
+ * according to the XML 1.0 specification and RFC 3023.
* <p>
- * The exception returns the unconsumed InputStream to allow the application to
- * do an alternate processing with the stream. Note that the original
- * InputStream given to the XmlReader cannot be used as that one has been
- * already read.
+ * The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
+ * stream. Note that the original InputStream given to the XmlReader cannot be used as that one has been already read.
*/
public class XmlStreamReaderException extends IOException {
private static final long serialVersionUID = 1L;
@@ -57,38 +54,38 @@ public class XmlStreamReaderException extends IOException {
private final InputStream is;
/**
- * Creates an exception instance if the charset encoding could not be
- * determined.
+ * Creates an exception instance if the charset encoding could not be determined.
* <p>
* Instances of this exception are thrown by the XmlReader.
* <p>
*
- * @param msg message describing the reason for the exception.
- * @param bomEnc BOM encoding.
+ * @param msg message describing the reason for the exception.
+ * @param bomEnc BOM encoding.
* @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
+ * @param xmlEnc XML prolog encoding.
+ * @param is the unconsumed InputStream.
*/
- public XmlStreamReaderException(final String msg, final String bomEnc, final String xmlGuessEnc, final String xmlEnc, final InputStream is) {
+ public XmlStreamReaderException(final String msg, final String bomEnc, final String xmlGuessEnc, final String xmlEnc,
+ final InputStream is) {
this(msg, null, null, bomEnc, xmlGuessEnc, xmlEnc, is);
}
/**
- * Creates an exception instance if the charset encoding could not be
- * determined.
+ * Creates an exception instance if the charset encoding could not be determined.
* <p>
* Instances of this exception are thrown by the XmlReader.
* <p>
*
- * @param msg message describing the reason for the exception.
- * @param ctMime MIME type in the content-type.
- * @param ctEnc encoding in the content-type.
- * @param bomEnc BOM encoding.
+ * @param msg message describing the reason for the exception.
+ * @param ctMime MIME type in the content-type.
+ * @param ctEnc encoding in the content-type.
+ * @param bomEnc BOM encoding.
* @param xmlGuessEnc XML guess encoding.
- * @param xmlEnc XML prolog encoding.
- * @param is the unconsumed InputStream.
+ * @param xmlEnc XML prolog encoding.
+ * @param is the unconsumed InputStream.
*/
- public XmlStreamReaderException(final String msg, final String ctMime, final String ctEnc, final String bomEnc, final String xmlGuessEnc, final String xmlEnc,
+ public XmlStreamReaderException(final String msg, final String ctMime, final String ctEnc, final String bomEnc,
+ final String xmlGuessEnc, final String xmlEnc,
final InputStream is) {
super(msg);
contentTypeMime = ctMime;
@@ -130,33 +127,30 @@ public class XmlStreamReaderException extends IOException {
}
/**
- * Returns the MIME type in the content-type used to attempt determining the
- * encoding.
+ * Returns the MIME type in the content-type used to attempt determining the encoding.
* <p>
*
- * @return the MIME type in the content-type, null if there was not
- * content-type or the encoding detection did not involve HTTP.
+ * @return the MIME type in the content-type, null if there was not content-type or the encoding detection did not
+ * involve HTTP.
*/
public String getContentTypeMime() {
return contentTypeMime;
}
/**
- * Returns the encoding in the content-type used to attempt determining the
- * encoding.
+ * Returns the encoding in the content-type used to attempt determining the encoding.
* <p>
*
- * @return the encoding in the content-type, null if there was not
- * content-type, no encoding in it or the encoding detection did not
- * involve HTTP.
+ * @return the encoding in the content-type, null if there was not content-type, no encoding in it or the encoding
+ * detection did not involve HTTP.
*/
public String getContentTypeEncoding() {
return contentTypeEncoding;
}
/**
- * Returns the unconsumed InputStream to allow the application to do an
- * alternate encoding detection on the InputStream.
+ * Returns the unconsumed InputStream to allow the application to do an alternate encoding detection on the
+ * InputStream.
* <p>
*
* @return the unconsumed InputStream.
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
index 032a2f3d064..40c12d8c1e5 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
@@ -46,8 +46,7 @@ import org.apache.camel.xml.io.util.XmlStreamReader;
/**
* Absolutely minimal implementation of XMLPULL V1 API
*
- * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander
- * Slominski</a>
+ * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
public class MXParser implements XmlPullParser {
// NOTE: no interning of those strings --> by Java lang spec they MUST be
@@ -55,8 +54,8 @@ public class MXParser implements XmlPullParser {
protected final static String XML_URI = "http://www.w3.org/XML/1998/namespace";
protected final static String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
protected final static String FEATURE_XML_ROUNDTRIP =
- // "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
- "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
+ // "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
+ "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
protected final static String FEATURE_NAMES_INTERNED = "http://xmlpull.org/v1/doc/features.html#names-interned";
protected final static String PROPERTY_XMLDECL_VERSION = "http://xmlpull.org/v1/doc/properties.html#xmldecl-version";
protected final static String PROPERTY_XMLDECL_STANDALONE = "http://xmlpull.org/v1/doc/properties.html#xmldecl-standalone";
@@ -64,11 +63,10 @@ public class MXParser implements XmlPullParser {
protected final static String PROPERTY_LOCATION = "http://xmlpull.org/v1/doc/properties.html#location";
/**
- * Implementation notice: the is instance variable that controls if
- * newString() is interning.
+ * Implementation notice: the is instance variable that controls if newString() is interning.
* <p>
- * <b>NOTE:</b> newStringIntern <b>always</b> returns interned strings and
- * newString MAY return interned String depending on this variable.
+ * <b>NOTE:</b> newStringIntern <b>always</b> returns interned strings and newString MAY return interned String
+ * depending on this variable.
* <p>
* <b>NOTE:</b> by default in this minimal implementation it is false!
*/
@@ -114,15 +112,15 @@ public class MXParser implements XmlPullParser {
protected int elNamespaceCount[];
/**
- * Make sure that we have enough space to keep element stack if passed size.
- * It will always create one additional slot then current depth
+ * Make sure that we have enough space to keep element stack if passed size. It will always create one additional
+ * slot then current depth
*/
protected void ensureElementsCapacity() {
final int elStackSize = elName != null ? elName.length : 0;
if ((depth + 1) >= elStackSize) {
// we add at least one extra slot ...
final int newSize = (depth >= 7 ? 2 * depth : 8) + 2; // = lucky 7 +
- // 1 //25
+ // 1 //25
if (TRACE_SIZING) {
System.err.println("TRACE_SIZING elStackSize " + elStackSize + " ==> " + newSize);
}
@@ -281,9 +279,8 @@ public class MXParser implements XmlPullParser {
}
/**
- * simplistic implementation of hash function that has <b>constant</b> time
- * to compute - so it also means diminishing hash quality for long strings
- * but for XML parsing it should be good enough ...
+ * simplistic implementation of hash function that has <b>constant</b> time to compute - so it also means
+ * diminishing hash quality for long strings but for XML parsing it should be good enough ...
*/
protected static int fastHash(char ch[], int off, int len) {
if (len == 0)
@@ -322,7 +319,7 @@ public class MXParser implements XmlPullParser {
final int entitySize = entityReplacementBuf != null ? entityReplacementBuf.length : 0;
if (entityEnd >= entitySize) {
final int newSize = entityEnd > 7 ? 2 * entityEnd : 8; // = lucky 7
- // + 1 //25
+ // + 1 //25
if (TRACE_SIZING) {
System.err.println("TRACE_SIZING entitySize " + entitySize + " ==> " + newSize);
}
@@ -353,7 +350,7 @@ public class MXParser implements XmlPullParser {
// input buffer management
protected static final int READ_CHUNK_SIZE = 8 * 1024; // max data chars in
- // one read() call
+ // one read() call
protected Reader reader;
protected String inputEncoding;
@@ -362,8 +359,8 @@ public class MXParser implements XmlPullParser {
protected char buf[] = new char[Runtime.getRuntime().freeMemory() > 1000000L ? READ_CHUNK_SIZE : 256];
protected int bufSoftLimit = (bufLoadFactor * buf.length) / 100; // desirable
- // size of
- // buffer
+ // size of
+ // buffer
protected boolean preventBufferCompaction;
protected int bufAbsoluteStart; // this is buf
@@ -449,8 +446,8 @@ public class MXParser implements XmlPullParser {
/**
* Method setFeature
*
- * @param name a String
- * @param state a boolean
+ * @param name a String
+ * @param state a boolean
* @throws XmlPullParserException
*/
public void setFeature(String name, boolean state) throws XmlPullParserException {
@@ -511,7 +508,7 @@ public class MXParser implements XmlPullParser {
public void setProperty(String name, Object value) throws XmlPullParserException {
if (PROPERTY_LOCATION.equals(name)) {
- location = (String)value;
+ location = (String) value;
} else {
throw new XmlPullParserException("unsupported property: '" + name + "'");
}
@@ -636,7 +633,7 @@ public class MXParser implements XmlPullParser {
} else {
for (int i = namespaceEnd - 1; i >= 0; i--) {
if (namespacePrefix[i] == null) { // "") { //null ) { //TODO
- // check FIXME Alek
+ // check FIXME Alek
return namespaceUri[i];
}
}
@@ -673,8 +670,7 @@ public class MXParser implements XmlPullParser {
}
/**
- * Return string describing current position of parsers as text 'STATE [seen
- * %s...] @line:column'.
+ * Return string describing current position of parsers as text 'STATE [seen %s...] @line:column'.
*/
public String getPositionDescription() {
String fragment = null;
@@ -690,7 +686,8 @@ public class MXParser implements XmlPullParser {
// return " at line "+tokenizerPosRow
// +" and column "+(tokenizerPosCol-1)
// +(fragment != null ? " seen "+printable(fragment)+"..." : "");
- return " " + TYPES[eventType] + (fragment != null ? " seen " + printable(fragment) + "..." : "") + " " + (location != null ? location : "") + "@" + getLineNumber() + ":"
+ return " " + TYPES[eventType] + (fragment != null ? " seen " + printable(fragment) + "..." : "") + " "
+ + (location != null ? location : "") + "@" + getLineNumber() + ":"
+ getColumnNumber();
}
@@ -760,8 +757,9 @@ public class MXParser implements XmlPullParser {
return buf;
}
- } else if (eventType == START_TAG || eventType == END_TAG || eventType == CDSECT || eventType == COMMENT || eventType == ENTITY_REF || eventType == PROCESSING_INSTRUCTION
- || eventType == IGNORABLE_WHITESPACE || eventType == DOCDECL) {
+ } else if (eventType == START_TAG || eventType == END_TAG || eventType == CDSECT || eventType == COMMENT
+ || eventType == ENTITY_REF || eventType == PROCESSING_INSTRUCTION
+ || eventType == IGNORABLE_WHITESPACE || eventType == DOCDECL) {
holderForStartAndLength[0] = posStart;
holderForStartAndLength[1] = posEnd - posStart;
return buf;
@@ -916,10 +914,10 @@ public class MXParser implements XmlPullParser {
for (int i = 0; i < attributeCount; ++i) {
if ((namespace == attributeUri[i] || namespace.equals(attributeUri[i]))
- // (namespace != null && namespace.equals(attributeUri[ i
- // ]))
- // taking advantage of String.intern()
- && name.equals(attributeName[i])) {
+ // (namespace != null && namespace.equals(attributeUri[ i
+ // ]))
+ // taking advantage of String.intern()
+ && name.equals(attributeName[i])) {
return attributeValue[i];
}
}
@@ -944,25 +942,32 @@ public class MXParser implements XmlPullParser {
public void require(int type, String namespace, String name) throws XmlPullParserException, IOException {
if (!processNamespaces && namespace != null) {
- throw new XmlPullParserException("processing namespaces must be enabled on parser (or factory)" + " to have possible namespaces declared on elements"
+ throw new XmlPullParserException(
+ "processing namespaces must be enabled on parser (or factory)"
+ + " to have possible namespaces declared on elements"
+ (" (position:" + getPositionDescription()) + ")");
}
- if (type != getEventType() || (namespace != null && !namespace.equals(getNamespace())) || (name != null && !name.equals(getName()))) {
- throw new XmlPullParserException("expected event " + TYPES[type] + (name != null ? " with name '" + name + "'" : "") + (namespace != null && name != null ? " and" : "")
+ if (type != getEventType() || (namespace != null && !namespace.equals(getNamespace()))
+ || (name != null && !name.equals(getName()))) {
+ throw new XmlPullParserException(
+ "expected event " + TYPES[type] + (name != null ? " with name '" + name + "'" : "")
+ + (namespace != null && name != null ? " and" : "")
+ (namespace != null ? " with namespace '" + namespace + "'" : "") + " but got"
+ (type != getEventType() ? " " + TYPES[getEventType()] : "")
- + (name != null && getName() != null && !name.equals(getName()) ? " name '" + getName() + "'" : "")
- + (namespace != null && name != null && getName() != null && !name.equals(getName()) && getNamespace() != null
- && !namespace.equals(getNamespace()) ? " and" : "")
- + (namespace != null && getNamespace() != null && !namespace.equals(getNamespace()) ? " namespace '" + getNamespace() + "'" : "")
+ + (name != null && getName() != null && !name.equals(getName())
+ ? " name '" + getName() + "'" : "")
+ + (namespace != null && name != null && getName() != null
+ && !name.equals(getName()) && getNamespace() != null
+ && !namespace.equals(getNamespace()) ? " and" : "")
+ + (namespace != null && getNamespace() != null && !namespace.equals(getNamespace())
+ ? " namespace '" + getNamespace() + "'" : "")
+ (" (position:" + getPositionDescription()) + ")");
}
}
/**
* Skip sub tree that is currently parser positioned on. <br>
- * NOTE: parser must be on START_TAG and when function returns parser will
- * be positioned on corresponding END_TAG
+ * NOTE: parser must be on START_TAG and when function returns parser will be positioned on corresponding END_TAG
*/
public void skipSubTree() throws XmlPullParserException, IOException {
require(START_TAG, null, null);
@@ -1014,7 +1019,8 @@ public class MXParser implements XmlPullParser {
final String result = getText();
eventType = next();
if (eventType != END_TAG) {
- throw new XmlPullParserException("TEXT must be immediately followed by END_TAG and not " + TYPES[getEventType()], this, null);
+ throw new XmlPullParserException(
+ "TEXT must be immediately followed by END_TAG and not " + TYPES[getEventType()], this, null);
}
return result;
} else if (eventType == END_TAG) {
@@ -1087,7 +1093,7 @@ public class MXParser implements XmlPullParser {
ch = more();
}
posStart = pos - 1; // VERY IMPORTANT: this is correct start of
- // event!!!
+ // event!!!
// when true there is some potential event TEXT to return - keep
// gathering
@@ -1142,7 +1148,7 @@ public class MXParser implements XmlPullParser {
final int cdLen = cdEnd - cdStart;
if (cdLen > 0) { // was there anything inside CDATA
- // section?
+ // section?
hadCharData = true;
if (!usePC) {
needsMerging = true;
@@ -1231,7 +1237,8 @@ public class MXParser implements XmlPullParser {
if (entityRefName == null) {
entityRefName = newString(buf, posStart, posEnd - posStart);
}
- throw new XmlPullParserException("could not resolve entity named '" + printable(entityRefName) + "'", this, null);
+ throw new XmlPullParserException(
+ "could not resolve entity named '" + printable(entityRefName) + "'", this, null);
}
// int entStart = posStart;
// int entEnd = posEnd;
@@ -1335,7 +1342,7 @@ public class MXParser implements XmlPullParser {
} while (ch != '<' && ch != '&');
posEnd = pos - 1;
continue MAIN_LOOP; // skip ch = more() from below - we are
- // alreayd ahead ...
+ // alreayd ahead ...
}
ch = more();
} // endless while(true)
@@ -1364,7 +1371,9 @@ public class MXParser implements XmlPullParser {
// deal with BOM
// detect BOM and drop it (Unicode int Order Mark)
if (ch == '\uFFFE') {
- throw new XmlPullParserException("first character in input was UNICODE noncharacter (0xFFFE)" + "- input requires int swapping", this, null);
+ throw new XmlPullParserException(
+ "first character in input was UNICODE noncharacter (0xFFFE)" + "- input requires int swapping", this,
+ null);
}
if (ch == '\uFEFF') {
// skipping UNICODE int Order Mark (so called BOM)
@@ -1464,7 +1473,8 @@ public class MXParser implements XmlPullParser {
}
}
} else {
- throw new XmlPullParserException("only whitespace content allowed before start tag and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "only whitespace content allowed before start tag and not " + printable(ch), this, null);
}
ch = more();
}
@@ -1528,11 +1538,14 @@ public class MXParser implements XmlPullParser {
throw new XmlPullParserException("unexpected markup <!" + printable(ch), this, null);
}
} else if (ch == '/') {
- throw new XmlPullParserException("end tag not allowed in epilog but got " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "end tag not allowed in epilog but got " + printable(ch), this, null);
} else if (isNameStartChar(ch)) {
- throw new XmlPullParserException("start tag not allowed in epilog but got " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "start tag not allowed in epilog but got " + printable(ch), this, null);
} else {
- throw new XmlPullParserException("in epilog expected ignorable content and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "in epilog expected ignorable content and not " + printable(ch), this, null);
}
} else if (isS(ch)) {
gotS = true;
@@ -1572,7 +1585,8 @@ public class MXParser implements XmlPullParser {
}
}
} else {
- throw new XmlPullParserException("in epilog non whitespace content is not allowed but got " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "in epilog non whitespace content is not allowed but got " + printable(ch), this, null);
}
ch = more();
if (reachedEnd) {
@@ -1627,15 +1641,21 @@ public class MXParser implements XmlPullParser {
// construct strings for exception
final String startname = new String(cbuf, 0, elRawNameEnd[depth]);
final String endname = new String(buf, off, len);
- throw new XmlPullParserException("end tag name </" + endname + "> must match start tag name <" + startname + ">" + " from line " + elRawNameLine[depth], this, null);
+ throw new XmlPullParserException(
+ "end tag name </" + endname + "> must match start tag name <" + startname + ">" + " from line "
+ + elRawNameLine[depth],
+ this, null);
}
for (int i = 0; i < len; i++) {
if (buf[off++] != cbuf[i]) {
// construct strings for exception
final String startname = new String(cbuf, 0, len);
final String endname = new String(buf, off - i - 1, len);
- throw new XmlPullParserException("end tag name </" + endname + "> must be the same as start tag <" + startname + ">" + " from line " + elRawNameLine[depth], this,
- null);
+ throw new XmlPullParserException(
+ "end tag name </" + endname + "> must be the same as start tag <" + startname + ">" + " from line "
+ + elRawNameLine[depth],
+ this,
+ null);
}
}
@@ -1643,7 +1663,8 @@ public class MXParser implements XmlPullParser {
ch = more();
} // skip additional white spaces
if (ch != '>') {
- throw new XmlPullParserException("expected > to finish end tag not " + printable(ch) + " from line " + elRawNameLine[depth], this, null);
+ throw new XmlPullParserException(
+ "expected > to finish end tag not " + printable(ch) + " from line " + elRawNameLine[depth], this, null);
}
// namespaceEnd = elNamespaceCount[ depth ]; //FIXME
@@ -1671,14 +1692,16 @@ public class MXParser implements XmlPullParser {
int colonPos = -1;
char ch = buf[pos - 1];
if (ch == ':' && processNamespaces)
- throw new XmlPullParserException("when namespaces processing enabled colon can not be at element name start", this, null);
+ throw new XmlPullParserException(
+ "when namespaces processing enabled colon can not be at element name start", this, null);
while (true) {
ch = more();
if (!isNameChar(ch))
break;
if (ch == ':' && processNamespaces) {
if (colonPos != -1)
- throw new XmlPullParserException("only one colon is allowed in name of element when namespaces are enabled", this, null);
+ throw new XmlPullParserException(
+ "only one colon is allowed in name of element when namespaces are enabled", this, null);
colonPos = pos - 1 + bufAbsoluteStart;
}
}
@@ -1702,8 +1725,8 @@ public class MXParser implements XmlPullParser {
if (colonPos != -1) {
prefix = elPrefix[depth] = newString(buf, nameStart - bufAbsoluteStart, colonPos - nameStart);
elName[depth] = newString(buf, colonPos + 1 - bufAbsoluteStart,
- // (pos -1) - (colonPos + 1));
- pos - 2 - (colonPos - bufAbsoluteStart));
+ // (pos -1) - (colonPos + 1));
+ pos - 2 - (colonPos - bufAbsoluteStart));
} else {
prefix = elPrefix[depth] = null;
elName[depth] = newString(buf, nameStart - bufAbsoluteStart, elLen);
@@ -1743,10 +1766,11 @@ public class MXParser implements XmlPullParser {
String uri = getNamespace(prefix);
if (uri == null) {
if (prefix == null) { // no prefix and no uri => use default
- // namespace
+ // namespace
uri = NO_NAMESPACE;
} else {
- throw new XmlPullParserException("could not determine namespace bound to element prefix " + prefix, this, null);
+ throw new XmlPullParserException(
+ "could not determine namespace bound to element prefix " + prefix, this, null);
}
}
@@ -1763,7 +1787,8 @@ public class MXParser implements XmlPullParser {
if (attrPrefix != null) {
final String attrUri = getNamespace(attrPrefix);
if (attrUri == null) {
- throw new XmlPullParserException("could not determine namespace bound to attribute prefix " + attrPrefix, this, null);
+ throw new XmlPullParserException(
+ "could not determine namespace bound to attribute prefix " + attrPrefix, this, null);
}
attributeUri[i] = attrUri;
@@ -1780,8 +1805,9 @@ public class MXParser implements XmlPullParser {
for (int i = 1; i < attributeCount; i++) {
for (int j = 0; j < i; j++) {
if (attributeUri[j] == attributeUri[i]
- && (allStringsInterned && attributeName[j].equals(attributeName[i])
- || (!allStringsInterned && attributeNameHash[j] == attributeNameHash[i] && attributeName[j].equals(attributeName[i])))
+ && (allStringsInterned && attributeName[j].equals(attributeName[i])
+ || (!allStringsInterned && attributeNameHash[j] == attributeNameHash[i]
+ && attributeName[j].equals(attributeName[i])))
) {
// prepare data for nice error message?
@@ -1803,7 +1829,8 @@ public class MXParser implements XmlPullParser {
for (int i = 1; i < attributeCount; i++) {
for (int j = 0; j < i; j++) {
if ((allStringsInterned && attributeName[j].equals(attributeName[i])
- || (!allStringsInterned && attributeNameHash[j] == attributeNameHash[i] && attributeName[j].equals(attributeName[i])))
+ || (!allStringsInterned && attributeNameHash[j] == attributeNameHash[i]
+ && attributeName[j].equals(attributeName[i])))
) {
// prepare data for nice error message?
@@ -1830,7 +1857,8 @@ public class MXParser implements XmlPullParser {
int colonPos = -1;
char ch = buf[pos - 1];
if (ch == ':' && processNamespaces)
- throw new XmlPullParserException("when namespaces processing enabled colon can not be at attribute name start", this, null);
+ throw new XmlPullParserException(
+ "when namespaces processing enabled colon can not be at attribute name start", this, null);
boolean startsWithXmlns = processNamespaces && ch == 'x';
int xmlnsPos = 0;
@@ -1854,13 +1882,15 @@ public class MXParser implements XmlPullParser {
startsWithXmlns = false;
} else {
if (ch != ':')
- throw new XmlPullParserException("after xmlns in attribute name must be colon" + " when namespaces are enabled", this, null);
+ throw new XmlPullParserException(
+ "after xmlns in attribute name must be colon" + " when namespaces are enabled", this, null);
// colonPos = pos - 1 + bufAbsoluteStart;
}
}
if (ch == ':') {
if (colonPos != -1)
- throw new XmlPullParserException("only one colon is allowed in attribute name" + " when namespaces are enabled", this, null);
+ throw new XmlPullParserException(
+ "only one colon is allowed in attribute name" + " when namespaces are enabled", this, null);
colonPos = pos - 1 + bufAbsoluteStart;
}
}
@@ -1881,10 +1911,11 @@ public class MXParser implements XmlPullParser {
// prefix = attributePrefix[ attributeCount ] = null;
final int nameLen = pos - 2 - (colonPos - bufAbsoluteStart);
if (nameLen == 0) {
- throw new XmlPullParserException("namespace prefix is required after xmlns: " + " when namespaces are enabled", this, null);
+ throw new XmlPullParserException(
+ "namespace prefix is required after xmlns: " + " when namespaces are enabled", this, null);
}
name = // attributeName[ attributeCount ] =
- newString(buf, colonPos - bufAbsoluteStart + 1, nameLen);
+ newString(buf, colonPos - bufAbsoluteStart + 1, nameLen);
// pos - 1 - (colonPos + 1 - bufAbsoluteStart)
}
} else {
@@ -1899,7 +1930,8 @@ public class MXParser implements XmlPullParser {
// name.substring(0, colonPos-nameStart);
} else {
prefix = attributePrefix[attributeCount] = null;
- name = attributeName[attributeCount] = newString(buf, nameStart - bufAbsoluteStart, pos - 1 - (nameStart - bufAbsoluteStart));
+ name = attributeName[attributeCount]
+ = newString(buf, nameStart - bufAbsoluteStart, pos - 1 - (nameStart - bufAbsoluteStart));
}
if (!allStringsInterned) {
attributeNameHash[attributeCount] = name.hashCode();
@@ -1908,7 +1940,8 @@ public class MXParser implements XmlPullParser {
} else {
// retrieve name
- name = attributeName[attributeCount] = newString(buf, nameStart - bufAbsoluteStart, pos - 1 - (nameStart - bufAbsoluteStart));
+ name = attributeName[attributeCount]
+ = newString(buf, nameStart - bufAbsoluteStart, pos - 1 - (nameStart - bufAbsoluteStart));
//// assert name != null;
if (!allStringsInterned) {
attributeNameHash[attributeCount] = name.hashCode();
@@ -1930,7 +1963,8 @@ public class MXParser implements XmlPullParser {
// | "'" ([^<&'] | Reference)* "'"
final char delimit = ch;
if (delimit != '"' && delimit != '\'')
- throw new XmlPullParserException("attribute value must start with quotation or apostrophe not " + printable(delimit), this, null);
+ throw new XmlPullParserException(
+ "attribute value must start with quotation or apostrophe not " + printable(delimit), this, null);
// parse until delimit or < and resolve Reference
// [67] Reference ::= EntityRef | CharRef
// int valueStart = pos + bufAbsoluteStart;
@@ -1969,7 +2003,8 @@ public class MXParser implements XmlPullParser {
if (entityRefName == null) {
entityRefName = newString(buf, posStart, posEnd - posStart);
}
- throw new XmlPullParserException("could not resolve entity named '" + printable(entityRefName) + "'", this, null);
+ throw new XmlPullParserException(
+ "could not resolve entity named '" + printable(entityRefName) + "'", this, null);
}
// write into PC replacement text - do merge for replacement
// text!!!!
@@ -2020,7 +2055,8 @@ public class MXParser implements XmlPullParser {
int prefixHash = -1;
if (colonPos != -1) {
if (ns.length() == 0) {
- throw new XmlPullParserException("non-default namespace can not be declared to be empty string", this, null);
+ throw new XmlPullParserException(
+ "non-default namespace can not be declared to be empty string", this, null);
}
// declare new namespace
namespacePrefix[namespaceEnd] = name;
@@ -2030,7 +2066,7 @@ public class MXParser implements XmlPullParser {
} else {
// declare new default namespace ...
namespacePrefix[namespaceEnd] = null; // ""; //null; //TODO
- // check FIXME Alek
+ // check FIXME Alek
if (!allStringsInterned) {
prefixHash = namespacePrefixHash[namespaceEnd] = -1;
}
@@ -2041,7 +2077,8 @@ public class MXParser implements XmlPullParser {
final int startNs = elNamespaceCount[depth - 1];
for (int i = namespaceEnd - 1; i >= startNs; --i) {
if (((allStringsInterned || name == null) && namespacePrefix[i] == name)
- || (!allStringsInterned && name != null && namespacePrefixHash[i] == prefixHash && name.equals(namespacePrefix[i]))) {
+ || (!allStringsInterned && name != null && namespacePrefixHash[i] == prefixHash
+ && name.equals(namespacePrefix[i]))) {
final String s = name == null ? "default" : "'" + name + "'";
throw new XmlPullParserException("duplicated namespace declaration for " + s + " prefix", this, null);
}
@@ -2081,26 +2118,28 @@ public class MXParser implements XmlPullParser {
while (true) {
ch = more();
if (ch >= '0' && ch <= '9') {
- charRef = (char)(charRef * 16 + (ch - '0'));
+ charRef = (char) (charRef * 16 + (ch - '0'));
} else if (ch >= 'a' && ch <= 'f') {
- charRef = (char)(charRef * 16 + (ch - ('a' - 10)));
+ charRef = (char) (charRef * 16 + (ch - ('a' - 10)));
} else if (ch >= 'A' && ch <= 'F') {
- charRef = (char)(charRef * 16 + (ch - ('A' - 10)));
+ charRef = (char) (charRef * 16 + (ch - ('A' - 10)));
} else if (ch == ';') {
break;
} else {
- throw new XmlPullParserException("character reference (with hex value) may not contain " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "character reference (with hex value) may not contain " + printable(ch), this, null);
}
}
} else {
// encoded in decimal
while (true) {
if (ch >= '0' && ch <= '9') {
- charRef = (char)(charRef * 10 + (ch - '0'));
+ charRef = (char) (charRef * 10 + (ch - '0'));
} else if (ch == ';') {
break;
} else {
- throw new XmlPullParserException("character reference (with decimal value) may not contain " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "character reference (with decimal value) may not contain " + printable(ch), this, null);
}
ch = more();
}
@@ -2115,7 +2154,8 @@ public class MXParser implements XmlPullParser {
// [68] EntityRef ::= '&' Name ';'
// scan name until ;
if (!isNameStartChar(ch)) {
- throw new XmlPullParserException("entity reference names can not start with character '" + printable(ch) + "'", this, null);
+ throw new XmlPullParserException(
+ "entity reference names can not start with character '" + printable(ch) + "'", this, null);
}
while (true) {
ch = more();
@@ -2123,7 +2163,8 @@ public class MXParser implements XmlPullParser {
break;
}
if (!isNameChar(ch)) {
- throw new XmlPullParserException("entity reference name can not contain character " + printable(ch) + "'", this, null);
+ throw new XmlPullParserException(
+ "entity reference name can not contain character " + printable(ch) + "'", this, null);
}
}
posEnd = pos - 1;
@@ -2151,13 +2192,15 @@ public class MXParser implements XmlPullParser {
}
charRefOneCharBuf[0] = '>';
return charRefOneCharBuf;
- } else if (len == 4 && buf[posStart] == 'a' && buf[posStart + 1] == 'p' && buf[posStart + 2] == 'o' && buf[posStart + 3] == 's') {
+ } else if (len == 4 && buf[posStart] == 'a' && buf[posStart + 1] == 'p' && buf[posStart + 2] == 'o'
+ && buf[posStart + 3] == 's') {
if (tokenize) {
text = "'";
}
charRefOneCharBuf[0] = '\'';
return charRefOneCharBuf;
- } else if (len == 4 && buf[posStart] == 'q' && buf[posStart + 1] == 'u' && buf[posStart + 2] == 'o' && buf[posStart + 3] == 't') {
+ } else if (len == 4 && buf[posStart] == 'q' && buf[posStart + 1] == 'u' && buf[posStart + 2] == 'o'
+ && buf[posStart + 3] == 't') {
if (tokenize) {
text = "\"";
}
@@ -2226,7 +2269,8 @@ public class MXParser implements XmlPullParser {
// scan until it hits -->
ch = more();
if (seenDashDash && ch != '>') {
- throw new XmlPullParserException("in comment after two dashes (--) next character must be >" + " not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "in comment after two dashes (--) next character must be >" + " not " + printable(ch), this, null);
}
if (ch == '-') {
if (!seenDash) {
@@ -2284,7 +2328,8 @@ public class MXParser implements XmlPullParser {
} catch (EOFException ex) {
// detect EOF and create meaningful error ...
- throw new XmlPullParserException("comment started on line " + curLine + " and column " + curColumn + " was not closed", this, ex);
+ throw new XmlPullParserException(
+ "comment started on line " + curLine + " and column " + curColumn + " was not closed", this, ex);
}
if (tokenize) {
posEnd = pos - 3;
@@ -2313,7 +2358,8 @@ public class MXParser implements XmlPullParser {
boolean seenQ = false;
char ch = more();
if (isS(ch)) {
- throw new XmlPullParserException("processing instruction PITarget must be exactly after <? and not white space character", this, null);
+ throw new XmlPullParserException(
+ "processing instruction PITarget must be exactly after <? and not white space character", this, null);
}
while (true) {
// scan until it hits ?>
@@ -2333,14 +2379,17 @@ public class MXParser implements XmlPullParser {
// [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm')
// ('L' | 'l'))
if ((piTargetEnd - piTargetStart) == 3) {
- if ((buf[piTargetStart] == 'x' || buf[piTargetStart] == 'X') && (buf[piTargetStart + 1] == 'm' || buf[piTargetStart + 1] == 'M')
- && (buf[piTargetStart + 2] == 'l' || buf[piTargetStart + 2] == 'L')) {
+ if ((buf[piTargetStart] == 'x' || buf[piTargetStart] == 'X')
+ && (buf[piTargetStart + 1] == 'm' || buf[piTargetStart + 1] == 'M')
+ && (buf[piTargetStart + 2] == 'l' || buf[piTargetStart + 2] == 'L')) {
if (piTargetStart > 3) { // <?xml is allowed as
- // first characters in
- // input ...
- throw new XmlPullParserException("processing instruction can not have PITarget with reserveld xml name", this, null);
+ // first characters in
+ // input ...
+ throw new XmlPullParserException(
+ "processing instruction can not have PITarget with reserveld xml name", this, null);
} else {
- if (buf[piTargetStart] != 'x' && buf[piTargetStart + 1] != 'm' && buf[piTargetStart + 2] != 'l') {
+ if (buf[piTargetStart] != 'x' && buf[piTargetStart + 1] != 'm'
+ && buf[piTargetStart + 2] != 'l') {
throw new XmlPullParserException("XMLDecl must have xml name in lowercase", this, null);
}
}
@@ -2395,7 +2444,9 @@ public class MXParser implements XmlPullParser {
}
} catch (EOFException ex) {
// detect EOF and create meaningful error ...
- throw new XmlPullParserException("processing instruction started on line " + curLine + " and column " + curColumn + " was not closed", this, ex);
+ throw new XmlPullParserException(
+ "processing instruction started on line " + curLine + " and column " + curColumn + " was not closed", this,
+ ex);
}
if (piTargetEnd == -1) {
piTargetEnd = pos - 2 + bufAbsoluteStart;
@@ -2448,7 +2499,8 @@ public class MXParser implements XmlPullParser {
ch = more();
ch = skipS(ch);
if (ch != '\'' && ch != '"') {
- throw new XmlPullParserException("expected apostrophe (') or quotation mark (\") after version and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected apostrophe (') or quotation mark (\") after version and not " + printable(ch), this, null);
}
final char quotChar = ch;
// int versionStart = pos + bufAbsoluteStart; // required if
@@ -2457,23 +2509,29 @@ public class MXParser implements XmlPullParser {
ch = more();
// [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+
while (ch != quotChar) {
- if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z') && (ch < '0' || ch > '9') && ch != '_' && ch != '.' && ch != ':' && ch != '-') {
- throw new XmlPullParserException("<?xml version value expected to be in ([a-zA-Z0-9_.:] | '-')" + " not " + printable(ch), this, null);
+ if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z') && (ch < '0' || ch > '9') && ch != '_' && ch != '.'
+ && ch != ':' && ch != '-') {
+ throw new XmlPullParserException(
+ "<?xml version value expected to be in ([a-zA-Z0-9_.:] | '-')" + " not " + printable(ch), this, null);
}
ch = more();
}
final int versionEnd = pos - 1;
parseXmlDeclWithVersion(versionStart, versionEnd);
preventBufferCompaction = false; // alow again buffer commpaction - pos
- // MAY chnage
+ // MAY chnage
}
// protected String xmlDeclVersion;
protected void parseXmlDeclWithVersion(int versionStart, int versionEnd) throws XmlPullParserException, IOException {
// check version is "1.0"
- if ((versionEnd - versionStart != 3) || buf[versionStart] != '1' || buf[versionStart + 1] != '.' || buf[versionStart + 2] != '0') {
- throw new XmlPullParserException("only 1.0 is supported as <?xml version not '" + printable(new String(buf, versionStart, versionEnd - versionStart)) + "'", this,
- null);
+ if ((versionEnd - versionStart != 3) || buf[versionStart] != '1' || buf[versionStart + 1] != '.'
+ || buf[versionStart + 2] != '0') {
+ throw new XmlPullParserException(
+ "only 1.0 is supported as <?xml version not '"
+ + printable(new String(buf, versionStart, versionEnd - versionStart)) + "'",
+ this,
+ null);
}
xmlDeclVersion = newString(buf, versionStart, versionEnd - versionStart);
@@ -2486,24 +2544,30 @@ public class MXParser implements XmlPullParser {
ch = requireInput(ch, NCODING);
ch = skipS(ch);
if (ch != '=') {
- throw new XmlPullParserException("expected equals sign (=) after encoding and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected equals sign (=) after encoding and not " + printable(ch), this, null);
}
ch = more();
ch = skipS(ch);
if (ch != '\'' && ch != '"') {
- throw new XmlPullParserException("expected apostrophe (') or quotation mark (\") after encoding and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected apostrophe (') or quotation mark (\") after encoding and not " + printable(ch), this, null);
}
final char quotChar = ch;
final int encodingStart = pos;
ch = more();
// [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) {
- throw new XmlPullParserException("<?xml encoding name expected to start with [A-Za-z]" + " not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "<?xml encoding name expected to start with [A-Za-z]" + " not " + printable(ch), this, null);
}
ch = more();
while (ch != quotChar) {
- if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z') && (ch < '0' || ch > '9') && ch != '.' && ch != '_' && ch != '-') {
- throw new XmlPullParserException("<?xml encoding value expected to be in ([A-Za-z0-9._] | '-')" + " not " + printable(ch), this, null);
+ if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z') && (ch < '0' || ch > '9') && ch != '.' && ch != '_'
+ && ch != '-') {
+ throw new XmlPullParserException(
+ "<?xml encoding value expected to be in ([A-Za-z0-9._] | '-')" + " not " + printable(ch), this,
+ null);
}
ch = more();
}
@@ -2522,12 +2586,14 @@ public class MXParser implements XmlPullParser {
ch = requireInput(ch, TANDALONE);
ch = skipS(ch);
if (ch != '=') {
- throw new XmlPullParserException("expected equals sign (=) after standalone and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected equals sign (=) after standalone and not " + printable(ch), this, null);
}
ch = more();
ch = skipS(ch);
if (ch != '\'' && ch != '"') {
- throw new XmlPullParserException("expected apostrophe (') or quotation mark (\") after encoding and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected apostrophe (') or quotation mark (\") after encoding and not " + printable(ch), this, null);
}
char quotChar = ch;
int standaloneStart = pos;
@@ -2541,10 +2607,12 @@ public class MXParser implements XmlPullParser {
// Boolean standalone = new Boolean(false);
xmlDeclStandalone = Boolean.FALSE;
} else {
- throw new XmlPullParserException("expected 'yes' or 'no' after standalone and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected 'yes' or 'no' after standalone and not " + printable(ch), this, null);
}
if (ch != quotChar) {
- throw new XmlPullParserException("expected " + quotChar + " after standalone value not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected " + quotChar + " after standalone value not " + printable(ch), this, null);
}
ch = more();
}
@@ -2558,24 +2626,24 @@ public class MXParser implements XmlPullParser {
throw new XmlPullParserException("expected ?> as last part of <?xml not " + printable(ch), this, null);
}
-// NOTE: this code is broken as for some types of input streams (URLConnection ...)
-// it is not possible to do more than once new InputStreamReader(inputStream)
-// as it somehow detects it and closes undelrying inout stram (b.....d!)
-// In future one will need better low level byte-by-byte reading of prolog and then doing InputStream ...
-// for more details see http://www.extreme.indiana.edu/bugzilla/show_bug.cgi?id=135
+ // NOTE: this code is broken as for some types of input streams (URLConnection ...)
+ // it is not possible to do more than once new InputStreamReader(inputStream)
+ // as it somehow detects it and closes undelrying inout stram (b.....d!)
+ // In future one will need better low level byte-by-byte reading of prolog and then doing InputStream ...
+ // for more details see http://www.extreme.indiana.edu/bugzilla/show_bug.cgi?id=135
// //reset input stream
-// if ((this.inputEncoding != oldEncoding) && (this.inputStream != null)) {
-// if ((this.inputEncoding != null) && (!this.inputEncoding.equalsIgnoreCase(oldEncoding))) {
-// // //there is need to reparse input to set location OK
-// // reset();
-// this.reader = new InputStreamReader(this.inputStream, this.inputEncoding);
-// // //skip <?xml
-// // for (int i = 0; i < 5; i++){
-// // ch=more();
-// // }
-// // parseXmlDecl(ch);
-// }
-// }
+ // if ((this.inputEncoding != oldEncoding) && (this.inputStream != null)) {
+ // if ((this.inputEncoding != null) && (!this.inputEncoding.equalsIgnoreCase(oldEncoding))) {
+ // // //there is need to reparse input to set location OK
+ // // reset();
+ // this.reader = new InputStreamReader(this.inputStream, this.inputEncoding);
+ // // //skip <?xml
+ // // for (int i = 0; i < 5; i++){
+ // // ch=more();
+ // // }
+ // // parseXmlDecl(ch);
+ // }
+ // }
}
protected void parseDocdecl() throws XmlPullParserException, IOException {
@@ -2763,7 +2831,8 @@ public class MXParser implements XmlPullParser {
}
} catch (EOFException ex) {
// detect EOF and create meaningful error ...
- throw new XmlPullParserException("CDATA section started on line " + curLine + " and column " + curColumn + " was not closed", this, ex);
+ throw new XmlPullParserException(
+ "CDATA section started on line " + curLine + " and column " + curColumn + " was not closed", this, ex);
}
if (normalizeInput) {
if (usePC) {
@@ -2806,8 +2875,10 @@ public class MXParser implements XmlPullParser {
// //assert bufStart > 0
System.arraycopy(buf, bufStart, buf, 0, bufEnd - bufStart);
if (TRACE_SIZING)
- System.out.println("TRACE_SIZING fillBuf() compacting " + bufStart + " bufEnd=" + bufEnd + " pos=" + pos + " posStart=" + posStart + " posEnd=" + posEnd
- + " buf first 100 chars:" + new String(buf, bufStart, bufEnd - bufStart < 100 ? bufEnd - bufStart : 100));
+ System.out.println("TRACE_SIZING fillBuf() compacting " + bufStart + " bufEnd=" + bufEnd + " pos=" + pos
+ + " posStart=" + posStart + " posEnd=" + posEnd
+ + " buf first 100 chars:"
+ + new String(buf, bufStart, bufEnd - bufStart < 100 ? bufEnd - bufStart : 100));
} else if (expand) {
final int newSize = 2 * buf.length;
@@ -2818,7 +2889,7 @@ public class MXParser implements XmlPullParser {
buf = newBuf;
if (bufLoadFactor > 0) {
// bufSoftLimit = ( bufLoadFactor * buf.length ) /100;
- bufSoftLimit = (int)((((long)bufLoadFactor) * buf.length) / 100);
+ bufSoftLimit = (int) ((((long) bufLoadFactor) * buf.length) / 100);
}
} else {
@@ -2831,7 +2902,8 @@ public class MXParser implements XmlPullParser {
bufAbsoluteStart += bufStart;
bufStart = 0;
if (TRACE_SIZING)
- System.out.println("TRACE_SIZING fillBuf() after bufEnd=" + bufEnd + " pos=" + pos + " posStart=" + posStart + " posEnd=" + posEnd + " buf first 100 chars:"
+ System.out.println("TRACE_SIZING fillBuf() after bufEnd=" + bufEnd + " pos=" + pos + " posStart=" + posStart
+ + " posEnd=" + posEnd + " buf first 100 chars:"
+ new String(buf, 0, bufEnd < 100 ? bufEnd : 100));
}
// at least one character must be read or error
@@ -2840,7 +2912,8 @@ public class MXParser implements XmlPullParser {
if (ret > 0) {
bufEnd += ret;
if (TRACE_SIZING)
- System.out.println("TRACE_SIZING fillBuf() after filling in buffer" + " buf first 100 chars:" + new String(buf, 0, bufEnd < 100 ? bufEnd : 100));
+ System.out.println("TRACE_SIZING fillBuf() after filling in buffer" + " buf first 100 chars:"
+ + new String(buf, 0, bufEnd < 100 ? bufEnd : 100));
return;
}
@@ -2860,7 +2933,7 @@ public class MXParser implements XmlPullParser {
expectedTagStack.append(" - expected end tag");
if (depth > 1) {
expectedTagStack.append("s"); // more than one end
- // tag
+ // tag
}
expectedTagStack.append(" ");
for (int i = depth; i > 0; i--) {
@@ -2871,7 +2944,7 @@ public class MXParser implements XmlPullParser {
for (int i = depth; i > 0; i--) {
if (i != depth) {
expectedTagStack.append(" and"); // more than
- // one end tag
+ // one end tag
}
String tagName = new String(elRawName[i], 0, elRawNameEnd[i]);
expectedTagStack.append(" start tag <").append(tagName).append('>');
@@ -2893,7 +2966,7 @@ public class MXParser implements XmlPullParser {
// this return value should be ignonored as it is used in epilog
// parsing ...
if (reachedEnd)
- return (char)-1;
+ return (char) -1;
}
final char ch = buf[pos++];
// line/columnNumber
@@ -2945,7 +3018,9 @@ public class MXParser implements XmlPullParser {
protected char requireInput(char ch, char[] input) throws XmlPullParserException, IOException {
for (int i = 0; i < input.length; i++) {
if (ch != input[i]) {
- throw new XmlPullParserException("expected " + printable(input[i]) + " in " + new String(input) + " and not " + printable(ch), this, null);
+ throw new XmlPullParserException(
+ "expected " + printable(input[i]) + " in " + new String(input) + " and not " + printable(ch), this,
+ null);
}
ch = more();
}
@@ -2970,7 +3045,7 @@ public class MXParser implements XmlPullParser {
// nameStart / name lookup tables based on XML 1.1
// http://www.w3.org/TR/2001/WD-xml11-20011213/
protected static final int LOOKUP_MAX = 0x400;
- protected static final char LOOKUP_MAX_CHAR = (char)LOOKUP_MAX;
+ protected static final char LOOKUP_MAX_CHAR = (char) LOOKUP_MAX;
// protected static int lookupNameStartChar[] = new int[ LOOKUP_MAX_CHAR /
// 32 ];
// protected static int lookupNameChar[] = new int[ LOOKUP_MAX_CHAR / 32 ];
@@ -3015,8 +3090,9 @@ public class MXParser implements XmlPullParser {
// private final static boolean isNameStartChar(char ch) {
protected boolean isNameStartChar(char ch) {
- return (ch < LOOKUP_MAX_CHAR && lookupNameStartChar[ch]) || (ch >= LOOKUP_MAX_CHAR && ch <= '\u2027') || (ch >= '\u202A' && ch <= '\u218F')
- || (ch >= '\u2800' && ch <= '\uFFEF');
+ return (ch < LOOKUP_MAX_CHAR && lookupNameStartChar[ch]) || (ch >= LOOKUP_MAX_CHAR && ch <= '\u2027')
+ || (ch >= '\u202A' && ch <= '\u218F')
+ || (ch >= '\u2800' && ch <= '\uFFEF');
// if(ch < LOOKUP_MAX_CHAR) return lookupNameStartChar[ ch ];
// else return ch <= '\u2027'
@@ -3050,8 +3126,9 @@ public class MXParser implements XmlPullParser {
// if(ch < LOOKUP_MAX_CHAR) return (lookupNameChar[ (int)ch / 32 ] & (1
// << (ch % 32))) != 0;
- return (ch < LOOKUP_MAX_CHAR && lookupNameChar[ch]) || (ch >= LOOKUP_MAX_CHAR && ch <= '\u2027') || (ch >= '\u202A' && ch <= '\u218F')
- || (ch >= '\u2800' && ch <= '\uFFEF');
+ return (ch < LOOKUP_MAX_CHAR && lookupNameChar[ch]) || (ch >= LOOKUP_MAX_CHAR && ch <= '\u2027')
+ || (ch >= '\u202A' && ch <= '\u218F')
+ || (ch >= '\u2800' && ch <= '\uFFEF');
// return false;
// return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch ==
// ':'
@@ -3092,7 +3169,7 @@ public class MXParser implements XmlPullParser {
return "\\'";
}
if (ch > 127 || ch < 32) {
- return "\\u" + Integer.toHexString((int)ch);
+ return "\\u" + Integer.toHexString((int) ch);
}
return String.valueOf(ch);
}
@@ -3146,4 +3223,3 @@ public class MXParser implements XmlPullParser {
* TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, AND TO THE
* PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING SOFTWARE.
*/
-
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
index cebc83ea1f3..d92d4be055e 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
@@ -27,69 +27,56 @@ import java.io.Reader;
// https://github.com/xmlpull-org/xmlpull-api-v1/blob/master/src/java/api/org/xmlpull/v1/XmlPullParser.java
/**
- * XML Pull Parser is an interface that defines parsing functionality provided
- * in <a href="http://www.xmlpull.org/">XMLPULL V1 API</a> (visit this website
- * to learn more about API and its implementations).
+ * XML Pull Parser is an interface that defines parsing functionality provided in
+ * <a href="http://www.xmlpull.org/">XMLPULL V1 API</a> (visit this website to learn more about API and its
+ * implementations).
* <p>
- * There are following different kinds of parser depending on which features are
- * set:
+ * There are following different kinds of parser depending on which features are set:
* <ul>
- * <li><b>non-validating</b> parser as defined in XML 1.0 spec when
- * FEATURE_PROCESS_DOCDECL is set to true
- * <li><b>validating parser</b> as defined in XML 1.0 spec when
- * FEATURE_VALIDATION is true (and that implies that FEATURE_PROCESS_DOCDECL is
- * true)
- * <li>when FEATURE_PROCESS_DOCDECL is false (this is default and if different
- * value is required necessary must be changed before parsing is started) then
- * parser behaves like XML 1.0 compliant non-validating parser under condition
- * that <em>no DOCDECL is present</em> in XML documents (internal entities can
- * still be defined with defineEntityReplacementText()). This mode of operation
- * is intended <b>for operation in constrained environments</b> such as J2ME.
+ * <li><b>non-validating</b> parser as defined in XML 1.0 spec when FEATURE_PROCESS_DOCDECL is set to true
+ * <li><b>validating parser</b> as defined in XML 1.0 spec when FEATURE_VALIDATION is true (and that implies that
+ * FEATURE_PROCESS_DOCDECL is true)
+ * <li>when FEATURE_PROCESS_DOCDECL is false (this is default and if different value is required necessary must be
+ * changed before parsing is started) then parser behaves like XML 1.0 compliant non-validating parser under condition
+ * that <em>no DOCDECL is present</em> in XML documents (internal entities can still be defined with
+ * defineEntityReplacementText()). This mode of operation is intended <b>for operation in constrained environments</b>
+ * such as J2ME.
* </ul>
* <p>
- * There are two key methods: next() and nextToken(). While next() provides
- * access to high level parsing events, nextToken() allows access to lower level
- * tokens.
+ * There are two key methods: next() and nextToken(). While next() provides access to high level parsing events,
+ * nextToken() allows access to lower level tokens.
* <p>
- * The current event state of the parser can be determined by calling the
- * <a href="#getEventType()">getEventType()</a> method. Initially, the parser is
- * in the <a href="#START_DOCUMENT">START_DOCUMENT</a> state.
+ * The current event state of the parser can be determined by calling the <a href="#getEventType()">getEventType()</a>
+ * method. Initially, the parser is in the <a href="#START_DOCUMENT">START_DOCUMENT</a> state.
* <p>
- * The method <a href="#next()">next()</a> advances the parser to the next
- * event. The int value returned from next determines the current parser state
- * and is identical to the value returned from following calls to getEventType
- * ().
+ * The method <a href="#next()">next()</a> advances the parser to the next event. The int value returned from next
+ * determines the current parser state and is identical to the value returned from following calls to getEventType ().
* <p>
* The following event types are seen by next()
* <dl>
* <dt><a href="#START_TAG">START_TAG</a>
* <dd>An XML start tag was read.
* <dt><a href="#TEXT">TEXT</a>
- * <dd>Text content was read; the text content can be retrieved using the
- * getText() method. (when in validating mode next() will not report ignorable
- * whitespaces, use nextToken() instead)
+ * <dd>Text content was read; the text content can be retrieved using the getText() method. (when in validating mode
+ * next() will not report ignorable whitespaces, use nextToken() instead)
* <dt><a href="#END_TAG">END_TAG</a>
* <dd>An end tag was read
* <dt><a href="#END_DOCUMENT">END_DOCUMENT</a>
* <dd>No more events are available
* </dl>
* <p>
- * after first next() or nextToken() (or any other next*() method) is called
- * user application can obtain XML version, standalone and encoding from XML
- * declaration in following ways:
+ * after first next() or nextToken() (or any other next*() method) is called user application can obtain XML version,
+ * standalone and encoding from XML declaration in following ways:
* <ul>
* <li><b>version</b>: getProperty("<a href=
* "http://xmlpull.org/v1/doc/properties.html#xmldecl-version">http://xmlpull.org/v1/doc/properties.html#xmldecl-version</a>")
- * returns String ("1.0") or null if XMLDecl was not read or if property is not
- * supported
+ * returns String ("1.0") or null if XMLDecl was not read or if property is not supported
* <li><b>standalone</b>: getProperty("<a href=
* "http://xmlpull.org/v1/doc/features.html#xmldecl-standalone">http://xmlpull.org/v1/doc/features.html#xmldecl-standalone</a>")
- * returns Boolean: null if there was no standalone declaration or if property
- * is not supported otherwise returns Boolean(true) if standalone="yes" and
- * Boolean(false) when standalone="no"
- * <li><b>encoding</b>: obtained from getInputEncoding() null if stream had
- * unknown encoding (not set in setInputStream) and it was not declared in
- * XMLDecl
+ * returns Boolean: null if there was no standalone declaration or if property is not supported otherwise returns
+ * Boolean(true) if standalone="yes" and Boolean(false) when standalone="no"
+ * <li><b>encoding</b>: obtained from getInputEncoding() null if stream had unknown encoding (not set in setInputStream)
+ * and it was not declared in XMLDecl
* </ul>
* A minimal example for using this API may look as follows:
*
@@ -137,28 +124,25 @@ import java.io.Reader;
* End tag foo
* </pre>
*
- * For more details on API usage, please refer to the quick Introduction
- * available at <a href="http://www.xmlpull.org">http://www.xmlpull.org</a>
+ * For more details on API usage, please refer to the quick Introduction available at
+ * <a href="http://www.xmlpull.org">http://www.xmlpull.org</a>
*
- * @see #defineEntityReplacementText
- * @see #getName
- * @see #getNamespace
- * @see #getText
- * @see #next
- * @see #nextToken
- * @see #setInput
- * @see #FEATURE_PROCESS_DOCDECL
- * @see #FEATURE_VALIDATION
- * @see #START_DOCUMENT
- * @see #START_TAG
- * @see #TEXT
- * @see #END_TAG
- * @see #END_DOCUMENT
- * @author <a href=
- * "http://www-ai.cs.uni-dortmund.de/PERSONAL/haustein.html">Stefan
- * Haustein</a>
- * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander
- * Slominski</a>
+ * @see #defineEntityReplacementText
+ * @see #getName
+ * @see #getNamespace
+ * @see #getText
+ * @see #next
+ * @see #nextToken
+ * @see #setInput
+ * @see #FEATURE_PROCESS_DOCDECL
+ * @see #FEATURE_VALIDATION
+ * @see #START_DOCUMENT
+ * @see #START_TAG
+ * @see #TEXT
+ * @see #END_TAG
+ * @see #END_DOCUMENT
+ * @author <a href= "http://www-ai.cs.uni-dortmund.de/PERSONAL/haustein.html">Stefan Haustein</a>
+ * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
public interface XmlPullParser {
@@ -170,9 +154,8 @@ public interface XmlPullParser {
// EVENT TYPES as reported by next()
/**
- * Signalize that parser is at the very beginning of the document and
- * nothing was read yet. This event type can only be observed by calling
- * getEvent() before the first call to next(), nextToken, or nextTag()).
+ * Signalize that parser is at the very beginning of the document and nothing was read yet. This event type can only
+ * be observed by calling getEvent() before the first call to next(), nextToken, or nextTag()).
*
* @see #next
* @see #nextToken
@@ -180,12 +163,11 @@ public interface XmlPullParser {
int START_DOCUMENT = 0;
/**
- * Logical end of the xml document. Returned from getEventType, next() and
- * nextToken() when the end of the input document has been reached.
+ * Logical end of the xml document. Returned from getEventType, next() and nextToken() when the end of the input
+ * document has been reached.
* <p>
- * <strong>NOTE:</strong> calling again <a href="#next()">next()</a> or
- * <a href="#nextToken()">nextToken()</a> will result in exception being
- * thrown.
+ * <strong>NOTE:</strong> calling again <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a> will
+ * result in exception being thrown.
*
* @see #next
* @see #nextToken
@@ -193,13 +175,11 @@ public interface XmlPullParser {
int END_DOCUMENT = 1;
/**
- * Returned from getEventType(), <a href="#next()">next()</a>,
- * <a href="#nextToken()">nextToken()</a> when a start tag was read. The
- * name of start tag is available from getName(), its namespace and prefix
- * are available from getNamespace() and getPrefix() if
- * <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>. See
- * getAttribute* methods to retrieve element attributes. See getNamespace*
- * methods to retrieve newly declared namespaces.
+ * Returned from getEventType(), <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when a start
+ * tag was read. The name of start tag is available from getName(), its namespace and prefix are available from
+ * getNamespace() and getPrefix() if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>. See
+ * getAttribute* methods to retrieve element attributes. See getNamespace* methods to retrieve newly declared
+ * namespaces.
*
* @see #next
* @see #nextToken
@@ -215,10 +195,9 @@ public interface XmlPullParser {
int START_TAG = 2;
/**
- * Returned from getEventType(), <a href="#next()">next()</a>, or
- * <a href="#nextToken()">nextToken()</a> when an end tag was read. The name
- * of start tag is available from getName(), its namespace and prefix are
- * available from getNamespace() and getPrefix().
+ * Returned from getEventType(), <a href="#next()">next()</a>, or <a href="#nextToken()">nextToken()</a> when an end
+ * tag was read. The name of start tag is available from getName(), its namespace and prefix are available from
+ * getNamespace() and getPrefix().
*
* @see #next
* @see #nextToken
@@ -232,16 +211,12 @@ public interface XmlPullParser {
/**
* Character data was read and will is available by calling getText().
* <p>
- * <strong>Please note:</strong> <a href="#next()">next()</a> will
- * accumulate multiple events into one TEXT event, skipping
- * IGNORABLE_WHITESPACE, PROCESSING_INSTRUCTION and COMMENT events, In
- * contrast, <a href="#nextToken()">nextToken()</a> will stop reading text
- * when any other event is observed. Also, when the state was reached by
- * calling next(), the text value will be normalized, whereas getText() will
- * return unnormalized content in the case of nextToken(). This allows an
- * exact roundtrip without changing line ends when examining low level
- * events, whereas for high level applications the text is normalized
- * appropriately.
+ * <strong>Please note:</strong> <a href="#next()">next()</a> will accumulate multiple events into one TEXT event,
+ * skipping IGNORABLE_WHITESPACE, PROCESSING_INSTRUCTION and COMMENT events, In contrast,
+ * <a href="#nextToken()">nextToken()</a> will stop reading text when any other event is observed. Also, when the
+ * state was reached by calling next(), the text value will be normalized, whereas getText() will return
+ * unnormalized content in the case of nextToken(). This allows an exact roundtrip without changing line ends when
+ * examining low level events, whereas for high level applications the text is normalized appropriately.
*
* @see #next
* @see #nextToken
@@ -253,10 +228,9 @@ public interface XmlPullParser {
// additional events exposed by lower level nextToken()
/**
- * A CDATA sections was just read; this token is available only from calls
- * to <a href="#nextToken()">nextToken()</a>. A call to next() will
- * accumulate various text events into a single event of type TEXT. The text
- * contained in the CDATA section is available by calling getText().
+ * A CDATA sections was just read; this token is available only from calls to
+ * <a href="#nextToken()">nextToken()</a>. A call to next() will accumulate various text events into a single event
+ * of type TEXT. The text contained in the CDATA section is available by calling getText().
*
* @see #nextToken
* @see #getText
@@ -264,13 +238,10 @@ public interface XmlPullParser {
int CDSECT = 5;
/**
- * An entity reference was just read; this token is available from
- * <a href="#nextToken()">nextToken()</a> only. The entity name is available
- * by calling getName(). If available, the replacement text can be obtained
- * by calling getTextt(); otherwise, the user is responsible for resolving
- * the entity reference. This event type is never returned from next();
- * next() will accumulate the replacement text and other text events to a
- * single TEXT event.
+ * An entity reference was just read; this token is available from <a href="#nextToken()">nextToken()</a> only. The
+ * entity name is available by calling getName(). If available, the replacement text can be obtained by calling
+ * getTextt(); otherwise, the user is responsible for resolving the entity reference. This event type is never
+ * returned from next(); next() will accumulate the replacement text and other text events to a single TEXT event.
*
* @see #nextToken
* @see #getText
@@ -278,16 +249,13 @@ public interface XmlPullParser {
int ENTITY_REF = 6;
/**
- * Ignorable whitespace was just read. This token is available only from
- * <a href="#nextToken()">nextToken()</a>). For non-validating parsers, this
- * event is only reported by nextToken() when outside the root element.
- * Validating parsers may be able to detect ignorable whitespace at other
- * locations. The ignorable whitespace string is available by calling
- * getText()
+ * Ignorable whitespace was just read. This token is available only from <a href="#nextToken()">nextToken()</a>).
+ * For non-validating parsers, this event is only reported by nextToken() when outside the root element. Validating
+ * parsers may be able to detect ignorable whitespace at other locations. The ignorable whitespace string is
+ * available by calling getText()
* <p>
- * <strong>NOTE:</strong> this is different from calling the isWhitespace()
- * method, since text content may be whitespace but not ignorable. Ignorable
- * whitespace is skipped by next() automatically; this event type is never
+ * <strong>NOTE:</strong> this is different from calling the isWhitespace() method, since text content may be
+ * whitespace but not ignorable. Ignorable whitespace is skipped by next() automatically; this event type is never
* returned from next().
*
* @see #nextToken
@@ -296,10 +264,9 @@ public interface XmlPullParser {
int IGNORABLE_WHITESPACE = 7;
/**
- * An XML processing instruction declaration was just read. This event type
- * is available only via <a href="#nextToken()">nextToken()</a>. getText()
- * will return text that is inside the processing instruction. Calls to
- * next() will skip processing instructions automatically.
+ * An XML processing instruction declaration was just read. This event type is available only via
+ * <a href="#nextToken()">nextToken()</a>. getText() will return text that is inside the processing instruction.
+ * Calls to next() will skip processing instructions automatically.
*
* @see #nextToken
* @see #getText
@@ -307,10 +274,9 @@ public interface XmlPullParser {
int PROCESSING_INSTRUCTION = 8;
/**
- * An XML comment was just read. This event type is this token is available
- * via <a href="#nextToken()">nextToken()</a> only; calls to next() will
- * skip comments automatically. The content of the comment can be accessed
- * using the getText() method.
+ * An XML comment was just read. This event type is this token is available via
+ * <a href="#nextToken()">nextToken()</a> only; calls to next() will skip comments automatically. The content of the
+ * comment can be accessed using the getText() method.
*
* @see #nextToken
* @see #getText
@@ -318,9 +284,9 @@ public interface XmlPullParser {
int COMMENT = 9;
/**
- * An XML document type declaration was just read. This token is available
- * from <a href="#nextToken()">nextToken()</a> only. The unparsed text
- * inside the doctype is available via the getText() method.
+ * An XML document type declaration was just read. This token is available from
+ * <a href="#nextToken()">nextToken()</a> only. The unparsed text inside the doctype is available via the getText()
+ * method.
*
* @see #nextToken
* @see #getText
@@ -328,25 +294,23 @@ public interface XmlPullParser {
int DOCDECL = 10;
/**
- * This array can be used to convert the event type integer constants such
- * as START_TAG or TEXT to to a string. For example, the value of
- * TYPES[START_TAG] is the string "START_TAG". This array is intended for
- * diagnostic output only. Relying on the contents of the array may be
- * dangerous since malicious applications may alter the array, although it
- * is final, due to limitations of the Java language.
+ * This array can be used to convert the event type integer constants such as START_TAG or TEXT to to a string. For
+ * example, the value of TYPES[START_TAG] is the string "START_TAG". This array is intended for diagnostic output
+ * only. Relying on the contents of the array may be dangerous since malicious applications may alter the array,
+ * although it is final, due to limitations of the Java language.
*/
- String[] TYPES = {"START_DOCUMENT", "END_DOCUMENT", "START_TAG", "END_TAG", "TEXT", "CDSECT", "ENTITY_REF", "IGNORABLE_WHITESPACE", "PROCESSING_INSTRUCTION", "COMMENT",
- "DOCDECL"};
+ String[] TYPES = {
+ "START_DOCUMENT", "END_DOCUMENT", "START_TAG", "END_TAG", "TEXT", "CDSECT", "ENTITY_REF", "IGNORABLE_WHITESPACE",
+ "PROCESSING_INSTRUCTION", "COMMENT",
+ "DOCDECL" };
// ----------------------------------------------------------------------------
// namespace related features
/**
- * This feature determines whether the parser processes namespaces. As for
- * all features, the default value is false.
+ * This feature determines whether the parser processes namespaces. As for all features, the default value is false.
* <p>
- * <strong>NOTE:</strong> The value can not be changed during parsing an
- * must be set before parsing.
+ * <strong>NOTE:</strong> The value can not be changed during parsing an must be set before parsing.
*
* @see #getFeature
* @see #setFeature
@@ -354,9 +318,8 @@ public interface XmlPullParser {
String FEATURE_PROCESS_NAMESPACES = "http://xmlpull.org/v1/doc/features.html#process-namespaces";
/**
- * This feature determines whether namespace attributes are exposed via the
- * attribute access methods. Like all features, the default value is false.
- * This feature cannot be changed during parsing.
+ * This feature determines whether namespace attributes are exposed via the attribute access methods. Like all
+ * features, the default value is false. This feature cannot be changed during parsing.
*
* @see #getFeature
* @see #setFeature
@@ -364,15 +327,13 @@ public interface XmlPullParser {
String FEATURE_REPORT_NAMESPACE_ATTRIBUTES = "http://xmlpull.org/v1/doc/features.html#report-namespace-prefixes";
/**
- * This feature determines whether the document declaration is processed. If
- * set to false, the DOCDECL event type is reported by nextToken() and
- * ignored by next(). If this feature is activated, then the document
- * declaration must be processed by the parser.
+ * This feature determines whether the document declaration is processed. If set to false, the DOCDECL event type is
+ * reported by nextToken() and ignored by next(). If this feature is activated, then the document declaration must
+ * be processed by the parser.
* <p>
- * <strong>Please note:</strong> If the document type declaration was
- * ignored, entity references may cause exceptions later in the parsing
- * process. The default value of this feature is false. It cannot be changed
- * during parsing.
+ * <strong>Please note:</strong> If the document type declaration was ignored, entity references may cause
+ * exceptions later in the parsing process. The default value of this feature is false. It cannot be changed during
+ * parsing.
*
* @see #getFeature
* @see #setFeature
@@ -380,13 +341,11 @@ public interface XmlPullParser {
String FEATURE_PROCESS_DOCDECL = "http://xmlpull.org/v1/doc/features.html#process-docdecl";
/**
- * If this feature is activated, all validation errors as defined in the XML
- * 1.0 specification are reported. This implies that FEATURE_PROCESS_DOCDECL
- * is true and both, the internal and external document type declaration
- * will be processed.
+ * If this feature is activated, all validation errors as defined in the XML 1.0 specification are reported. This
+ * implies that FEATURE_PROCESS_DOCDECL is true and both, the internal and external document type declaration will
+ * be processed.
* <p>
- * <strong>Please Note:</strong> This feature can not be changed during
- * parsing. The default value is false.
+ * <strong>Please Note:</strong> This feature can not be changed during parsing. The default value is false.
*
* @see #getFeature
* @see #setFeature
@@ -394,125 +353,102 @@ public interface XmlPullParser {
String FEATURE_VALIDATION = "http://xmlpull.org/v1/doc/features.html#validation";
/**
- * Use this call to change the general behaviour of the parser, such as
- * namespace processing or doctype declaration handling. This method must be
- * called before the first call to next or nextToken. Otherwise, an
- * exception is thrown.
+ * Use this call to change the general behaviour of the parser, such as namespace processing or doctype declaration
+ * handling. This method must be called before the first call to next or nextToken. Otherwise, an exception is
+ * thrown.
* <p>
- * Example: call setFeature(FEATURE_PROCESS_NAMESPACES, true) in order to
- * switch on namespace processing. The initial settings correspond to the
- * properties requested from the XML Pull Parser factory. If none were
- * requested, all features are deactivated by default.
+ * Example: call setFeature(FEATURE_PROCESS_NAMESPACES, true) in order to switch on namespace processing. The
+ * initial settings correspond to the properties requested from the XML Pull Parser factory. If none were requested,
+ * all features are deactivated by default.
*
- * @exception XmlPullParserException If the feature is not supported or can
- * not be set
- * @exception IllegalArgumentException If string with the feature name is
- * null
+ * @exception XmlPullParserException If the feature is not supported or can not be set
+ * @exception IllegalArgumentException If string with the feature name is null
*/
void setFeature(String name, boolean state) throws XmlPullParserException;
/**
* Returns the current value of the given feature.
* <p>
- * <strong>Please note:</strong> unknown features are
- * <strong>always</strong> returned as false.
+ * <strong>Please note:</strong> unknown features are <strong>always</strong> returned as false.
*
- * @param name The name of feature to be retrieved.
- * @return The value of the feature.
+ * @param name The name of feature to be retrieved.
+ * @return The value of the feature.
* @exception IllegalArgumentException if string the feature name is null
*/
boolean getFeature(String name);
/**
- * Set the value of a property. The property name is any fully-qualified
- * URI.
+ * Set the value of a property. The property name is any fully-qualified URI.
*
- * @exception XmlPullParserException If the property is not supported or can
- * not be set
- * @exception IllegalArgumentException If string with the property name is
- * null
+ * @exception XmlPullParserException If the property is not supported or can not be set
+ * @exception IllegalArgumentException If string with the property name is null
*/
void setProperty(String name, Object value) throws XmlPullParserException;
/**
- * Look up the value of a property. The property name is any fully-qualified
- * URI.
+ * Look up the value of a property. The property name is any fully-qualified URI.
* <p>
- * <strong>NOTE:</strong> unknown properties are <strong>always</strong>
- * returned as null.
+ * <strong>NOTE:</strong> unknown properties are <strong>always</strong> returned as null.
*
- * @param name The name of property to be retrieved.
- * @return The value of named property.
+ * @param name The name of property to be retrieved.
+ * @return The value of named property.
*/
Object getProperty(String name);
/**
- * Set the input source for parser to the given reader and resets the
- * parser. The event type is set to the initial value START_DOCUMENT.
- * Setting the reader to null will just stop parsing and reset parser state,
- * allowing the parser to free internal resources such as parsing buffers.
+ * Set the input source for parser to the given reader and resets the parser. The event type is set to the initial
+ * value START_DOCUMENT. Setting the reader to null will just stop parsing and reset parser state, allowing the
+ * parser to free internal resources such as parsing buffers.
*/
void setInput(Reader in) throws XmlPullParserException;
/**
- * Sets the input stream the parser is going to process. This call resets
- * the parser state and sets the event type to the initial value
- * START_DOCUMENT.
+ * Sets the input stream the parser is going to process. This call resets the parser state and sets the event type
+ * to the initial value START_DOCUMENT.
* <p>
- * <strong>NOTE:</strong> If an input encoding string is passed, it MUST be
- * used. Otherwise, if inputEncoding is null, the parser SHOULD try to
- * determine input encoding following XML 1.0 specification (see below). If
- * encoding detection is supported then following feature <a href=
+ * <strong>NOTE:</strong> If an input encoding string is passed, it MUST be used. Otherwise, if inputEncoding is
+ * null, the parser SHOULD try to determine input encoding following XML 1.0 specification (see below). If encoding
+ * detection is supported then following feature <a href=
* "http://xmlpull.org/v1/doc/features.html#detect-encoding">http://xmlpull.org/v1/doc/features.html#detect-encoding</a>
* MUST be true and otherwise it must be false
*
- * @param inputStream contains a raw byte input stream of possibly unknown
- * encoding (when inputEncoding is null).
- * @param inputEncoding if not null it MUST be used as encoding for
- * inputStream
+ * @param inputStream contains a raw byte input stream of possibly unknown encoding (when inputEncoding is null).
+ * @param inputEncoding if not null it MUST be used as encoding for inputStream
*/
void setInput(InputStream inputStream, String inputEncoding) throws XmlPullParserException;
/**
- * Returns the input encoding if known, null otherwise. If
- * setInput(InputStream, inputEncoding) was called with an inputEncoding
- * value other than null, this value must be returned from this method.
- * Otherwise, if inputEncoding is null and the parser supports the encoding
- * detection feature
- * (http://xmlpull.org/v1/doc/features.html#detect-encoding), it must return
- * the detected encoding. If setInput(Reader) was called, null is returned.
- * After first call to next if XML declaration was present this method will
- * return encoding declared.
+ * Returns the input encoding if known, null otherwise. If setInput(InputStream, inputEncoding) was called with an
+ * inputEncoding value other than null, this value must be returned from this method. Otherwise, if inputEncoding is
+ * null and the parser supports the encoding detection feature
+ * (http://xmlpull.org/v1/doc/features.html#detect-encoding), it must return the detected encoding. If
+ * setInput(Reader) was called, null is returned. After first call to next if XML declaration was present this
+ * method will return encoding declared.
*/
String getInputEncoding();
/**
* Set new value for entity replacement text as defined in
- * <a href="http://www.w3.org/TR/REC-xml#intern-replacement">XML 1.0 Section
- * 4.5 Construction of Internal Entity Replacement Text</a>. If
- * FEATURE_PROCESS_DOCDECL or FEATURE_VALIDATION are set, calling this
- * function will result in an exception -- when processing of DOCDECL is
- * enabled, there is no need to the entity replacement text manually.
+ * <a href="http://www.w3.org/TR/REC-xml#intern-replacement">XML 1.0 Section 4.5 Construction of Internal Entity
+ * Replacement Text</a>. If FEATURE_PROCESS_DOCDECL or FEATURE_VALIDATION are set, calling this function will result
+ * in an exception -- when processing of DOCDECL is enabled, there is no need to the entity replacement text
+ * manually.
* <p>
- * The motivation for this function is to allow very small implementations
- * of XMLPULL that will work in J2ME environments. Though these
- * implementations may not be able to process the document type declaration,
- * they still can work with known DTDs by using this function.
+ * The motivation for this function is to allow very small implementations of XMLPULL that will work in J2ME
+ * environments. Though these implementations may not be able to process the document type declaration, they still
+ * can work with known DTDs by using this function.
* <p>
- * <b>Please notes:</b> The given value is used literally as replacement
- * text and it corresponds to declaring entity in DTD that has all special
- * characters escaped: left angle bracket is replaced with &lt;,
- * ampersand with &amp; and so on.
+ * <b>Please notes:</b> The given value is used literally as replacement text and it corresponds to declaring entity
+ * in DTD that has all special characters escaped: left angle bracket is replaced with &lt;, ampersand with
+ * &amp; and so on.
* <p>
- * <b>Note:</b> The given value is the literal replacement text and must not
- * contain any other entity reference (if it contains any entity reference
- * there will be no further replacement).
+ * <b>Note:</b> The given value is the literal replacement text and must not contain any other entity reference (if
+ * it contains any entity reference there will be no further replacement).
* <p>
- * <b>Note:</b> The list of pre-defined entity names will always contain
- * standard XML entities such as amp (&amp;), lt (&lt;), gt
- * (&gt;), quot (&quot;), and apos (&apos;). Those cannot be
- * redefined by this method!
+ * <b>Note:</b> The list of pre-defined entity names will always contain standard XML entities such as amp
+ * (&amp;), lt (&lt;), gt (&gt;), quot (&quot;), and apos (&apos;). Those cannot be redefined by
+ * this method!
*
* @see #setInput
* @see #FEATURE_PROCESS_DOCDECL
@@ -521,12 +457,11 @@ public interface XmlPullParser {
void defineEntityReplacementText(String entityName, String replacementText) throws XmlPullParserException;
/**
- * Returns the numbers of elements in the namespace stack for the given
- * depth. If namespaces are not enabled, 0 is returned.
+ * Returns the numbers of elements in the namespace stack for the given depth. If namespaces are not enabled, 0 is
+ * returned.
* <p>
- * <b>NOTE:</b> when parser is on END_TAG then it is allowed to call this
- * function with getDepth()+1 argument to retrieve position of namespace
- * prefixes and URIs that were declared on corresponding START_TAG.
+ * <b>NOTE:</b> when parser is on END_TAG then it is allowed to call this function with getDepth()+1 argument to
+ * retrieve position of namespace prefixes and URIs that were declared on corresponding START_TAG.
* <p>
* <b>NOTE:</b> to retrieve lsit of namespaces declared in current element:
*
@@ -549,33 +484,28 @@ public interface XmlPullParser {
int getNamespaceCount(int depth) throws XmlPullParserException;
/**
- * Returns the namespace prefix for the given position in the namespace
- * stack. Default namespace declaration (xmlns='...') will have null as
- * prefix. If the given index is out of range, an exception is thrown.
+ * Returns the namespace prefix for the given position in the namespace stack. Default namespace declaration
+ * (xmlns='...') will have null as prefix. If the given index is out of range, an exception is thrown.
* <p>
- * <b>Please note:</b> when the parser is on an END_TAG, namespace prefixes
- * that were declared in the corresponding START_TAG are still accessible
- * although they are no longer in scope.
+ * <b>Please note:</b> when the parser is on an END_TAG, namespace prefixes that were declared in the corresponding
+ * START_TAG are still accessible although they are no longer in scope.
*/
String getNamespacePrefix(int pos) throws XmlPullParserException;
/**
- * Returns the namespace URI for the given position in the namespace stack
- * If the position is out of range, an exception is thrown.
+ * Returns the namespace URI for the given position in the namespace stack If the position is out of range, an
+ * exception is thrown.
* <p>
- * <b>NOTE:</b> when parser is on END_TAG then namespace prefixes that were
- * declared in corresponding START_TAG are still accessible even though they
- * are not in scope
+ * <b>NOTE:</b> when parser is on END_TAG then namespace prefixes that were declared in corresponding START_TAG are
+ * still accessible even though they are not in scope
*/
String getNamespaceUri(int pos) throws XmlPullParserException;
/**
- * Returns the URI corresponding to the given prefix, depending on current
- * state of the parser.
+ * Returns the URI corresponding to the given prefix, depending on current state of the parser.
* <p>
- * If the prefix was not declared in the current scope, null is returned.
- * The default namespace is included in the namespace table and is available
- * via getNamespace (null).
+ * If the prefix was not declared in the current scope, null is returned. The default namespace is included in the
+ * namespace table and is available via getNamespace (null).
* <p>
* This method is a convenience method for
*
@@ -588,12 +518,10 @@ public interface XmlPullParser {
* return null;
* </pre>
* <p>
- * <strong>Please note:</strong> parser implementations may provide more
- * efficient lookup, e.g. using a Hashtable. The 'xml' prefix is bound to
- * "http://www.w3.org/XML/1998/namespace", as defined in the
- * <a href="http://www.w3.org/TR/REC-xml-names/#ns-using">Namespaces in
- * XML</a> specification. Analogous, the 'xmlns' prefix is resolved to
- * <a href="http://www.w3.org/2000/xmlns/">http://www.w3.org/2000/xmlns/</a>
+ * <strong>Please note:</strong> parser implementations may provide more efficient lookup, e.g. using a Hashtable.
+ * The 'xml' prefix is bound to "http://www.w3.org/XML/1998/namespace", as defined in the
+ * <a href="http://www.w3.org/TR/REC-xml-names/#ns-using">Namespaces in XML</a> specification. Analogous, the
+ * 'xmlns' prefix is resolved to <a href="http://www.w3.org/2000/xmlns/">http://www.w3.org/2000/xmlns/</a>
*
* @see #getNamespaceCount
* @see #getNamespacePrefix
@@ -605,9 +533,8 @@ public interface XmlPullParser {
// miscellaneous reporting methods
/**
- * Returns the current depth of the element. Outside the root element, the
- * depth is 0. The depth is incremented by 1 when a start tag is reached.
- * The depth is decremented AFTER the end tag event was observed.
+ * Returns the current depth of the element. Outside the root element, the depth is 0. The depth is incremented by 1
+ * when a start tag is reached. The depth is decremented AFTER the end tag event was observed.
*
* <pre>
* <!-- outside --> 0
@@ -622,35 +549,31 @@ public interface XmlPullParser {
int getDepth();
/**
- * Returns a short text describing the current parser state, including the
- * position, a description of the current event and the data source if
- * known. This method is especially useful to provide meaningful error
- * messages and for debugging purposes.
+ * Returns a short text describing the current parser state, including the position, a description of the current
+ * event and the data source if known. This method is especially useful to provide meaningful error messages and for
+ * debugging purposes.
*/
String getPositionDescription();
/**
- * Returns the line number that a tag starts from (starting from 1). When the parser does
- * not know the current line number or can not determine it, -1 is returned
- * (e.g. for WBXML).
+ * Returns the line number that a tag starts from (starting from 1). When the parser does not know the current line
+ * number or can not determine it, -1 is returned (e.g. for WBXML).
*
* @return starting line number or -1 if unknown.
*/
int getStartLineNumber();
/**
- * Returns the current line number, starting from 1. When the parser does
- * not know the current line number or can not determine it, -1 is returned
- * (e.g. for WBXML).
+ * Returns the current line number, starting from 1. When the parser does not know the current line number or can
+ * not determine it, -1 is returned (e.g. for WBXML).
*
* @return current line number or -1 if unknown.
*/
int getLineNumber();
/**
- * Returns the current column number, starting from 0. When the parser does
- * not know the current column number or can not determine it, -1 is
- * returned (e.g. for WBXML).
+ * Returns the current column number, starting from 0. When the parser does not know the current column number or
+ * can not determine it, -1 is returned (e.g. for WBXML).
*
* @return current column number or -1 if unknown.
*/
@@ -660,29 +583,23 @@ public interface XmlPullParser {
// TEXT related methods
/**
- * Checks whether the current TEXT event contains only whitespace
- * characters. For IGNORABLE_WHITESPACE, this is always true. For TEXT and
- * CDSECT, false is returned when the current event text contains at least
- * one non-white space character. For any other event type an exception is
- * thrown.
+ * Checks whether the current TEXT event contains only whitespace characters. For IGNORABLE_WHITESPACE, this is
+ * always true. For TEXT and CDSECT, false is returned when the current event text contains at least one non-white
+ * space character. For any other event type an exception is thrown.
* <p>
- * <b>Please note:</b> non-validating parsers are not able to distinguish
- * whitespace and ignorable whitespace, except from whitespace outside the
- * root element. Ignorable whitespace is reported as separate event, which
- * is exposed via nextToken only.
+ * <b>Please note:</b> non-validating parsers are not able to distinguish whitespace and ignorable whitespace,
+ * except from whitespace outside the root element. Ignorable whitespace is reported as separate event, which is
+ * exposed via nextToken only.
*/
boolean isWhitespace() throws XmlPullParserException;
/**
- * Returns the text content of the current event as String. The value
- * returned depends on current event type, for example for TEXT event it is
- * element content (this is typical case when next() is used). See
- * description of nextToken() for detailed description of possible returned
- * values for different types of events.
+ * Returns the text content of the current event as String. The value returned depends on current event type, for
+ * example for TEXT event it is element content (this is typical case when next() is used). See description of
+ * nextToken() for detailed description of possible returned values for different types of events.
* <p>
- * <strong>NOTE:</strong> in case of ENTITY_REF, this method returns the
- * entity replacement text (or null if not available). This is the only case
- * where getText() and getTextCharacters() return different values.
+ * <strong>NOTE:</strong> in case of ENTITY_REF, this method returns the entity replacement text (or null if not
+ * available). This is the only case where getText() and getTextCharacters() return different values.
*
* @see #getEventType
* @see #next
@@ -691,26 +608,22 @@ public interface XmlPullParser {
String getText();
/**
- * Returns the buffer that contains the text of the current event, as well
- * as the start offset and length relevant for the current event. See
- * getText(), next() and nextToken() for description of possible returned
- * values.
+ * Returns the buffer that contains the text of the current event, as well as the start offset and length relevant
+ * for the current event. See getText(), next() and nextToken() for description of possible returned values.
* <p>
- * <strong>Please note:</strong> this buffer must not be modified and its
- * content MAY change after a call to next() or nextToken(). This method
- * will always return the same value as getText(), except for ENTITY_REF. In
- * the case of ENTITY ref, getText() returns the replacement text and this
- * method returns the actual input buffer containing the entity name. If
- * getText() returns null, this method returns null as well and the values
- * returned in the holder array MUST be -1 (both start and length).
+ * <strong>Please note:</strong> this buffer must not be modified and its content MAY change after a call to next()
+ * or nextToken(). This method will always return the same value as getText(), except for ENTITY_REF. In the case of
+ * ENTITY ref, getText() returns the replacement text and this method returns the actual input buffer containing the
+ * entity name. If getText() returns null, this method returns null as well and the values returned in the holder
+ * array MUST be -1 (both start and length).
*
- * @see #getText
- * @see #next
- * @see #nextToken
- * @param holderForStartAndLength Must hold an 2-element int array into
- * which the start offset and length values will be written.
- * @return char buffer that contains the text of the current event (null if
- * the current event has no text associated).
+ * @see #getText
+ * @see #next
+ * @see #nextToken
+ * @param holderForStartAndLength Must hold an 2-element int array into which the start offset and length values
+ * will be written.
+ * @return char buffer that contains the text of the current event (null if the current
+ * event has no text associated).
*/
char[] getTextCharacters(int[] holderForStartAndLength);
@@ -718,40 +631,32 @@ public interface XmlPullParser {
// START_TAG / END_TAG shared methods
/**
- * Returns the namespace URI of the current element. The default namespace
- * is represented as empty string. If namespaces are not enabled, an empty
- * String ("") is always returned. The current event must be START_TAG or
+ * Returns the namespace URI of the current element. The default namespace is represented as empty string. If
+ * namespaces are not enabled, an empty String ("") is always returned. The current event must be START_TAG or
* END_TAG; otherwise, null is returned.
*/
String getNamespace();
/**
- * For START_TAG or END_TAG events, the (local) name of the current element
- * is returned when namespaces are enabled. When namespace processing is
- * disabled, the raw name is returned. For ENTITY_REF events, the entity
- * name is returned. If the current event is not START_TAG, END_TAG, or
- * ENTITY_REF, null is returned.
+ * For START_TAG or END_TAG events, the (local) name of the current element is returned when namespaces are enabled.
+ * When namespace processing is disabled, the raw name is returned. For ENTITY_REF events, the entity name is
+ * returned. If the current event is not START_TAG, END_TAG, or ENTITY_REF, null is returned.
* <p>
- * <b>Please note:</b> To reconstruct the raw element name when namespaces
- * are enabled and the prefix is not null, you will need to add the prefix
- * and a colon to localName..
+ * <b>Please note:</b> To reconstruct the raw element name when namespaces are enabled and the prefix is not null,
+ * you will need to add the prefix and a colon to localName..
*/
String getName();
/**
- * Returns the prefix of the current element. If the element is in the
- * default namespace (has no prefix), null is returned. If namespaces are
- * not enabled, or the current event is not START_TAG or END_TAG, null is
- * returned.
+ * Returns the prefix of the current element. If the element is in the default namespace (has no prefix), null is
+ * returned. If namespaces are not enabled, or the current event is not START_TAG or END_TAG, null is returned.
*/
String getPrefix();
/**
- * Returns true if the current event is START_TAG and the tag is degenerated
- * (e.g. <foobar/>).
+ * Returns true if the current event is START_TAG and the tag is degenerated (e.g. <foobar/>).
* <p>
- * <b>NOTE:</b> if the parser is not on START_TAG, an exception will be
- * thrown.
+ * <b>NOTE:</b> if the parser is not on START_TAG, an exception will be thrown.
*/
boolean isEmptyElementTag() throws XmlPullParserException;
@@ -759,8 +664,7 @@ public interface XmlPullParser {
// START_TAG Attributes retrieval methods
/**
- * Returns the number of attributes of the current start tag, or -1 if the
- * current event type is not START_TAG
+ * Returns the number of attributes of the current start tag, or -1 if the current event type is not START_TAG
*
* @see #getAttributeNamespace
* @see #getAttributeName
@@ -770,102 +674,87 @@ public interface XmlPullParser {
int getAttributeCount();
/**
- * Returns the namespace URI of the attribute with the given index (starts
- * from 0). Returns an empty string ("") if namespaces are not enabled or
- * the attribute has no namespace. Throws an IndexOutOfBoundsException if
- * the index is out of range or the current event type is not START_TAG.
+ * Returns the namespace URI of the attribute with the given index (starts from 0). Returns an empty string ("") if
+ * namespaces are not enabled or the attribute has no namespace. Throws an IndexOutOfBoundsException if the index is
+ * out of range or the current event type is not START_TAG.
* <p>
- * <strong>NOTE:</strong> if FEATURE_REPORT_NAMESPACE_ATTRIBUTES is set then
- * namespace attributes (xmlns:ns='...') must be reported with namespace
- * <a href="http://www.w3.org/2000/xmlns/">http://www.w3.org/2000/xmlns/</a>
- * (visit this URL for description!). The default namespace attribute
- * (xmlns="...") will be reported with empty namespace.
+ * <strong>NOTE:</strong> if FEATURE_REPORT_NAMESPACE_ATTRIBUTES is set then namespace attributes (xmlns:ns='...')
+ * must be reported with namespace <a href="http://www.w3.org/2000/xmlns/">http://www.w3.org/2000/xmlns/</a> (visit
+ * this URL for description!). The default namespace attribute (xmlns="...") will be reported with empty namespace.
* <p>
* <strong>NOTE:</strong>The xml prefix is bound as defined in
- * <a href="http://www.w3.org/TR/REC-xml-names/#ns-using">Namespaces in
- * XML</a> specification to "http://www.w3.org/XML/1998/namespace".
+ * <a href="http://www.w3.org/TR/REC-xml-names/#ns-using">Namespaces in XML</a> specification to
+ * "http://www.w3.org/XML/1998/namespace".
*
- * @param index zero based index of attribute
- * @return attribute namespace, empty string ("") is returned if namespaces
- * processing is not enabled or namespaces processing is enabled but
- * attribute has no namespace (it has no prefix).
+ * @param index zero based index of attribute
+ * @return attribute namespace, empty string ("") is returned if namespaces processing is not enabled or
+ * namespaces processing is enabled but attribute has no namespace (it has no prefix).
*/
String getAttributeNamespace(int index);
/**
- * Returns the local name of the specified attribute if namespaces are
- * enabled or just attribute name if namespaces are disabled. Throws an
- * IndexOutOfBoundsException if the index is out of range or current event
- * type is not START_TAG.
+ * Returns the local name of the specified attribute if namespaces are enabled or just attribute name if namespaces
+ * are disabled. Throws an IndexOutOfBoundsException if the index is out of range or current event type is not
+ * START_TAG.
*
- * @param index zero based index of attribute
- * @return attribute name (null is never returned)
+ * @param index zero based index of attribute
+ * @return attribute name (null is never returned)
*/
String getAttributeName(int index);
/**
- * Returns the prefix of the specified attribute Returns null if the element
- * has no prefix. If namespaces are disabled it will always return null.
- * Throws an IndexOutOfBoundsException if the index is out of range or
- * current event type is not START_TAG.
+ * Returns the prefix of the specified attribute Returns null if the element has no prefix. If namespaces are
+ * disabled it will always return null. Throws an IndexOutOfBoundsException if the index is out of range or current
+ * event type is not START_TAG.
*
- * @param index zero based index of attribute
- * @return attribute prefix or null if namespaces processing is not enabled.
+ * @param index zero based index of attribute
+ * @return attribute prefix or null if namespaces processing is not enabled.
*/
String getAttributePrefix(int index);
/**
- * Returns the type of the specified attribute If parser is non-validating
- * it MUST return CDATA.
+ * Returns the type of the specified attribute If parser is non-validating it MUST return CDATA.
*
- * @param index zero based index of attribute
- * @return attribute type (null is never returned)
+ * @param index zero based index of attribute
+ * @return attribute type (null is never returned)
*/
String getAttributeType(int index);
/**
- * Returns if the specified attribute was not in input was declared in XML.
- * If parser is non-validating it MUST always return false. This information
- * is part of XML infoset:
+ * Returns if the specified attribute was not in input was declared in XML. If parser is non-validating it MUST
+ * always return false. This information is part of XML infoset:
*
- * @param index zero based index of attribute
- * @return false if attribute was in input
+ * @param index zero based index of attribute
+ * @return false if attribute was in input
*/
boolean isAttributeDefault(int index);
/**
- * Returns the given attributes value. Throws an IndexOutOfBoundsException
- * if the index is out of range or current event type is not START_TAG.
+ * Returns the given attributes value. Throws an IndexOutOfBoundsException if the index is out of range or current
+ * event type is not START_TAG.
* <p>
- * <strong>NOTE:</strong> attribute value must be normalized (including
- * entity replacement text if PROCESS_DOCDECL is false) as described in
- * <a href="http://www.w3.org/TR/REC-xml#AVNormalize">XML 1.0 section 3.3.3
+ * <strong>NOTE:</strong> attribute value must be normalized (including entity replacement text if PROCESS_DOCDECL
+ * is false) as described in <a href="http://www.w3.org/TR/REC-xml#AVNormalize">XML 1.0 section 3.3.3
* Attribute-Value Normalization</a>
*
- * @see #defineEntityReplacementText
- * @param index zero based index of attribute
- * @return value of attribute (null is never returned)
+ * @see #defineEntityReplacementText
+ * @param index zero based index of attribute
+ * @return value of attribute (null is never returned)
*/
String getAttributeValue(int index);
/**
- * Returns the attributes value identified by namespace URI and namespace
- * localName. If namespaces are disabled namespace must be null. If current
- * event type is not START_TAG then IndexOutOfBoundsException will be
- * thrown.
+ * Returns the attributes value identified by namespace URI and namespace localName. If namespaces are disabled
+ * namespace must be null. If current event type is not START_TAG then IndexOutOfBoundsException will be thrown.
* <p>
- * <strong>NOTE:</strong> attribute value must be normalized (including
- * entity replacement text if PROCESS_DOCDECL is false) as described in
- * <a href="http://www.w3.org/TR/REC-xml#AVNormalize">XML 1.0 section 3.3.3
+ * <strong>NOTE:</strong> attribute value must be normalized (including entity replacement text if PROCESS_DOCDECL
+ * is false) as described in <a href="http://www.w3.org/TR/REC-xml#AVNormalize">XML 1.0 section 3.3.3
* Attribute-Value Normalization</a>
*
- * @see #defineEntityReplacementText
- * @param namespace Namespace of the attribute if namespaces are enabled
- * otherwise must be null
- * @param name If namespaces enabled local name of attribute otherwise just
- * attribute name
- * @return value of attribute or null if attribute with given name does not
- * exist
+ * @see #defineEntityReplacementText
+ * @param namespace Namespace of the attribute if namespaces are enabled otherwise must be null
+ * @param name If namespaces enabled local name of attribute otherwise just attribute name
+ * @return value of attribute or null if attribute with given name does not exist
*/
String getAttributeValue(String namespace, String name);
@@ -881,17 +770,14 @@ public interface XmlPullParser {
int getEventType() throws XmlPullParserException;
/**
- * Get next parsing event - element content wil be coalesced and only one
- * TEXT event must be returned for whole element content (comments and
- * processing instructions will be ignored and entity references must be
- * expanded or exception mus be thrown if entity reference can not be
- * expanded). If element content is empty (content is "") then no TEXT event
- * will be reported.
+ * Get next parsing event - element content wil be coalesced and only one TEXT event must be returned for whole
+ * element content (comments and processing instructions will be ignored and entity references must be expanded or
+ * exception mus be thrown if entity reference can not be expanded). If element content is empty (content is "")
+ * then no TEXT event will be reported.
* <p>
- * <b>NOTE:</b> empty element (such as <tag/>) will be reported with
- * two separate events: START_TAG, END_TAG - it must be so to preserve
- * parsing equivalency of empty element to <tag></tag>. (see
- * isEmptyElementTag ())
+ * <b>NOTE:</b> empty element (such as <tag/>) will be reported with two separate events: START_TAG, END_TAG -
+ * it must be so to preserve parsing equivalency of empty element to <tag></tag>. (see isEmptyElementTag
+ * ())
*
* @see #isEmptyElementTag
* @see #START_TAG
@@ -903,74 +789,57 @@ public interface XmlPullParser {
int next() throws XmlPullParserException, IOException;
/**
- * This method works similarly to next() but will expose additional event
- * types (COMMENT, CDSECT, DOCDECL, ENTITY_REF, PROCESSING_INSTRUCTION, or
- * IGNORABLE_WHITESPACE) if they are available in input.
+ * This method works similarly to next() but will expose additional event types (COMMENT, CDSECT, DOCDECL,
+ * ENTITY_REF, PROCESSING_INSTRUCTION, or IGNORABLE_WHITESPACE) if they are available in input.
* <p>
- * If special feature <a href=
- * "http://xmlpull.org/v1/doc/features.html#xml-roundtrip">FEATURE_XML_ROUNDTRIP</a>
- * (identified by URI:
- * http://xmlpull.org/v1/doc/features.html#xml-roundtrip) is enabled it is
- * possible to do XML document round trip ie. reproduce exactly on output
- * the XML input using getText(): returned content is always unnormalized
- * (exactly as in input). Otherwise returned content is end-of-line
- * normalized as described
- * <a href="http://www.w3.org/TR/REC-xml#sec-line-ends">XML 1.0 End-of-Line
- * Handling</a> and. Also when this feature is enabled exact content of
- * START_TAG, END_TAG, DOCDECL and PROCESSING_INSTRUCTION is available.
+ * If special feature <a href= "http://xmlpull.org/v1/doc/features.html#xml-roundtrip">FEATURE_XML_ROUNDTRIP</a>
+ * (identified by URI: http://xmlpull.org/v1/doc/features.html#xml-roundtrip) is enabled it is possible to do XML
+ * document round trip ie. reproduce exactly on output the XML input using getText(): returned content is always
+ * unnormalized (exactly as in input). Otherwise returned content is end-of-line normalized as described
+ * <a href="http://www.w3.org/TR/REC-xml#sec-line-ends">XML 1.0 End-of-Line Handling</a> and. Also when this feature
+ * is enabled exact content of START_TAG, END_TAG, DOCDECL and PROCESSING_INSTRUCTION is available.
* <p>
- * Here is the list of tokens that can be returned from nextToken() and what
- * getText() and getTextCharacters() returns:
+ * Here is the list of tokens that can be returned from nextToken() and what getText() and getTextCharacters()
+ * returns:
* <dl>
* <dt>START_DOCUMENT
* <dd>null
* <dt>END_DOCUMENT
* <dd>null
* <dt>START_TAG
- * <dd>null unless FEATURE_XML_ROUNDTRIP enabled and then returns XML tag,
- * ex: <tag attr='val'>
+ * <dd>null unless FEATURE_XML_ROUNDTRIP enabled and then returns XML tag, ex: <tag attr='val'>
* <dt>END_TAG
- * <dd>null unless FEATURE_XML_ROUNDTRIP id enabled and then returns XML
- * tag, ex: </tag>
+ * <dd>null unless FEATURE_XML_ROUNDTRIP id enabled and then returns XML tag, ex: </tag>
* <dt>TEXT
* <dd>return element content. <br>
- * Note: that element content may be delivered in multiple consecutive TEXT
- * events.
+ * Note: that element content may be delivered in multiple consecutive TEXT events.
* <dt>IGNORABLE_WHITESPACE
- * <dd>return characters that are determined to be ignorable white space. If
- * the FEATURE_XML_ROUNDTRIP is enabled all whitespace content outside root
- * element will always reported as IGNORABLE_WHITESPACE otherwise reporting
- * is optional. <br>
- * Note: that element content may be delivered in multiple consecutive
- * IGNORABLE_WHITESPACE events.
+ * <dd>return characters that are determined to be ignorable white space. If the FEATURE_XML_ROUNDTRIP is enabled
+ * all whitespace content outside root element will always reported as IGNORABLE_WHITESPACE otherwise reporting is
+ * optional. <br>
+ * Note: that element content may be delivered in multiple consecutive IGNORABLE_WHITESPACE events.
* <dt>CDSECT
- * <dd>return text <em>inside</em> CDATA (ex. 'fo<o' from
- * <!CDATA[fo<o]]>)
+ * <dd>return text <em>inside</em> CDATA (ex. 'fo<o' from <!CDATA[fo<o]]>)
* <dt>PROCESSING_INSTRUCTION
- * <dd>if FEATURE_XML_ROUNDTRIP is true return exact PI content ex: 'pi foo'
- * from <?pi foo?> otherwise it may be exact PI content or
- * concatenation of PI target, space and data so for example for <?target
- * data?> string "target data" may be returned if
- * FEATURE_XML_ROUNDTRIP is false.
+ * <dd>if FEATURE_XML_ROUNDTRIP is true return exact PI content ex: 'pi foo' from <?pi foo?> otherwise it may
+ * be exact PI content or concatenation of PI target, space and data so for example for <?target data?> string
+ * "target data" may be returned if FEATURE_XML_ROUNDTRIP is false.
* <dt>COMMENT
* <dd>return comment content ex. 'foo bar' from <!--foo bar-->
* <dt>ENTITY_REF
- * <dd>getText() MUST return entity replacement text if PROCESS_DOCDECL is
- * false otherwise getText() MAY return null, additionally
- * getTextCharacters() MUST return entity name (for example 'entity_name'
- * for &entity_name;). <br>
- * <b>NOTE:</b> this is the only place where value returned from getText()
- * and getTextCharacters() <b>are different</b> <br>
- * <b>NOTE:</b> it is user responsibility to resolve entity reference if
- * PROCESS_DOCDECL is false and there is no entity replacement text set in
- * defineEntityReplacementText() method (getText() will be null) <br>
- * <b>NOTE:</b> character entities (ex. &#32;) and standard entities
- * such as &amp; &lt; &gt; &quot; &apos; are reported as
- * well and are <b>not</b> reported as TEXT tokens but as ENTITY_REF tokens!
+ * <dd>getText() MUST return entity replacement text if PROCESS_DOCDECL is false otherwise getText() MAY return
+ * null, additionally getTextCharacters() MUST return entity name (for example 'entity_name' for &entity_name;).
+ * <br>
+ * <b>NOTE:</b> this is the only place where value returned from getText() and getTextCharacters() <b>are
+ * different</b> <br>
+ * <b>NOTE:</b> it is user responsibility to resolve entity reference if PROCESS_DOCDECL is false and there is no
+ * entity replacement text set in defineEntityReplacementText() method (getText() will be null) <br>
+ * <b>NOTE:</b> character entities (ex. &#32;) and standard entities such as &amp; &lt; &gt;
+ * &quot; &apos; are reported as well and are <b>not</b> reported as TEXT tokens but as ENTITY_REF tokens!
* This requirement is added to allow to do roundtrip of XML documents!
* <dt>DOCDECL
- * <dd>if FEATURE_XML_ROUNDTRIP is true or PROCESS_DOCDECL is false then
- * return what is inside of DOCDECL for example it returns:
+ * <dd>if FEATURE_XML_ROUNDTRIP is true or PROCESS_DOCDECL is false then return what is inside of DOCDECL for
+ * example it returns:
*
* <pre>
* " titlepage SYSTEM "http://www.foo.bar/dtds/typo.dtd"
@@ -984,21 +853,19 @@ public interface XmlPullParser {
* [<!ENTITY % active.links "INCLUDE">]>
* </pre>
*
- * otherwise if FEATURE_XML_ROUNDTRIP is false and PROCESS_DOCDECL is true
- * then what is returned is undefined (it may be even null)</dd>
+ * otherwise if FEATURE_XML_ROUNDTRIP is false and PROCESS_DOCDECL is true then what is returned is undefined (it
+ * may be even null)</dd>
* </dl>
* <p>
- * <strong>NOTE:</strong> there is no guarantee that there will only one
- * TEXT or IGNORABLE_WHITESPACE event from nextToken() as parser may chose
- * to deliver element content in multiple tokens (dividing element content
- * into chunks)
+ * <strong>NOTE:</strong> there is no guarantee that there will only one TEXT or IGNORABLE_WHITESPACE event from
+ * nextToken() as parser may chose to deliver element content in multiple tokens (dividing element content into
+ * chunks)
* <p>
- * <strong>NOTE:</strong> whether returned text of token is end-of-line
- * normalized is depending on FEATURE_XML_ROUNDTRIP.
+ * <strong>NOTE:</strong> whether returned text of token is end-of-line normalized is depending on
+ * FEATURE_XML_ROUNDTRIP.
* <p>
- * <strong>NOTE:</strong> XMLDecl (<?xml ...?>) is not reported but
- * its content is available through optional properties (see class
- * description above).
+ * <strong>NOTE:</strong> XMLDecl (<?xml ...?>) is not reported but its content is available through optional
+ * properties (see class description above).
*
* @see #next
* @see #START_TAG
@@ -1017,34 +884,30 @@ public interface XmlPullParser {
// utility methods to mak XML parsing easier ...
/**
- * Test if the current event is of the given type and if the namespace and
- * name do match. null will match any namespace and any name. If the test is
- * not passed, an exception is thrown. The exception text indicates the
- * parser position, the expected event and the current event that is not
- * meeting the requirement.
+ * Test if the current event is of the given type and if the namespace and name do match. null will match any
+ * namespace and any name. If the test is not passed, an exception is thrown. The exception text indicates the
+ * parser position, the expected event and the current event that is not meeting the requirement.
* <p>
* Essentially it does this
*
* <pre>
- * if (type != getEventType() || (namespace != null && !namespace.equals(getNamespace())) || (name != null && !name.equals(getName())))
+ * if (type != getEventType() || (namespace != null && !namespace.equals(getNamespace()))
+ * || (name != null && !name.equals(getName())))
* throw new XmlPullParserException("expected " + TYPES[type] + getPositionDescription());
* </pre>
*/
void require(int type, String namespace, String name) throws XmlPullParserException, IOException;
/**
- * If current event is START_TAG then if next element is TEXT then element
- * content is returned or if next event is END_TAG then empty string is
- * returned, otherwise exception is thrown. After calling this function
- * successfully parser will be positioned on END_TAG.
+ * If current event is START_TAG then if next element is TEXT then element content is returned or if next event is
+ * END_TAG then empty string is returned, otherwise exception is thrown. After calling this function successfully
+ * parser will be positioned on END_TAG.
* <p>
- * The motivation for this function is to allow to parse consistently both
- * empty elements and elements that has non empty content, for example for
- * input:
+ * The motivation for this function is to allow to parse consistently both empty elements and elements that has non
+ * empty content, for example for input:
* <ol>
* <li><tag>foo</tag>
- * <li><tag></tag> (which is equivalent to <tag/> both
- * input can be parsed with the same code:
+ * <li><tag></tag> (which is equivalent to <tag/> both input can be parsed with the same code:
*
* <pre>
* p.nextTag()
@@ -1055,8 +918,7 @@ public interface XmlPullParser {
*
* </li>
* </ol>
- * This function together with nextTag make it very easy to parse XML that
- * has no mixed content.
+ * This function together with nextTag make it very easy to parse XML that has no mixed content.
* <p>
* Essentially it does this
*
@@ -1082,9 +944,8 @@ public interface XmlPullParser {
String nextText() throws XmlPullParserException, IOException;
/**
- * Call next() and return event if it is START_TAG or END_TAG otherwise
- * throw an exception. It will skip whitespace TEXT before actual tag if
- * any.
+ * Call next() and return event if it is START_TAG or END_TAG otherwise throw an exception. It will skip whitespace
+ * TEXT before actual tag if any.
* <p>
* essentially it does this
*
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
index f0ff666acfc..6042c1e10f9 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
@@ -23,8 +23,7 @@ package org.apache.camel.xml.io;
/**
* This exception is thrown to signal XML Pull Parser related faults.
*
- * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander
- * Slominski</a>
+ * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
public class XmlPullParserException extends Exception {
protected int row = -1;
@@ -42,7 +41,8 @@ public class XmlPullParserException extends Exception {
*/
public XmlPullParserException(String msg, XmlPullParser parser, Throwable cause) {
- super((msg == null ? "" : msg + " ") + (parser == null ? "" : "(position:" + parser.getPositionDescription() + ") ") + (cause == null ? "" : "caused by: " + cause), cause);
+ super((msg == null ? "" : msg + " ") + (parser == null ? "" : "(position:" + parser.getPositionDescription() + ") ")
+ + (cause == null ? "" : "caused by: " + cause), cause);
if (parser != null) {
this.row = parser.getLineNumber();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 3abd19cd810..059f3df0c24 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -114,7 +114,7 @@ public class Run extends CamelCommand {
private File logFile;
@Parameters(description = "The Camel file(s) to run. If no files specified then application.properties is used as source for which files to run.",
- arity = "0..9", paramLabel = "<files>", parameterConsumer = FilesConsumer.class)
+ arity = "0..9", paramLabel = "<files>", parameterConsumer = FilesConsumer.class)
Path[] filePaths; // Defined only for file path completion; the field never used
List<String> files = new ArrayList<>();
@@ -137,20 +137,25 @@ public class Run extends CamelCommand {
"--dep", "--deps" }, description = "Add additional dependencies (Use commas to separate multiple dependencies)")
String dependencies;
- @Option(names = { "--repos" }, description = "Additional maven repositories for download on-demand (Use commas to separate multiple repositories)")
+ @Option(names = { "--repos" },
+ description = "Additional maven repositories for download on-demand (Use commas to separate multiple repositories)")
String repos;
- @Option(names = { "--maven-settings" }, description = "Optional location of maven setting.xml file to configure servers, repositories, mirrors and proxies." +
- " If set to \"false\", not even the default ~/.m2/settings.xml will be used.")
+ @Option(names = { "--maven-settings" },
+ description = "Optional location of maven setting.xml file to configure servers, repositories, mirrors and proxies."
+ +
+ " If set to \"false\", not even the default ~/.m2/settings.xml will be used.")
String mavenSettings;
- @Option(names = { "--maven-settings-security" }, description = "Optional location of maven settings-security.xml file to decrypt settings.xml")
+ @Option(names = { "--maven-settings-security" },
+ description = "Optional location of maven settings-security.xml file to decrypt settings.xml")
String mavenSettingsSecurity;
@Option(names = { "--fresh" }, description = "Make sure we use fresh (i.e. non-cached) resources")
boolean fresh;
- @Option(names = { "--download" }, defaultValue = "true", description = "Whether to allow automatic downloading JAR dependencies (over the internet)")
+ @Option(names = { "--download" }, defaultValue = "true",
+ description = "Whether to allow automatic downloading JAR dependencies (over the internet)")
boolean download = true;
@Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application")
@@ -227,7 +232,6 @@ public class Run extends CamelCommand {
super(main);
}
-
public String getProfile() {
return profile;
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index 8315f9e19d5..4aeaea358b4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -64,11 +64,11 @@ import org.snakeyaml.engine.v2.api.ConstructNode;
import org.snakeyaml.engine.v2.nodes.Node;
@Mojo(
- name = "generate-yaml-deserializers",
- inheritByDefault = false,
- defaultPhase = LifecyclePhase.GENERATE_SOURCES,
- requiresDependencyResolution = ResolutionScope.COMPILE,
- threadSafe = true)
+ name = "generate-yaml-deserializers",
+ inheritByDefault = false,
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES,
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ threadSafe = true)
public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
@Parameter(defaultValue = "org.apache.camel.dsl.yaml.deserializers")
protected String packageName;
@@ -92,13 +92,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
}
private void write(Collection<TypeSpec> specs) throws Exception {
- for (TypeSpec typeSpec: specs) {
+ for (TypeSpec typeSpec : specs) {
StringWriter sw = new StringWriter();
JavaFile.builder(packageName, typeSpec)
- .addFileComment("Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!")
- .indent(" ")
- .build()
- .writeTo(sw);
+ .addFileComment("Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!")
+ .indent(" ")
+ .build()
+ .writeTo(sw);
Path outputDirectory = sourcesOutputDir.toPath();
if (!packageName.isEmpty()) {
for (String packageComponent : packageName.split("\\.")) {
@@ -122,50 +122,50 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
// add private constructor
type.addMethod(MethodSpec.constructorBuilder()
- .addModifiers(Modifier.PRIVATE)
- .build());
+ .addModifiers(Modifier.PRIVATE)
+ .build());
// parser
type.addMethod(MethodSpec.methodBuilder("constructExpressionType")
- .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
- .addParameter(Node.class, "node")
- .returns(CN_EXPRESSION_DEFINITION)
- .addCode(
- CodeBlock.builder()
- .addStatement("$T mn = asMappingNode(node)", CN_MAPPING_NODE)
- .beginControlFlow("if (mn.getValue().size() != 1)")
- .addStatement("return null")
- .endControlFlow()
- .addStatement("$T nt = mn.getValue().get(0)", CN_NODE_TUPLE)
- .addStatement("$T dc = getDeserializationContext(node)", CN_DESERIALIZATION_CONTEXT)
- .addStatement("String key = asText(nt.getKeyNode())")
- .addStatement("$T val = setDeserializationContext(nt.getValueNode(), dc)", CN_NODE)
- .addStatement("ExpressionDefinition answer = constructExpressionType(key, val)")
- .beginControlFlow("if (answer == null)")
- .addStatement("throw new org.apache.camel.dsl.yaml.common.exception.InvalidExpressionException(node, \"Unknown expression with id: \" + key)")
- .endControlFlow()
- .addStatement("return answer")
- .build())
- .build());
+ .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+ .addParameter(Node.class, "node")
+ .returns(CN_EXPRESSION_DEFINITION)
+ .addCode(
+ CodeBlock.builder()
+ .addStatement("$T mn = asMappingNode(node)", CN_MAPPING_NODE)
+ .beginControlFlow("if (mn.getValue().size() != 1)")
+ .addStatement("return null")
+ .endControlFlow()
+ .addStatement("$T nt = mn.getValue().get(0)", CN_NODE_TUPLE)
+ .addStatement("$T dc = getDeserializationContext(node)", CN_DESERIALIZATION_CONTEXT)
+ .addStatement("String key = asText(nt.getKeyNode())")
+ .addStatement("$T val = setDeserializationContext(nt.getValueNode(), dc)", CN_NODE)
+ .addStatement("ExpressionDefinition answer = constructExpressionType(key, val)")
+ .beginControlFlow("if (answer == null)")
+ .addStatement(
+ "throw new org.apache.camel.dsl.yaml.common.exception.InvalidExpressionException(node, \"Unknown expression with id: \" + key)")
+ .endControlFlow()
+ .addStatement("return answer")
+ .build())
+ .build());
CodeBlock.Builder cb = CodeBlock.builder();
cb.beginControlFlow("switch(id)");
elementsOf(EXPRESSION_DEFINITION_CLASS).entrySet().stream()
- .sorted(Map.Entry.comparingByKey())
- .forEach(
- e -> {
- cb.beginControlFlow("case $S:", e.getKey());
- cb.addStatement("return asType(node, $L.class)", e.getValue().name().toString());
- cb.endControlFlow();
-
- if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
- cb.beginControlFlow("case $S:", StringHelper.camelCaseToDash(e.getKey()));
- cb.addStatement("return asType(node, $L.class)", e.getValue().name().toString());
- cb.endControlFlow();
- }
- }
- );
+ .sorted(Map.Entry.comparingByKey())
+ .forEach(
+ e -> {
+ cb.beginControlFlow("case $S:", e.getKey());
+ cb.addStatement("return asType(node, $L.class)", e.getValue().name().toString());
+ cb.endControlFlow();
+
+ if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
+ cb.beginControlFlow("case $S:", StringHelper.camelCaseToDash(e.getKey()));
+ cb.addStatement("return asType(node, $L.class)", e.getValue().name().toString());
+ cb.endControlFlow();
+ }
+ });
cb.beginControlFlow("case \"expression\":");
cb.addStatement("return constructExpressionType(node)");
@@ -184,13 +184,12 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("return null");
type.addMethod(MethodSpec.methodBuilder("constructExpressionType")
- .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
- .addParameter(String.class, "id")
- .addParameter(Node.class, "node")
- .returns(CN_EXPRESSION_DEFINITION)
- .addCode(cb.build())
- .build());
-
+ .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+ .addParameter(String.class, "id")
+ .addParameter(Node.class, "node")
+ .returns(CN_EXPRESSION_DEFINITION)
+ .addCode(cb.build())
+ .build());
//
// ExpressionDefinitionDeserializers
@@ -200,47 +199,42 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
edAnnotation.addMember("order", "org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1");
elementsOf(EXPRESSION_DEFINITION_CLASS).entrySet().stream()
- .sorted(Map.Entry.comparingByKey())
- .forEach(
- e -> {
- edAnnotation.addMember(
- "properties",
- "$L",
- yamlPropertyWithSubtype(
- e.getKey(),
- "object",
- e.getValue().name().toString())
- );
-
- if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
- edAnnotation.addMember(
- "properties",
- "$L",
- yamlPropertyWithSubtype(
- StringHelper.camelCaseToDash(e.getKey()),
- "object",
- e.getValue().name().toString())
- );
- }
- }
- );
+ .sorted(Map.Entry.comparingByKey())
+ .forEach(
+ e -> {
+ edAnnotation.addMember(
+ "properties",
+ "$L",
+ yamlPropertyWithSubtype(
+ e.getKey(),
+ "object",
+ e.getValue().name().toString()));
+
+ if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
+ edAnnotation.addMember(
+ "properties",
+ "$L",
+ yamlPropertyWithSubtype(
+ StringHelper.camelCaseToDash(e.getKey()),
+ "object",
+ e.getValue().name().toString()));
+ }
+ });
type.addType(
- TypeSpec.classBuilder("ExpressionDefinitionDeserializers")
- .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
- .addSuperinterface(ConstructNode.class)
- .addAnnotation(edAnnotation.build())
- .addMethod(
- MethodSpec.methodBuilder("construct")
- .addModifiers(Modifier.PUBLIC)
- .addAnnotation(Override.class)
- .addParameter(Node.class, "node")
- .returns(Object.class)
- .addStatement("return constructExpressionType(node)")
- .build())
- .build()
- );
-
+ TypeSpec.classBuilder("ExpressionDefinitionDeserializers")
+ .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+ .addSuperinterface(ConstructNode.class)
+ .addAnnotation(edAnnotation.build())
+ .addMethod(
+ MethodSpec.methodBuilder("construct")
+ .addModifiers(Modifier.PUBLIC)
+ .addAnnotation(Override.class)
+ .addParameter(Node.class, "node")
+ .returns(Object.class)
+ .addStatement("return constructExpressionType(node)")
+ .build())
+ .build());
//
// ExpressionSubElementDefinitionDeserializers
@@ -250,47 +244,43 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
esdAnnotation.addMember("order", "org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1");
elementsOf(EXPRESSION_DEFINITION_CLASS).entrySet().stream()
- .sorted(Map.Entry.comparingByKey())
- .forEach(
- e -> {
- esdAnnotation.addMember(
- "properties",
- "$L",
- yamlPropertyWithSubtype(
- e.getKey(),
- "object",
- e.getValue().name().toString())
- );
-
- if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
- esdAnnotation.addMember(
- "properties",
- "$L",
- yamlPropertyWithSubtype(
- StringHelper.camelCaseToDash(e.getKey()),
- "object",
- e.getValue().name().toString())
- );
- }
- }
- );
+ .sorted(Map.Entry.comparingByKey())
+ .forEach(
+ e -> {
+ esdAnnotation.addMember(
+ "properties",
+ "$L",
+ yamlPropertyWithSubtype(
+ e.getKey(),
+ "object",
+ e.getValue().name().toString()));
+
+ if (!e.getKey().equals(StringHelper.camelCaseToDash(e.getKey()))) {
+ esdAnnotation.addMember(
+ "properties",
+ "$L",
+ yamlPropertyWithSubtype(
+ StringHelper.camelCaseToDash(e.getKey()),
+ "object",
+ e.getValue().name().toString()));
+ }
+ });
type.addType(
- TypeSpec.classBuilder("ExpressionSubElementDefinitionDeserializers")
- .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
- .addSuperinterface(ConstructNode.class)
- .addAnnotation(esdAnnotation.build())
- .addMethod(
- MethodSpec.methodBuilder("construct")
- .addModifiers(Modifier.PUBLIC)
- .addAnnotation(Override.class)
- .addParameter(Node.class, "node")
- .returns(Object.class)
- .addStatement("$T val = constructExpressionType(node)", CN_EXPRESSION_DEFINITION)
- .addStatement("return new org.apache.camel.model.ExpressionSubElementDefinition(val)")
- .build())
- .build()
- );
+ TypeSpec.classBuilder("ExpressionSubElementDefinitionDeserializers")
+ .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+ .addSuperinterface(ConstructNode.class)
+ .addAnnotation(esdAnnotation.build())
+ .addMethod(
+ MethodSpec.methodBuilder("construct")
+ .addModifiers(Modifier.PUBLIC)
+ .addAnnotation(Override.class)
+ .addParameter(Node.class, "node")
+ .returns(Object.class)
+ .addStatement("$T val = constructExpressionType(node)", CN_EXPRESSION_DEFINITION)
+ .addStatement("return new org.apache.camel.model.ExpressionSubElementDefinition(val)")
+ .build())
+ .build());
return type.build();
}
@@ -307,37 +297,34 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
// add private constructor
deserializers.addMethod(MethodSpec.constructorBuilder()
- .addModifiers(Modifier.PRIVATE)
- .build());
+ .addModifiers(Modifier.PRIVATE)
+ .build());
CodeBlock.Builder constructors = CodeBlock.builder();
constructors.beginControlFlow("switch(id)");
all()
- .filter(ci -> {
- return !ci.name().equals(EXPRESSION_DEFINITION_CLASS)
- && !ci.name().equals(EXPRESSION_SUBELEMENT_DEFINITION_CLASS)
- && !implementType(ci, ERROR_HANDLER_BUILDER_CLASS);
- })
- .map(this::generateParser)
- .sorted(Comparator.comparing(o -> o.type.name))
- .collect(Collectors.toList())
- .forEach(holder -> {
+ .filter(ci -> {
+ return !ci.name().equals(EXPRESSION_DEFINITION_CLASS)
+ && !ci.name().equals(EXPRESSION_SUBELEMENT_DEFINITION_CLASS)
+ && !implementType(ci, ERROR_HANDLER_BUILDER_CLASS);
+ })
+ .map(this::generateParser)
+ .sorted(Comparator.comparing(o -> o.type.name))
+ .collect(Collectors.toList())
+ .forEach(holder -> {
// add inner classes
deserializers.addType(holder.type);
if (holder.attributes.containsKey("node")) {
- holder.attributes.get("node").forEach(node ->
- constructors.addStatement(
+ holder.attributes.get("node").forEach(node -> constructors.addStatement(
"case $S: return new ModelDeserializers.$L()", node, holder.type.name));
}
if (holder.attributes.containsKey("type")) {
- holder.attributes.get("type").forEach(type ->
- constructors.addStatement(
+ holder.attributes.get("type").forEach(type -> constructors.addStatement(
"case $S: return new ModelDeserializers.$L()", type, holder.type.name));
}
- }
- );
+ });
constructors.endControlFlow();
constructors.addStatement("return null");
@@ -348,25 +335,24 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
resolver.addSuperinterface(CN_DESERIALIZER_RESOLVER);
resolver.addMethod(
- MethodSpec.methodBuilder("getOrder")
- .addModifiers(Modifier.PUBLIC)
- .addAnnotation(Override.class)
- .returns(int.class)
- .addStatement("return YamlDeserializerResolver.ORDER_LOWEST - 1")
- .build());
+ MethodSpec.methodBuilder("getOrder")
+ .addModifiers(Modifier.PUBLIC)
+ .addAnnotation(Override.class)
+ .returns(int.class)
+ .addStatement("return YamlDeserializerResolver.ORDER_LOWEST - 1")
+ .build());
resolver.addMethod(
- MethodSpec.methodBuilder("resolve")
- .addModifiers(Modifier.PUBLIC)
- .addAnnotation(Override.class)
- .addParameter(String.class, "id")
- .returns(ConstructNode.class)
- .addCode(constructors.build())
- .build());
+ MethodSpec.methodBuilder("resolve")
+ .addModifiers(Modifier.PUBLIC)
+ .addAnnotation(Override.class)
+ .addParameter(String.class, "id")
+ .returns(ConstructNode.class)
+ .addCode(constructors.build())
+ .build());
return Arrays.asList(
- deserializers.build(),
- resolver.build()
- );
+ deserializers.build(),
+ resolver.build());
}
private TypeSpecHolder generateParser(ClassInfo info) {
@@ -415,27 +401,27 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
// Constructors
//
builder.addMethod(MethodSpec.constructorBuilder()
- .addModifiers(Modifier.PUBLIC)
- .addStatement("super($L.class)", info.simpleName())
- .build());
+ .addModifiers(Modifier.PUBLIC)
+ .addStatement("super($L.class)", info.simpleName())
+ .build());
//
// T handledTypeInstance();
//
builder.addMethod(MethodSpec.methodBuilder("newInstance")
- .addAnnotation(AnnotationSpec.builder(Override.class).build())
- .addModifiers(Modifier.PROTECTED)
- .returns(targetType)
- .addCode(
- CodeBlock.builder()
- .addStatement("return new $L()", info.simpleName())
- .build())
- .build());
+ .addAnnotation(AnnotationSpec.builder(Override.class).build())
+ .addModifiers(Modifier.PROTECTED)
+ .returns(targetType)
+ .addCode(
+ CodeBlock.builder()
+ .addStatement("return new $L()", info.simpleName())
+ .build())
+ .build());
//
// T handledTypeInstance(String value);
//
- for (MethodInfo ctor: info.constructors()) {
+ for (MethodInfo ctor : info.constructors()) {
// do not generate inline for error handlers (only ref error handler is allowed)
boolean eh = implementType(info, ERROR_HANDLER_DEFINITION_CLASS);
@@ -452,16 +438,16 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
yamlTypeAnnotation.addMember("inline", "true");
builder
- .addMethod(MethodSpec.methodBuilder("newInstance")
- .addAnnotation(AnnotationSpec.builder(Override.class).build())
- .addModifiers(Modifier.PROTECTED)
- .addParameter(String.class, "value")
- .returns(targetType)
- .addCode(
- CodeBlock.builder()
- .addStatement("return new $L(value)", info.simpleName())
- .build())
- .build());
+ .addMethod(MethodSpec.methodBuilder("newInstance")
+ .addAnnotation(AnnotationSpec.builder(Override.class).build())
+ .addModifiers(Modifier.PROTECTED)
+ .addParameter(String.class, "value")
+ .returns(targetType)
+ .addCode(
+ CodeBlock.builder()
+ .addStatement("return new $L(value)", info.simpleName())
+ .build())
+ .build());
break;
}
}
@@ -493,13 +479,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
setProperty.endControlFlow();
properties.add(
- yamlProperty(
- "id",
- "string"));
+ yamlProperty(
+ "id",
+ "string"));
properties.add(
- yamlProperty(
- "description",
- "string"));
+ yamlProperty(
+ "description",
+ "string"));
}
if (implementType(info, OUTPUT_NODE_CLASS)) {
@@ -511,10 +497,9 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
setProperty.endControlFlow();
properties.add(
- yamlProperty(
- "steps",
- "array:org.apache.camel.model.ProcessorDefinition")
- );
+ yamlProperty(
+ "steps",
+ "array:org.apache.camel.model.ProcessorDefinition"));
}
if (extendsType(info, SEND_DEFINITION_CLASS) || extendsType(info, TO_DYNAMIC_DEFINITION_CLASS)) {
@@ -523,33 +508,34 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
setProperty.endControlFlow();
properties.add(
- yamlProperty(
- "parameters",
- "object")
- );
+ yamlProperty(
+ "parameters",
+ "object"));
builder.addMethod(MethodSpec.methodBuilder("setEndpointUri")
- .addAnnotation(AnnotationSpec.builder(Override.class).build())
- .addModifiers(Modifier.PROTECTED)
- .addParameter(CamelContext.class, "camelContext")
- .addParameter(Node.class, "node")
- .addParameter(targetType, "target")
- .addParameter(
- ParameterizedTypeName.get(
- ClassName.get(Map.class),
- ClassName.get(String.class),
- ClassName.get(Object.class)),
- "parameters")
- .addCode(
- CodeBlock.builder()
- .addStatement("target.setUri(org.apache.camel.dsl.yaml.common.YamlSupport.createEndpointUri(camelContext, node, target.getUri(), parameters))")
- .build())
- .build());
+ .addAnnotation(AnnotationSpec.builder(Override.class).build())
+ .addModifiers(Modifier.PROTECTED)
+ .addParameter(CamelContext.class, "camelContext")
+ .addParameter(Node.class, "node")
+ .addParameter(targetType, "target")
+ .addParameter(
+ ParameterizedTypeName.get(
+ ClassName.get(Map.class),
+ ClassName.get(String.class),
+ ClassName.get(Object.class)),
+ "parameters")
+ .addCode(
+ CodeBlock.builder()
+ .addStatement(
+ "target.setUri(org.apache.camel.dsl.yaml.common.YamlSupport.createEndpointUri(camelContext, node, target.getUri(), parameters))")
+ .build())
+ .build());
} else if (implementType(info, HAS_EXPRESSION_TYPE_CLASS)) {
setProperty.beginControlFlow("default:");
setProperty.addStatement("$T ed = target.getExpressionType()", CN_EXPRESSION_DEFINITION);
setProperty.beginControlFlow("if (ed != null)");
- setProperty.addStatement("throw new org.apache.camel.dsl.yaml.common.exception.DuplicateFieldException(node, propertyName, \"as an expression\")");
+ setProperty.addStatement(
+ "throw new org.apache.camel.dsl.yaml.common.exception.DuplicateFieldException(node, propertyName, \"as an expression\")");
setProperty.endControlFlow();
setProperty.addStatement("ed = ExpressionDeserializers.constructExpressionType(propertyKey, node)");
setProperty.beginControlFlow("if (ed != null)");
@@ -561,10 +547,9 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
if (!extendsType(info, EXPRESSION_DEFINITION_CLASS)) {
properties.add(
- yamlProperty(
- "__extends",
- "object:org.apache.camel.model.language.ExpressionDefinition")
- );
+ yamlProperty(
+ "__extends",
+ "object:org.apache.camel.model.language.ExpressionDefinition"));
}
} else {
setProperty.beginControlFlow("default:");
@@ -582,22 +567,23 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
// setProperty(T target, String propertyKey, String propertyName, Node value) throws Exception
//
builder
- .addMethod(MethodSpec.methodBuilder("setProperty")
- .addAnnotation(AnnotationSpec.builder(Override.class).build())
- .addModifiers(Modifier.PROTECTED)
- .addParameter(targetType, "target")
- .addParameter(String.class, "propertyKey")
- .addParameter(String.class, "propertyName")
- .addParameter(Node.class, "node")
- .returns(boolean.class)
- .addCode(setProperty.build())
- .build());
+ .addMethod(MethodSpec.methodBuilder("setProperty")
+ .addAnnotation(AnnotationSpec.builder(Override.class).build())
+ .addModifiers(Modifier.PROTECTED)
+ .addParameter(targetType, "target")
+ .addParameter(String.class, "propertyKey")
+ .addParameter(String.class, "propertyName")
+ .addParameter(Node.class, "node")
+ .returns(boolean.class)
+ .addCode(setProperty.build())
+ .build());
//
// YamlType
//
yamlTypeAnnotation.addMember("types", "$L.class", info.name().toString());
- yamlTypeAnnotation.addMember("order", "org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1", info.name().toString());
+ yamlTypeAnnotation.addMember("order", "org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1",
+ info.name().toString());
properties.stream().sorted(Comparator.comparing(a -> a.members.get("name").toString())).forEach(spec -> {
yamlTypeAnnotation.addMember("properties", "$L", spec);
@@ -618,7 +604,8 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
}
@SuppressWarnings("MethodLength")
- private boolean generateSetValue(String modelName, CodeBlock.Builder cb, FieldInfo field, Collection<AnnotationSpec> annotations) {
+ private boolean generateSetValue(
+ String modelName, CodeBlock.Builder cb, FieldInfo field, Collection<AnnotationSpec> annotations) {
if (hasAnnotation(field, XML_TRANSIENT_CLASS) && !hasAnnotation(field, DSL_PROPERTY_ANNOTATION)) {
return false;
}
@@ -652,7 +639,8 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.beginControlFlow("case $S:", fieldName);
cb.addStatement("$L val = asType(node, $L.class)", type.asString(), type.asString());
- cb.addStatement("java.util.List<$L> existing = target.get$L()", paramType, StringHelper.capitalize(field.name()));
+ cb.addStatement("java.util.List<$L> existing = target.get$L()", paramType,
+ StringHelper.capitalize(field.name()));
cb.beginControlFlow("if (existing == null)");
cb.addStatement("existing = new java.util.ArrayList<>()");
cb.endControlFlow();
@@ -662,12 +650,11 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(
- fieldName,
- "object",
- type.asString(),
- isRequired(field))
- );
+ yamlPropertyWithSubtype(
+ fieldName,
+ "object",
+ type.asString(),
+ isRequired(field)));
}
}
} else {
@@ -685,12 +672,11 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(
- fieldName,
- "object",
- type.asString(),
- isRequired(field))
- );
+ yamlPropertyWithSubtype(
+ fieldName,
+ "object",
+ type.asString(),
+ isRequired(field)));
}
}
}
@@ -710,9 +696,9 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
if (extendsType(refType, VERB_DEFINITION_CLASS)) {
implementsOrExtends(parameterized).forEach(ci -> {
Optional<String> name = annotationValue(ci, XML_ROOT_ELEMENT_ANNOTATION_CLASS,
- "name")
- .map(AnnotationValue::asString)
- .filter(value -> !"##default".equals(value));
+ "name")
+ .map(AnnotationValue::asString)
+ .filter(value -> !"##default".equals(value));
if (!name.isPresent()) {
return;
@@ -722,7 +708,8 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
String fieldType = ci.name().toString();
cb.beginControlFlow("case $S:", fieldName);
- cb.addStatement("java.util.List<$L> existing = target.get$L()", refType.name().toString(), StringHelper.capitalize(field.name()));
+ cb.addStatement("java.util.List<$L> existing = target.get$L()", refType.name().toString(),
+ StringHelper.capitalize(field.name()));
cb.beginControlFlow("if (existing == null)");
cb.addStatement("existing = new java.util.ArrayList<>()");
cb.endControlFlow();
@@ -733,12 +720,11 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(
- fieldName,
- "array",
- fieldType,
- false)
- );
+ yamlPropertyWithSubtype(
+ fieldName,
+ "array",
+ fieldType,
+ false));
});
return true;
}
@@ -749,10 +735,10 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
// Skip elements with unsupported annotations.
//
if (!hasAnnotation(field, XML_ATTRIBUTE_ANNOTATION_CLASS) &&
- !hasAnnotation(field, XML_VALUE_ANNOTATION_CLASS) &&
- !hasAnnotation(field, XML_ELEMENT_ANNOTATION_CLASS) &&
- !hasAnnotation(field, XML_ELEMENT_REF_ANNOTATION_CLASS) &&
- !hasAnnotation(field, XML_TRANSIENT_CLASS)) {
+ !hasAnnotation(field, XML_VALUE_ANNOTATION_CLASS) &&
+ !hasAnnotation(field, XML_ELEMENT_ANNOTATION_CLASS) &&
+ !hasAnnotation(field, XML_ELEMENT_REF_ANNOTATION_CLASS) &&
+ !hasAnnotation(field, XML_TRANSIENT_CLASS)) {
return false;
}
@@ -780,24 +766,23 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(fieldName, "array", "string", isRequired(field))
- );
+ yamlPropertyWithSubtype(fieldName, "array", "string", isRequired(field)));
} else {
ClassInfo ci = view.getClassByName(parametrizedType.name());
String name = fieldName(ci, field);
cb.beginControlFlow("case $S:", StringHelper.camelCaseToDash(name).toLowerCase(Locale.US));
- cb.addStatement("java.util.List<$L> val = asFlatList(node, $L.class)", parametrizedType.name().toString(), parametrizedType.name().toString());
+ cb.addStatement("java.util.List<$L> val = asFlatList(node, $L.class)",
+ parametrizedType.name().toString(), parametrizedType.name().toString());
cb.addStatement("target.set$L(val)", StringHelper.capitalize(field.name()));
cb.addStatement("break");
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(
- StringHelper.camelCaseToDash(name).toLowerCase(Locale.US),
- "array",
- parametrizedType.name().toString(), isRequired(field))
- );
+ yamlPropertyWithSubtype(
+ StringHelper.camelCaseToDash(name).toLowerCase(Locale.US),
+ "array",
+ parametrizedType.name().toString(), isRequired(field)));
}
return true;
case "java.util.Set":
@@ -809,8 +794,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(fieldName, "array", "string", isRequired(field))
- );
+ yamlPropertyWithSubtype(fieldName, "array", "string", isRequired(field)));
} else {
ClassInfo ci = view.getClassByName(parametrizedType.name());
String name = fieldName(ci, field);
@@ -822,15 +806,15 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.endControlFlow();
annotations.add(
- yamlPropertyWithSubtype(
- StringHelper.camelCaseToDash(name).toLowerCase(Locale.US),
- "array",
- parametrizedType.name().toString(), isRequired(field))
- );
+ yamlPropertyWithSubtype(
+ StringHelper.camelCaseToDash(name).toLowerCase(Locale.US),
+ "array",
+ parametrizedType.name().toString(), isRequired(field)));
}
return true;
default:
- throw new UnsupportedOperationException("Unable to handle field: " + field.name() + " with type: " + field.type().name());
+ throw new UnsupportedOperationException(
+ "Unable to handle field: " + field.name() + " with type: " + field.type().name());
}
}
}
@@ -866,13 +850,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("target.set$L(val)", StringHelper.capitalize(field.name()));
cb.addStatement("break");
annotations.add(
- yamlProperty(fieldName, "object", isRequired(field), isDeprecated(field))
- );
+ yamlProperty(fieldName, "object", isRequired(field), isDeprecated(field)));
}
}
}
} else if (c != null && c.isEnum()) {
- cb.addStatement("target.set$L(asEnum(node, $L.class))", StringHelper.capitalize(field.name()), field.type().name().toString());
+ cb.addStatement("target.set$L(asEnum(node, $L.class))", StringHelper.capitalize(field.name()),
+ field.type().name().toString());
cb.addStatement("break");
Set<String> values = new TreeSet<>();
@@ -916,8 +900,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("break");
annotations.add(
- yamlPropertyWithFormat(fieldName, "string", "binary", isRequired(field), isDeprecated(field))
- );
+ yamlPropertyWithFormat(fieldName, "string", "binary", isRequired(field), isDeprecated(field)));
break;
case "Z":
case "boolean":
@@ -953,8 +936,8 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("break");
String javaType = annotationValue(field, METADATA_ANNOTATION_CLASS, "javaType")
- .map(AnnotationValue::asString)
- .orElse("string");
+ .map(AnnotationValue::asString)
+ .orElse("string");
switch (javaType) {
case "java.lang.Boolean":
@@ -989,27 +972,31 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
case "java.lang.Float":
case "java.lang.Double":
cb.addStatement("String val = asText(node)");
- cb.addStatement("target.set$L($L.valueOf(val))", StringHelper.capitalize(field.name()), field.type().name().toString());
+ cb.addStatement("target.set$L($L.valueOf(val))", StringHelper.capitalize(field.name()),
+ field.type().name().toString());
cb.addStatement("break");
annotations.add(yamlProperty(fieldName, "number", isRequired(field), isDeprecated(field)));
break;
case "java.lang.Boolean":
cb.addStatement("String val = asText(node)");
- cb.addStatement("target.set$L($L.valueOf(val))", StringHelper.capitalize(field.name()), field.type().name().toString());
+ cb.addStatement("target.set$L($L.valueOf(val))", StringHelper.capitalize(field.name()),
+ field.type().name().toString());
cb.addStatement("break");
annotations.add(yamlProperty(fieldName, "boolean", isRequired(field), isDeprecated(field)));
break;
default:
if (field.type().kind() == Type.Kind.CLASS) {
- cb.addStatement("$L val = asType(node, $L.class)", field.type().name().toString(), field.type().name().toString());
+ cb.addStatement("$L val = asType(node, $L.class)", field.type().name().toString(),
+ field.type().name().toString());
cb.addStatement("target.set$L(val)", StringHelper.capitalize(field.name()));
cb.addStatement("break");
annotations.add(
- yamlPropertyWithSubtype(fieldName, "object", field.type().name().toString(), isRequired(field))
- );
+ yamlPropertyWithSubtype(fieldName, "object", field.type().name().toString(),
+ isRequired(field)));
} else {
- throw new UnsupportedOperationException("Unable to handle field: " + field.name() + " with type: " + field.type().name());
+ throw new UnsupportedOperationException(
+ "Unable to handle field: " + field.name() + " with type: " + field.type().name());
}
}
}
@@ -1019,7 +1006,6 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
return true;
}
-
@SuppressWarnings("MethodLength")
private boolean generateSetValue(CodeBlock.Builder cb, MethodInfo method, Collection<AnnotationSpec> annotations) {
final String name = StringHelper.camelCaseToDash(method.name()).toLowerCase(Locale.US).substring(4);
@@ -1059,8 +1045,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("break");
annotations.add(
- yamlPropertyWithFormat(name, "string", "binary")
- );
+ yamlPropertyWithFormat(name, "string", "binary"));
break;
case "Z":
case "boolean":
@@ -1130,10 +1115,10 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
cb.addStatement("break");
annotations.add(
- yamlPropertyWithSubtype(name, "object", parameterType.toString())
- );
+ yamlPropertyWithSubtype(name, "object", parameterType.toString()));
} else {
- throw new UnsupportedOperationException("Unable to handle method: " + method.name() + " with type: " + parameterType);
+ throw new UnsupportedOperationException(
+ "Unable to handle method: " + method.name() + " with type: " + parameterType);
}
}
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
index 90c83af43bc..da9a3be98c2 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
@@ -50,12 +50,12 @@ import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@Mojo(
- name = "generate-yaml-schema",
- inheritByDefault = false,
- defaultPhase = LifecyclePhase.GENERATE_SOURCES,
- requiresDependencyResolution = ResolutionScope.COMPILE,
- threadSafe = true,
- requiresProject = false)
+ name = "generate-yaml-schema",
+ inheritByDefault = false,
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES,
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ threadSafe = true,
+ requiresProject = false)
public class GenerateYamlSchemaMojo extends GenerateYamlSupportMojo {
@Parameter(required = true)
private File outputFile;
@@ -226,7 +226,7 @@ public class GenerateYamlSchemaMojo extends GenerateYamlSupportMojo {
ObjectNode p = (ObjectNode) jn;
Map<String, JsonNode> rebuild = new LinkedHashMap<>();
// the properties are in mixed kebab-case and camelCase
- for (Iterator<String> it = p.fieldNames(); it.hasNext(); ) {
+ for (Iterator<String> it = p.fieldNames(); it.hasNext();) {
String n = it.next();
String t = StringHelper.dashToCamelCase(n);
JsonNode prop = p.get(n);
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
index 1afc5c42a74..e35e122aed0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
@@ -291,7 +291,8 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
return yamlPropertyWithFormat(name, type, format, false, false);
}
- protected static AnnotationSpec yamlPropertyWithFormat(String name, String type, String format, boolean required, boolean deprecated) {
+ protected static AnnotationSpec yamlPropertyWithFormat(
+ String name, String type, String format, boolean required, boolean deprecated) {
AnnotationSpec.Builder builder = AnnotationSpec.builder(CN_YAML_PROPERTY);
builder.addMember("name", "$S", name);
builder.addMember("type", "$S", type);
@@ -588,11 +589,11 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
*/
private Optional<String> getNameFromAnnotationOrRef(AnnotationInstance annotation, ClassInfo refClass, String emptyValue) {
return annotationValue(annotation, "name")
- .map(AnnotationValue::asString)
- .filter(value -> !emptyValue.equals(value))
- .or(() -> annotationValue(refClass, XML_ROOT_ELEMENT_ANNOTATION_CLASS, "name")
.map(AnnotationValue::asString)
- .filter(v -> !XML_ANNOTATION_DEFAULT_VALUE.equals(v)));
+ .filter(value -> !emptyValue.equals(value))
+ .or(() -> annotationValue(refClass, XML_ROOT_ELEMENT_ANNOTATION_CLASS, "name")
+ .map(AnnotationValue::asString)
+ .filter(v -> !XML_ANNOTATION_DEFAULT_VALUE.equals(v)));
}
protected boolean isRequired(FieldInfo fi) {
@@ -603,17 +604,17 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
.map(AnnotationValue::asBoolean),
annotationValue(fi, XML_ATTRIBUTE_ANNOTATION_CLASS, "required")
.map(AnnotationValue::asBoolean))
- .orElse(false);
+ .orElse(false);
}
protected String getEnums(FieldInfo fi) {
return annotationValue(fi, METADATA_ANNOTATION_CLASS, "enums")
- .map(AnnotationValue::asString).orElse("");
+ .map(AnnotationValue::asString).orElse("");
}
protected String getJavaType(FieldInfo fi) {
return annotationValue(fi, METADATA_ANNOTATION_CLASS, "javaType")
- .map(AnnotationValue::asString).orElse("");
+ .map(AnnotationValue::asString).orElse("");
}
protected boolean isEnum(FieldInfo fi) {
@@ -626,9 +627,8 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
protected boolean extendsType(Type type, DotName superType) {
return extendsType(
- view.getClassByName(type.name()),
- superType
- );
+ view.getClassByName(type.name()),
+ superType);
}
protected boolean extendsType(ClassInfo ci, DotName superType) {
@@ -651,9 +651,8 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
protected boolean implementType(Type type, DotName interfaceType) {
return implementType(
- view.getClassByName(type.name()),
- interfaceType
- );
+ view.getClassByName(type.name()),
+ interfaceType);
}
protected boolean implementType(ClassInfo ci, DotName interfaceType) {
@@ -695,8 +694,8 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
protected Stream<ClassInfo> implementsOrExtends(Type ci) {
return Stream.concat(
- view.getAllKnownSubclasses(ci.name()).stream(),
- view.getAllKnownSubclasses(ci.name()).stream())
+ view.getAllKnownSubclasses(ci.name()).stream(),
+ view.getAllKnownSubclasses(ci.name()).stream())
.distinct()
.sorted(Comparator.comparing(ClassInfo::name));
}
@@ -704,26 +703,25 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
/**
* As stated in the JAXB specification:
* <ul>
- * <li>In case of {@code @XmlAttribute} and {@code @XmlElement}, the name is retrieved from the annotation if it
- * has been set, otherwise the field name is used</li>
- * <li>In case of {@code @XmlElementRef} and {@code @DslProperty} (the latter is specific to Camel), the name is
- * retrieved from the annotation if it has been set, otherwise it is retrieved from the annotation
- * {@code @XmlRootElement} on the type being referenced.
- * </li>
+ * <li>In case of {@code @XmlAttribute} and {@code @XmlElement}, the name is retrieved from the annotation if it has
+ * been set, otherwise the field name is used</li>
+ * <li>In case of {@code @XmlElementRef} and {@code @DslProperty} (the latter is specific to Camel), the name is
+ * retrieved from the annotation if it has been set, otherwise it is retrieved from the annotation
+ * {@code @XmlRootElement} on the type being referenced.</li>
* </ul>
*/
protected String fieldName(ClassInfo ci, FieldInfo fi) {
return firstPresent(
- annotation(fi, DSL_PROPERTY_ANNOTATION)
- .flatMap(annotation -> getNameFromAnnotationOrRef(annotation, ci, "")),
- annotationValue(fi, XML_ATTRIBUTE_ANNOTATION_CLASS, "name")
- .map(AnnotationValue::asString)
- .filter(value -> !XML_ANNOTATION_DEFAULT_VALUE.equals(value)),
- annotationValue(fi, XML_ELEMENT_ANNOTATION_CLASS, "name")
- .map(AnnotationValue::asString)
- .filter(value -> !XML_ANNOTATION_DEFAULT_VALUE.equals(value)),
- annotation(fi, XML_ELEMENT_REF_ANNOTATION_CLASS)
- .flatMap(annotation -> getNameFromAnnotationOrRef(annotation, ci, XML_ANNOTATION_DEFAULT_VALUE))
- ).orElseGet(fi::name);
+ annotation(fi, DSL_PROPERTY_ANNOTATION)
+ .flatMap(annotation -> getNameFromAnnotationOrRef(annotation, ci, "")),
+ annotationValue(fi, XML_ATTRIBUTE_ANNOTATION_CLASS, "name")
+ .map(AnnotationValue::asString)
+ .filter(value -> !XML_ANNOTATION_DEFAULT_VALUE.equals(value)),
+ annotationValue(fi, XML_ELEMENT_ANNOTATION_CLASS, "name")
+ .map(AnnotationValue::asString)
+ .filter(value -> !XML_ANNOTATION_DEFAULT_VALUE.equals(value)),
+ annotation(fi, XML_ELEMENT_REF_ANNOTATION_CLASS)
+ .flatMap(annotation -> getNameFromAnnotationOrRef(annotation, ci, XML_ANNOTATION_DEFAULT_VALUE)))
+ .orElseGet(fi::name);
}
}
diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
index 518583a56e8..73910be5154 100644
--- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
+++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
@@ -151,7 +151,8 @@ public final class Jsoner {
* @throws IOException if the underlying reader encounters an I/O error. Ensure the reader is properly
* instantiated, isn't closed, or that it is ready before trying again.
*/
- private static JsonArray deserialize(final Reader deserializable, final Set<DeserializationOptions> flags) throws DeserializationException, IOException {
+ private static JsonArray deserialize(final Reader deserializable, final Set<DeserializationOptions> flags)
+ throws DeserializationException, IOException {
final Yylex lexer = new Yylex(deserializable);
Yytoken token;
States currentState;
@@ -166,7 +167,8 @@ public final class Jsoner {
switch (currentState) {
case DONE:
/* The parse has finished a JSON value. */
- if (!flags.contains(DeserializationOptions.ALLOW_CONCATENATED_JSON_VALUES) || Yytoken.Types.END.equals(token.getType())) {
+ if (!flags.contains(DeserializationOptions.ALLOW_CONCATENATED_JSON_VALUES)
+ || Yytoken.Types.END.equals(token.getType())) {
/*
* Break if concatenated values are not allowed or if an END
* token is read.
@@ -189,7 +191,8 @@ public final class Jsoner {
valueStack.addLast(token.getValue());
stateStack.addLast(States.DONE);
} else {
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
}
break;
case LEFT_BRACE:
@@ -198,7 +201,8 @@ public final class Jsoner {
valueStack.addLast(new JsonObject());
stateStack.addLast(States.PARSING_OBJECT);
} else {
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
}
break;
case LEFT_SQUARE:
@@ -207,12 +211,14 @@ public final class Jsoner {
valueStack.addLast(new JsonArray());
stateStack.addLast(States.PARSING_ARRAY);
} else {
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.DISALLOWED_TOKEN, token);
}
break;
default:
/* Neither a JSON array or object was detected. */
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
}
break;
case PARSED_ERROR:
@@ -220,7 +226,8 @@ public final class Jsoner {
* The parse could be in this state due to the state stack not
* having a state to pop off.
*/
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
case PARSING_ARRAY:
switch (token.getType()) {
case COMMA:
@@ -265,7 +272,8 @@ public final class Jsoner {
break;
default:
/* Any other token is invalid in an array. */
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
}
break;
case PARSING_OBJECT:
@@ -296,7 +304,8 @@ public final class Jsoner {
* Abort! JSON keys are always strings and it wasn't a
* string.
*/
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
}
break;
case RIGHT_BRACE:
@@ -311,7 +320,8 @@ public final class Jsoner {
break;
default:
/* The parse didn't detect the end of an object or a key. */
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
}
break;
case PARSING_ENTRY:
@@ -353,7 +363,8 @@ public final class Jsoner {
/*
* The parse didn't find anything for the parsed pair key.
*/
- throw new DeserializationException(lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
+ throw new DeserializationException(
+ lexer.getPosition(), DeserializationException.Problems.UNEXPECTED_TOKEN, token);
}
break;
default:
@@ -924,20 +935,24 @@ public final class Jsoner {
* @throws IllegalArgumentException if the jsonSerializable isn't serializable in JSON.
* @see SerializationOptions
*/
- private static void serialize(final Object jsonSerializable, final Writer writableDestination, final Set<SerializationOptions> flags) throws IOException {
+ private static void serialize(
+ final Object jsonSerializable, final Writer writableDestination, final Set<SerializationOptions> flags)
+ throws IOException {
if (jsonSerializable == null) {
/* When a null is passed in the word null is supported in JSON. */
writableDestination.write("null");
} else if (jsonSerializable instanceof Jsonable && flags.contains(SerializationOptions.ALLOW_JSONABLES)) {
/* Writes the writable as defined by the writable. */
writableDestination.write(((Jsonable) jsonSerializable).toJson());
- } else if (jsonSerializable instanceof Enum && flags.contains(SerializationOptions.ALLOW_FULLY_QUALIFIED_ENUMERATIONS)) {
+ } else if (jsonSerializable instanceof Enum
+ && flags.contains(SerializationOptions.ALLOW_FULLY_QUALIFIED_ENUMERATIONS)) {
/*
* Writes the enum as a special case of string. All enums (unless
* they implement Jsonable) will be the string literal
* "${DECLARING_CLASS_NAME}.${ENUM_NAME}" as their value.
*/
- @SuppressWarnings("rawtypes") final Enum e = (Enum) jsonSerializable;
+ @SuppressWarnings("rawtypes")
+ final Enum e = (Enum) jsonSerializable;
writableDestination.write('"');
writableDestination.write(e.getDeclaringClass().getName());
writableDestination.write('.');
@@ -975,7 +990,8 @@ public final class Jsoner {
} else if (jsonSerializable instanceof Map) {
/* Writes the map in JSON object format. */
boolean isFirstEntry = true;
- @SuppressWarnings("rawtypes") final Iterator entries = ((Map) jsonSerializable).entrySet().iterator();
+ @SuppressWarnings("rawtypes")
+ final Iterator entries = ((Map) jsonSerializable).entrySet().iterator();
writableDestination.write('{');
while (entries.hasNext()) {
if (isFirstEntry) {
@@ -983,7 +999,8 @@ public final class Jsoner {
} else {
writableDestination.write(',');
}
- @SuppressWarnings("rawtypes") final Map.Entry entry = (Map.Entry) entries.next();
+ @SuppressWarnings("rawtypes")
+ final Map.Entry entry = (Map.Entry) entries.next();
Jsoner.serialize(entry.getKey(), writableDestination, flags);
writableDestination.write(':');
Jsoner.serialize(entry.getValue(), writableDestination, flags);
@@ -992,7 +1009,8 @@ public final class Jsoner {
} else if (jsonSerializable instanceof Collection) {
/* Writes the collection in JSON array format. */
boolean isFirstElement = true;
- @SuppressWarnings("rawtypes") final Iterator elements = ((Collection) jsonSerializable).iterator();
+ @SuppressWarnings("rawtypes")
+ final Iterator elements = ((Collection) jsonSerializable).iterator();
writableDestination.write('[');
while (elements.hasNext()) {
if (isFirstElement) {
@@ -1161,12 +1179,13 @@ public final class Jsoner {
/*
* Notify the caller the cause of failure for the serialization.
*/
- throw new IllegalArgumentException("Encountered a: " + jsonSerializable.getClass().getName() + " as: " + jsonSerializable.toString()
- + " that isn't JSON serializable.\n Try:\n"
- + " 1) Implementing the Jsonable interface for the object to return valid JSON. If it already does it probably has a bug.\n"
- + " 2) If you cannot edit the source of the object or couple it with this library consider wrapping it in a class that does implement the Jsonable interface.\n"
- + " 3) Otherwise convert it to a boolean, null, number, JsonArray, JsonObject, or String value before serializing it.\n"
- + " 4) If you feel it should have serialized you could use a more tolerant serialization for debugging purposes.");
+ throw new IllegalArgumentException(
+ "Encountered a: " + jsonSerializable.getClass().getName() + " as: " + jsonSerializable.toString()
+ + " that isn't JSON serializable.\n Try:\n"
+ + " 1) Implementing the Jsonable interface for the object to return valid JSON. If it already does it probably has a bug.\n"
+ + " 2) If you cannot edit the source of the object or couple it with this library consider wrapping it in a class that does implement the Jsonable interface.\n"
+ + " 3) Otherwise convert it to a boolean, null, number, JsonArray, JsonObject, or String value before serializing it.\n"
+ + " 4) If you feel it should have serialized you could use a more tolerant serialization for debugging purposes.");
}
}
}
diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
index b76415f6a4c..a56b6ba5103 100644
--- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
+++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
@@ -545,7 +545,7 @@ class Yylex {
case 23: {
try {
int ch = Integer.parseInt(yytext().substring(2), 16);
- sb.append((char)ch);
+ sb.append((char) ch);
} catch (Exception e) {
/*
* The lexer is broken if it can build a 4 byte character
@@ -614,7 +614,8 @@ class Yylex {
case 39:
break;
case 1: {
- throw new DeserializationException(yychar, DeserializationException.Problems.UNEXPECTED_CHARACTER, Character.valueOf(yycharat(0)));
+ throw new DeserializationException(
+ yychar, DeserializationException.Problems.UNEXPECTED_CHARACTER, Character.valueOf(yycharat(0)));
}
case 40:
break;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 5078ed4c444..795b189e067 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -1197,7 +1197,8 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
Boolean secret = metadata != null ? metadata.secret() : null;
- if (collectUriPathProperties(componentModel, classElement, excludes, prefix, nestedTypeName, nestedFieldName, componentOption, orgClassElement, metadata, fieldElement, deprecated, deprecationNote, secret)) {
+ if (collectUriPathProperties(componentModel, classElement, excludes, prefix, nestedTypeName, nestedFieldName,
+ componentOption, orgClassElement, metadata, fieldElement, deprecated, deprecationNote, secret)) {
continue;
}
String fieldName;
@@ -1253,7 +1254,10 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
} else {
ApiParam apiParam = fieldElement.getAnnotation(ApiParam.class);
- collectNonNestedField(componentModel, classElement, nestedTypeName, nestedFieldName, componentOption, apiName, apiOption, apiParams, metadata, fieldElement, deprecated, deprecationNote, secret, fieldName, param, apiParam, name, paramOptionalPrefix, paramPrefix, multiValue, defaultValue, defaultValueNote, required, label, displayName, fieldTypeElement, fieldTypeName);
+ collectNonNestedField(componentModel, classElement, nestedTypeName, nestedFieldName, componentOption,
+ apiName, apiOption, apiParams, metadata, fieldElement, deprecated, deprecationNote, secret,
+ fieldName, param, apiParam, name, paramOptionalPrefix, paramPrefix, multiValue, defaultValue,
+ defaultValueNote, required, label, displayName, fieldTypeElement, fieldTypeName);
}
}
}
@@ -1274,7 +1278,13 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
}
- private void collectNonNestedField(ComponentModel componentModel, Class<?> classElement, String nestedTypeName, String nestedFieldName, boolean componentOption, String apiName, boolean apiOption, ApiParams apiParams, Metadata metadata, Field fieldElement, boolean deprecated, String deprecationNote, Boolean secret, String fieldName, UriParam param, ApiParam apiParam, String name, String paramOptionalPrefix, String paramPrefix, boolean multiValue, Object defaultValue, String defaultVal [...]
+ private void collectNonNestedField(
+ ComponentModel componentModel, Class<?> classElement, String nestedTypeName, String nestedFieldName,
+ boolean componentOption, String apiName, boolean apiOption, ApiParams apiParams, Metadata metadata,
+ Field fieldElement, boolean deprecated, String deprecationNote, Boolean secret, String fieldName, UriParam param,
+ ApiParam apiParam, String name, String paramOptionalPrefix, String paramPrefix, boolean multiValue,
+ Object defaultValue, String defaultValueNote, boolean required, String label, String displayName,
+ Class<?> fieldTypeElement, String fieldTypeName) {
String docComment = param.description();
if (Strings.isNullOrEmpty(docComment)) {
docComment = findJavaDoc(fieldElement, fieldName, name, classElement, false);
@@ -1427,7 +1437,10 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
}
- private boolean collectUriPathProperties(ComponentModel componentModel, Class<?> classElement, Set<String> excludes, String prefix, String nestedTypeName, String nestedFieldName, boolean componentOption, Class<?> orgClassElement, Metadata metadata, Field fieldElement, boolean deprecated, String deprecationNote, Boolean secret) {
+ private boolean collectUriPathProperties(
+ ComponentModel componentModel, Class<?> classElement, Set<String> excludes, String prefix, String nestedTypeName,
+ String nestedFieldName, boolean componentOption, Class<?> orgClassElement, Metadata metadata, Field fieldElement,
+ boolean deprecated, String deprecationNote, Boolean secret) {
UriPath path = fieldElement.getAnnotation(UriPath.class);
String fieldName = fieldElement.getName();
// component options should not include @UriPath as they are for endpoints only
@@ -1604,7 +1617,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
return false;
}
-
private static boolean isGroovyMetaClassProperty(final Method method) {
final String methodName = method.getName();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
index 1ce92bc0ae5..976d63120fd 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
@@ -221,8 +221,7 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
.setName("write" + name)
.addThrows(IOException.class)
.setBody(
- "doWrite" + name + "(\"" + element + "\", def);"
- );
+ "doWrite" + name + "(\"" + element + "\", def);");
}
@@ -232,7 +231,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
model.stream().filter(cl -> "OptionalIdentifiedDefinition".equals(cl.getSimpleName()))
.forEach(elementRefs::add);
writer.addMethod()
- .setSignature("public void writeOptionalIdentifiedDefinitionRef(OptionalIdentifiedDefinition def) throws IOException")
+ .setSignature(
+ "public void writeOptionalIdentifiedDefinitionRef(OptionalIdentifiedDefinition def) throws IOException")
.setBody("doWriteOptionalIdentifiedDefinitionRef(null, def);");
for (Class<?> clazz : model) {
@@ -269,12 +269,14 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
an = member.getName();
}
String gn = member.getGetter();
- attributes.add("doWriteAttribute(\"" + an + "\", " + conversion(writer, type, "def." + gn + "()", clazz.getName()) + ");");
+ attributes.add("doWriteAttribute(\"" + an + "\", "
+ + conversion(writer, type, "def." + gn + "()", clazz.getName()) + ");");
});
// @XmlAnyAttribute
members.stream().filter(Property::isAnyAttribute).forEach(member -> {
- throw new UnsupportedOperationException("Class " + clazz.getName() + " / member " + member + ": unsupported @XmlAnyAttribute");
+ throw new UnsupportedOperationException(
+ "Class " + clazz.getName() + " / member " + member + ": unsupported @XmlAnyAttribute");
});
List<String> elements = new ArrayList<>();
@@ -306,7 +308,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
if (list) {
Class<?> parent = new GenericType(member.getType()).getActualTypeArgument(0).getRawClass();
elementRefs.add(parent);
- elements.add("doWriteList(null, null, def." + gn + "(), this::doWrite" + parent.getSimpleName() + "Ref);");
+ elements.add(
+ "doWriteList(null, null, def." + gn + "(), this::doWrite" + parent.getSimpleName() + "Ref);");
} else {
Class<?> parent = new GenericType(member.getType()).getRawClass();
elementRefs.add(parent);
@@ -331,7 +334,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
for (XmlElement elem : member.getAnnotation(XmlElements.class).value()) {
String t = elem.type().getSimpleName();
String n = elem.name();
- elements.add(" case \"" + t + "\" -> doWrite" + t + "(\"" + n + "\", (" + t + ") def." + gn + "());");
+ elements.add(" case \"" + t + "\" -> doWrite" + t + "(\"" + n + "\", (" + t + ") def." + gn
+ + "());");
}
elements.add(" }");
elements.add("});");
@@ -360,14 +364,16 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
}
}
if (actualType == null) {
- throw new IllegalArgumentException("Unable to determine property name for JAXB" +
- " adapted member: " + member);
+ throw new IllegalArgumentException(
+ "Unable to determine property name for JAXB" +
+ " adapted member: " + member);
}
elements.add("doWriteElement(" +
- "\"" + n + "\", new " + cl.getSimpleName() + "().marshal(def." + gn + "()), this::doWrite" + actualType.getSimpleName() + ");");
+ "\"" + n + "\", new " + cl.getSimpleName() + "().marshal(def." + gn
+ + "()), this::doWrite" + actualType.getSimpleName() + ");");
} else {
elements.add("doWriteElement(" +
- "\"" + n + "\", def." + gn + "(), this::doWrite" + t + ");");
+ "\"" + n + "\", def." + gn + "(), this::doWrite" + t + ");");
}
}
} else if (member.getAnnotation(XmlAnyElement.class) != null) {
@@ -390,11 +396,10 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
});
// @XmlValue
- List<String> value =
- getClassAndSuper(clazz).flatMap(this::getProperties)
- .filter(Property::isValue).findFirst()
- .map(member -> "doWriteValue(def." + member.getGetter() + "());")
- .stream().toList();
+ List<String> value = getClassAndSuper(clazz).flatMap(this::getProperties)
+ .filter(Property::isValue).findFirst()
+ .map(member -> "doWriteValue(def." + member.getGetter() + "());")
+ .stream().toList();
String qgname = qname;
if (clazz.getTypeParameters().length > 0) {
@@ -402,7 +407,7 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
.collect(Collectors.joining(", ")) + ">";
}
if (!attributeMembers.isEmpty() || !elementMembers.isEmpty() || isRootElement(clazz)
- || isReferenced(clazz, model)) {
+ || isReferenced(clazz, model)) {
List<String> statements = new ArrayList<>();
if ("ExpressionSubElementDefinition".equals(name)) {
statements.add("startExpressionElement(name);");
@@ -511,7 +516,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
" value(value);",
"}");
writer.addMethod()
- .setSignature("protected <T> void doWriteList(String wrapperName, String name, List<T> list, ElementSerializer<T> elementSerializer) throws IOException")
+ .setSignature(
+ "protected <T> void doWriteList(String wrapperName, String name, List<T> list, ElementSerializer<T> elementSerializer) throws IOException")
.setBody("""
if (list != null) {
if (wrapperName != null) {
@@ -525,7 +531,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
}
}""");
writer.addMethod()
- .setSignature("protected <T> void doWriteElement(String name, T v, ElementSerializer<T> elementSerializer) throws IOException")
+ .setSignature(
+ "protected <T> void doWriteElement(String name, T v, ElementSerializer<T> elementSerializer) throws IOException")
.setBody("""
if (v != null) {
elementSerializer.doWriteElement(name, v);
@@ -607,8 +614,8 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
if (rawClass == String.class) {
return val;
} else if (rawClass.isEnum()
- || rawClass == Integer.class || rawClass == Long.class || rawClass == Boolean.class
- || rawClass == Float.class) {
+ || rawClass == Integer.class || rawClass == Long.class || rawClass == Boolean.class
+ || rawClass == Float.class) {
writer.addImport(rawClass);
return "toString(" + val + ")";
} else if (rawClass == byte[].class) {
@@ -642,24 +649,24 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
.filter(this::isField)
.findFirst().or(() -> allMembers.stream()
.filter(m -> isField(m)
- && Objects.equals(propname(m), name)
- && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
+ && Objects.equals(propname(m), name)
+ && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
.findFirst())
.orElse(null);
Member getter = members.stream()
.filter(this::isGetter)
.findFirst().or(() -> allMembers.stream()
.filter(m -> isGetter(m)
- && Objects.equals(propname(m), name)
- && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
+ && Objects.equals(propname(m), name)
+ && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
.findFirst())
.orElse(null);
Member setter = members.stream()
.filter(this::isSetter)
.findFirst().or(() -> allMembers.stream()
.filter(m -> isSetter(m)
- && Objects.equals(propname(m), name)
- && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
+ && Objects.equals(propname(m), name)
+ && Objects.equals(ModelWriterGeneratorMojo.type(m), type))
.findFirst())
.orElse(null);
if (getter != null && setter != null) {
@@ -690,11 +697,11 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
}
private List<Member> getMembers(Class<?> clazz) {
- return members.computeIfAbsent(clazz, cl -> Stream.<Member>concat(
- Arrays.stream(cl.getDeclaredMethods())
- .filter(m -> isSetter(m) || isGetter(m))
- .filter(m -> !m.isSynthetic()),
- Arrays.stream(cl.getDeclaredFields()))
+ return members.computeIfAbsent(clazz, cl -> Stream.<Member> concat(
+ Arrays.stream(cl.getDeclaredMethods())
+ .filter(m -> isSetter(m) || isGetter(m))
+ .filter(m -> !m.isSynthetic()),
+ Arrays.stream(cl.getDeclaredFields()))
.toList());
}
@@ -707,23 +714,24 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
}
if (accessType == XmlAccessType.PROPERTY) {
return m -> m.getDeclaringClass() == clazz
- && isSetter(m) || isGetter(m) || (isField(m) && isXmlBindAnnotated(m));
+ && isSetter(m) || isGetter(m) || (isField(m) && isXmlBindAnnotated(m));
} else if (accessType == XmlAccessType.FIELD) {
return m -> m.getDeclaringClass() == clazz
- && ((isSetter(m) || isGetter(m)) && isXmlBindAnnotated(m)
+ && ((isSetter(m) || isGetter(m)) && isXmlBindAnnotated(m)
|| isField(m) && !Modifier.isStatic(m.getModifiers()) && !Modifier.isTransient(m.getModifiers()));
} else if (accessType == XmlAccessType.PUBLIC_MEMBER) {
return m -> m.getDeclaringClass() == clazz
- && (Modifier.isPublic(m.getModifiers()) || isXmlBindAnnotated(m));
+ && (Modifier.isPublic(m.getModifiers()) || isXmlBindAnnotated(m));
} else /* if (accessType == XmlAccessType.NONE) */ {
return m -> m.getDeclaringClass() == clazz
- && isXmlBindAnnotated(m);
+ && isXmlBindAnnotated(m);
}
}
private boolean isXmlBindAnnotated(Member m) {
return Stream.of(((AnnotatedElement) m).getAnnotations())
- .anyMatch(a -> a.getClass().getAnnotatedInterfaces()[0].getType().getTypeName().startsWith("jakarta.xml.bind.annotation."));
+ .anyMatch(a -> a.getClass().getAnnotatedInterfaces()[0].getType().getTypeName()
+ .startsWith("jakarta.xml.bind.annotation."));
}
private boolean isField(Member member) {
@@ -732,19 +740,19 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
private boolean isSetter(Member member) {
return (member instanceof Method m)
- && !Modifier.isStatic(m.getModifiers())
- && m.getName().startsWith("set") && m.getName().length() > 3
- && m.getParameterCount() == 1
- && m.getReturnType() == Void.TYPE;
+ && !Modifier.isStatic(m.getModifiers())
+ && m.getName().startsWith("set") && m.getName().length() > 3
+ && m.getParameterCount() == 1
+ && m.getReturnType() == Void.TYPE;
}
private boolean isGetter(Member member) {
return (member instanceof Method m)
- && !Modifier.isStatic(m.getModifiers())
- && m.getParameterCount() == 0
- && (m.getName().startsWith("get") && m.getName().length() > 3
- || m.getName().startsWith("is") && m.getName().length() > 2
- && (m.getReturnType() == Boolean.TYPE || m.getReturnType() == Boolean.class));
+ && !Modifier.isStatic(m.getModifiers())
+ && m.getParameterCount() == 0
+ && (m.getName().startsWith("get") && m.getName().length() > 3
+ || m.getName().startsWith("is") && m.getName().length() > 2
+ && (m.getReturnType() == Boolean.TYPE || m.getReturnType() == Boolean.class));
}
private Stream<Class<?>> getClassAndSuper(Class<?> clazz) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index 7b8c2723fce..37a6a6c42eb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -233,20 +233,27 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
parser.addImport(ArrayList.class);
parser.addImport(org.w3c.dom.Element.class);
parser.addAnnotation(SuppressWarnings.class).setLiteralValue("\"unused\"");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter("org.apache.camel.spi.Resource", "input").addThrows(IOException.class)
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser")
+ .addParameter("org.apache.camel.spi.Resource", "input").addThrows(IOException.class)
.addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input);");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter("org.apache.camel.spi.Resource", "input").addParameter(String.class, "namespace")
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser")
+ .addParameter("org.apache.camel.spi.Resource", "input").addParameter(String.class, "namespace")
.addThrows(IOException.class).addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input, namespace);");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(InputStream.class, "input").addThrows(IOException.class)
- .addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input);");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(Reader.class, "reader").addThrows(IOException.class)
- .addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(reader);");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(InputStream.class, "input").addParameter(String.class, "namespace")
- .addThrows(IOException.class).addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input, namespace);");
- parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(Reader.class, "reader").addParameter(String.class, "namespace")
- .addThrows(IOException.class).addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(reader, namespace);");
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(InputStream.class, "input")
+ .addThrows(IOException.class)
+ .addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input);");
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(Reader.class, "reader")
+ .addThrows(IOException.class)
+ .addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(reader);");
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(InputStream.class, "input")
+ .addParameter(String.class, "namespace")
+ .addThrows(IOException.class).addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(input, namespace);");
+ parser.addMethod().setConstructor(true).setPublic().setName("ModelParser").addParameter(Reader.class, "reader")
+ .addParameter(String.class, "namespace")
+ .addThrows(IOException.class).addThrows(XML_PULL_PARSER_EXCEPTION).setBody("super(reader, namespace);");
- List<Class<?>> elementRefs = Arrays.asList(processorDefinitionClass, expressionDefinitionClass, dataFormatDefinitionClass);
+ List<Class<?>> elementRefs
+ = Arrays.asList(processorDefinitionClass, expressionDefinitionClass, dataFormatDefinitionClass);
for (Class<?> clazz : model) {
if (clazz.getAnnotation(XmlEnum.class) != null || clazz.isInterface()) {
@@ -266,10 +273,13 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
List<Member> members = getMembers(clazz);
// XmlAttribute
- List<Member> attributeMembers = members.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlAttribute.class) != null).collect(Collectors.toList());
+ List<Member> attributeMembers
+ = members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) != null)
+ .collect(Collectors.toList());
String baseAttributeHandler = null;
for (Class<?> parent = clazz.getSuperclass(); parent != Object.class; parent = parent.getSuperclass()) {
- if (getMembers(parent).stream().anyMatch(member -> ((AccessibleObject)member).getAnnotation(XmlAttribute.class) != null)) {
+ if (getMembers(parent).stream()
+ .anyMatch(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) != null)) {
baseAttributeHandler = lowercase(parent.getSimpleName()) + "AttributeHandler()";
break;
}
@@ -280,10 +290,11 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
} else {
SortedMap<String, String> cases = new TreeMap<>();
for (Member member : attributeMembers) {
- Type pt = member instanceof Method ? ((Method)member).getGenericParameterTypes()[0] : ((Field)member).getGenericType();
+ Type pt = member instanceof Method
+ ? ((Method) member).getGenericParameterTypes()[0] : ((Field) member).getGenericType();
GenericType type = new GenericType(pt);
String mn = member.getName();
- String an = ((AccessibleObject)member).getAnnotation(XmlAttribute.class).name();
+ String an = ((AccessibleObject) member).getAnnotation(XmlAttribute.class).name();
if ("##default".equals(an)) {
an = member instanceof Method ? propname(mn) : mn;
}
@@ -293,7 +304,8 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
String defaultCase = baseAttributeHandler != null ? baseAttributeHandler + ".accept(def, key, val)" : "false";
if (attributeMembers.size() == 1) {
Map.Entry<String, String> entry = cases.entrySet().iterator().next();
- attributes = " (def, key, val) -> {\n" + " if (\"" + entry.getKey() + "\".equals(key)) {\n" + " " + entry.getValue() + "\n" + " return true;\n"
+ attributes = " (def, key, val) -> {\n" + " if (\"" + entry.getKey() + "\".equals(key)) {\n" + " "
+ + entry.getValue() + "\n" + " return true;\n"
+ " }\n" + " return " + defaultCase + ";\n" + "}";
} else {
attributes = generateCases(cases, defaultCase);
@@ -301,75 +313,101 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
}
// @XmlAnyAttribute
- members.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlAnyAttribute.class) != null).forEach(member -> {
- if (!"otherAttributes".equals(member.getName())) {
- throw new UnsupportedOperationException("Class " + clazz.getName() + " / member " + member + ": unsupported @XmlAnyAttribute");
- }
- });
+ members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlAnyAttribute.class) != null)
+ .forEach(member -> {
+ if (!"otherAttributes".equals(member.getName())) {
+ throw new UnsupportedOperationException(
+ "Class " + clazz.getName() + " / member " + member + ": unsupported @XmlAnyAttribute");
+ }
+ });
// @XmlElementRef @XmlElement @XmlElements
- List<Member> elementMembers = members.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlAttribute.class) == null)
- .filter(member -> ((AccessibleObject)member).getAnnotation(XmlAnyAttribute.class) == null)
- .filter(member -> ((AccessibleObject)member).getAnnotation(XmlValue.class) == null).collect(Collectors.toList());
+ List<Member> elementMembers
+ = members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) == null)
+ .filter(member -> ((AccessibleObject) member).getAnnotation(XmlAnyAttribute.class) == null)
+ .filter(member -> ((AccessibleObject) member).getAnnotation(XmlValue.class) == null)
+ .collect(Collectors.toList());
List<Member> multiElements = members.stream()
- .filter(member -> ((AccessibleObject)member).getAnnotation(XmlElementRef.class) != null || ((AccessibleObject)member).getAnnotation(XmlElements.class) != null
- || (clazz == outputDefinitionClass && "setOutputs".equals(member.getName())))
- .collect(Collectors.toList());
+ .filter(member -> ((AccessibleObject) member).getAnnotation(XmlElementRef.class) != null
+ || ((AccessibleObject) member).getAnnotation(XmlElements.class) != null
+ || (clazz == outputDefinitionClass && "setOutputs".equals(member.getName())))
+ .collect(Collectors.toList());
Map<String, String> expressionHandlersDefs = new LinkedHashMap<>();
Map<String, String> cases = new LinkedHashMap<>();
// to handle elements from external namespaces
List<String[]> externalNamespaces = new ArrayList<>();
// XmlElementRef
- elementMembers.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlElementRef.class) != null
- || (clazz == outputDefinitionClass && "setOutputs".equals(member.getName())))
- .forEach(member -> {
- Type pt = member instanceof Method ? ((Method)member).getGenericParameterTypes()[0] : ((Field)member).getGenericType();
- GenericType type = new GenericType(pt);
- boolean list = type.getRawClass() == List.class;
- String fn = member.getName();
- String sn = member instanceof Method ? fn : "set" + uppercase(fn);
- String gn = member instanceof Method ? "g" + sn.substring(1) : "get" + uppercase(fn);
- Class<?> root = list ? type.getActualTypeArgument(0).getRawClass() : type.getRawClass();
- if (elementRefs.contains(root)) {
- expressionHandlersDefs.put(lowercase(sn.substring(3)),
- " " + root.getSimpleName() + " v = doParse" + root.getSimpleName() + "Ref(key);\n" + " if (v != null) { \n" + " "
- + (list ? "doAdd(v, def." + gn + "(), def::" + sn + ");" : "def." + sn + "(v);") + "\n"
- + " return true;\n" + " }\n");
- } else {
- model.stream().filter(root::isAssignableFrom).filter(cl -> cl.getAnnotation(XmlRootElement.class) != null).forEach(cl -> {
- String en = cl.getAnnotation(XmlRootElement.class).name();
- if ("##default".equals(en)) {
- en = lowercase(cl.getSimpleName());
- }
- String tn = cl.getSimpleName();
- cases.put(en, list ? "doAdd(doParse" + tn + "(), def." + gn + "(), def::" + sn + ");" : "def." + sn + "(doParse" + tn + "());");
- });
- }
- });
+ elementMembers.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlElementRef.class) != null
+ || (clazz == outputDefinitionClass && "setOutputs".equals(member.getName())))
+ .forEach(member -> {
+ Type pt = member instanceof Method
+ ? ((Method) member).getGenericParameterTypes()[0] : ((Field) member).getGenericType();
+ GenericType type = new GenericType(pt);
+ boolean list = type.getRawClass() == List.class;
+ String fn = member.getName();
+ String sn = member instanceof Method ? fn : "set" + uppercase(fn);
+ String gn = member instanceof Method ? "g" + sn.substring(1) : "get" + uppercase(fn);
+ Class<?> root = list ? type.getActualTypeArgument(0).getRawClass() : type.getRawClass();
+ if (elementRefs.contains(root)) {
+ expressionHandlersDefs.put(lowercase(sn.substring(3)),
+ " " + root.getSimpleName() + " v = doParse" + root.getSimpleName() + "Ref(key);\n"
+ + " if (v != null) { \n" + " "
+ + (list
+ ? "doAdd(v, def." + gn + "(), def::"
+ + sn + ");"
+ : "def." + sn + "(v);")
+ + "\n"
+ + " return true;\n" + " }\n");
+ } else {
+ model.stream().filter(root::isAssignableFrom)
+ .filter(cl -> cl.getAnnotation(XmlRootElement.class) != null).forEach(cl -> {
+ String en = cl.getAnnotation(XmlRootElement.class).name();
+ if ("##default".equals(en)) {
+ en = lowercase(cl.getSimpleName());
+ }
+ String tn = cl.getSimpleName();
+ cases.put(en,
+ list
+ ? "doAdd(doParse" + tn + "(), def." + gn + "(), def::" + sn + ");"
+ : "def." + sn + "(doParse" + tn + "());");
+ });
+ }
+ });
// @XmlElements
- elementMembers.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlElements.class) != null).forEach(member -> {
- Type pt = member instanceof Method ? ((Method)member).getGenericParameterTypes()[0] : ((Field)member).getGenericType();
- GenericType type = new GenericType(pt);
- boolean list = type.getRawClass() == List.class;
- String fn = member.getName();
- String sn = member instanceof Method ? fn : "set" + uppercase(fn);
- String gn = member instanceof Method ? "g" + sn.substring(1) : "get" + uppercase(fn);
- Class<?> root = list ? type.getActualTypeArgument(0).getRawClass() : type.getRawClass();
- if (elementRefs.contains(root)) {
- expressionHandlersDefs.put(lowercase(sn.substring(3)),
- " " + root.getSimpleName() + " v = doParse" + root.getSimpleName() + "Ref(key);\n" + " if (v != null) { \n" + " "
- + (list ? "doAdd(v, def." + gn + "(), def::" + sn + ");" : "def." + sn + "(v);") + "\n"
- + " return true;\n" + " }\n");
- } else {
- Stream.of(((AccessibleObject)member).getAnnotation(XmlElements.class).value()).forEach(xe -> {
- String en = xe.name();
- String tn = xe.type().getSimpleName();
- cases.put(en, list ? "doAdd(doParse" + tn + "(), def." + gn + "(), def::" + sn + ");" : "def." + sn + "(doParse" + tn + "());");
+ elementMembers.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlElements.class) != null)
+ .forEach(member -> {
+ Type pt = member instanceof Method
+ ? ((Method) member).getGenericParameterTypes()[0] : ((Field) member).getGenericType();
+ GenericType type = new GenericType(pt);
+ boolean list = type.getRawClass() == List.class;
+ String fn = member.getName();
+ String sn = member instanceof Method ? fn : "set" + uppercase(fn);
+ String gn = member instanceof Method ? "g" + sn.substring(1) : "get" + uppercase(fn);
+ Class<?> root = list ? type.getActualTypeArgument(0).getRawClass() : type.getRawClass();
+ if (elementRefs.contains(root)) {
+ expressionHandlersDefs.put(lowercase(sn.substring(3)),
+ " " + root.getSimpleName() + " v = doParse" + root.getSimpleName() + "Ref(key);\n"
+ + " if (v != null) { \n" + " "
+ + (list
+ ? "doAdd(v, def." + gn + "(), def::"
+ + sn + ");"
+ : "def." + sn + "(v);")
+ + "\n"
+ + " return true;\n" + " }\n");
+ } else {
+ Stream.of(((AccessibleObject) member).getAnnotation(XmlElements.class).value()).forEach(xe -> {
+ String en = xe.name();
+ String tn = xe.type().getSimpleName();
+ cases.put(en,
+ list
+ ? "doAdd(doParse" + tn + "(), def." + gn + "(), def::" + sn + ");"
+ : "def." + sn + "(doParse" + tn + "());");
+ });
+ }
});
- }
- });
elementMembers.stream().filter(member -> !multiElements.contains(member)).forEach(member -> {
- Type pt = member instanceof Method ? ((Method)member).getGenericParameterTypes()[0] : ((Field)member).getGenericType();
+ Type pt = member instanceof Method
+ ? ((Method) member).getGenericParameterTypes()[0] : ((Field) member).getGenericType();
GenericType type = new GenericType(pt);
boolean list;
Class<?> root;
@@ -385,12 +423,12 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
}
String fn = member.getName();
String en = "##default";
- if (((AccessibleObject)member).getAnnotation(XmlElement.class) != null) {
- en = ((AccessibleObject)member).getAnnotation(XmlElement.class).name();
+ if (((AccessibleObject) member).getAnnotation(XmlElement.class) != null) {
+ en = ((AccessibleObject) member).getAnnotation(XmlElement.class).name();
// special for value which can be wrapped
if ("value".equals(en)) {
- if (((AccessibleObject)member).getAnnotation(XmlElementWrapper.class) != null) {
- en = ((AccessibleObject)member).getAnnotation(XmlElementWrapper.class).name();
+ if (((AccessibleObject) member).getAnnotation(XmlElementWrapper.class) != null) {
+ en = ((AccessibleObject) member).getAnnotation(XmlElementWrapper.class).name();
}
}
}
@@ -401,23 +439,28 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
String gn = member instanceof Method ? "g" + sn.substring(1) : "get" + uppercase(fn);
String tn = root.getSimpleName();
String pc;
- if (((AccessibleObject)member).getAnnotation(XmlJavaTypeAdapter.class) != null) {
- Class<? extends XmlAdapter> adapter = ((AccessibleObject)member).getAnnotation(XmlJavaTypeAdapter.class).value();
+ if (((AccessibleObject) member).getAnnotation(XmlJavaTypeAdapter.class) != null) {
+ Class<? extends XmlAdapter> adapter
+ = ((AccessibleObject) member).getAnnotation(XmlJavaTypeAdapter.class).value();
Class<?> cl = adapter;
while (cl.getSuperclass() != XmlAdapter.class) {
cl = cl.getSuperclass();
}
- Type t = ((ParameterizedType)cl.getGenericSuperclass()).getActualTypeArguments()[0];
+ Type t = ((ParameterizedType) cl.getGenericSuperclass()).getActualTypeArguments()[0];
Class<?> c = new GenericType(t).getRawClass();
- String n = adapter.getDeclaringClass() != null ? adapter.getDeclaringClass().getSimpleName() + "." + adapter.getSimpleName() : adapter.getSimpleName();
+ String n = adapter.getDeclaringClass() != null
+ ? adapter.getDeclaringClass().getSimpleName() + "." + adapter.getSimpleName()
+ : adapter.getSimpleName();
if (c == String.class) {
pc = "new " + n + "().unmarshal(doParseText())";
} else if (model.contains(c)) {
pc = "new " + n + "().unmarshal(doParse" + c.getSimpleName() + "())";
} else {
- throw new UnsupportedOperationException("Class " + clazz.getName() + " / member " + member + ": unsupported @XmlJavaTypeAdapter");
+ throw new UnsupportedOperationException(
+ "Class " + clazz.getName() + " / member " + member + ": unsupported @XmlJavaTypeAdapter");
}
- if (list && type.equals(new GenericType(((ParameterizedType)cl.getGenericSuperclass()).getActualTypeArguments()[1]))) {
+ if (list && type.equals(
+ new GenericType(((ParameterizedType) cl.getGenericSuperclass()).getActualTypeArguments()[1]))) {
list = false;
}
} else if (model.contains(root)) {
@@ -442,17 +485,19 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
// special for allowableValues
if ("allowableValues".equals(en)) {
- cases.put(en, list ? "doAddValues(" + pc + ", def." + gn + "(), def::" + sn + ");" : "def." + sn + "(" + pc + ");");
+ cases.put(en, list
+ ? "doAddValues(" + pc + ", def." + gn + "(), def::" + sn + ");" : "def." + sn + "(" + pc + ");");
} else {
- cases.put(en, list ? "doAdd(" + pc + ", def." + gn + "(), def::" + sn + ");" : "def." + sn + "(" + pc + ");");
+ cases.put(en,
+ list ? "doAdd(" + pc + ", def." + gn + "(), def::" + sn + ");" : "def." + sn + "(" + pc + ");");
}
});
String expressionHandler = null;
for (Class<?> parent = clazz.getSuperclass(); parent != Object.class; parent = parent.getSuperclass()) {
if (getMembers(parent).stream()
- .anyMatch(member -> ((AccessibleObject)member).getAnnotation(XmlAttribute.class) == null
- && ((AccessibleObject)member).getAnnotation(XmlAnyAttribute.class) == null
- && ((AccessibleObject)member).getAnnotation(XmlValue.class) == null)) {
+ .anyMatch(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) == null
+ && ((AccessibleObject) member).getAnnotation(XmlAnyAttribute.class) == null
+ && ((AccessibleObject) member).getAnnotation(XmlValue.class) == null)) {
expressionHandler = lowercase(parent.getSimpleName()) + "ElementHandler()";
break;
}
@@ -473,7 +518,8 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
} else {
sb.append(" else if (\"" + nn[1] + "\".equals(parser.getNamespace())) {\n");
}
- sb.append(" Element el = doParseDOMElement(\"" + nn[0] + "\", \"" + nn[1] + "\", def." + gn + "());\n");
+ sb.append(" Element el = doParseDOMElement(\"" + nn[0] + "\", \"" + nn[1] + "\", def." + gn
+ + "());\n");
sb.append(" if (el != null) {\n");
sb.append(" doAddElement(el, def." + gn + "(), def::" + sn + ");\n");
sb.append(" return true;\n");
@@ -492,17 +538,21 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
+ (expressionHandler == null ? "false" : expressionHandler + ".accept(def, key)") + ";\n" + "}";
}
} else {
- String returnClause = (expressionHandlersDefs.isEmpty() ? "" : expressionHandlersDefs.values().iterator().next() + " ")
- + (expressionHandler == null ? "return false;" : "return " + expressionHandler + ".accept(def, key);");
+ String returnClause
+ = (expressionHandlersDefs.isEmpty() ? "" : expressionHandlersDefs.values().iterator().next() + " ")
+ + (expressionHandler == null
+ ? "return false;" : "return " + expressionHandler + ".accept(def, key);");
if (cases.size() == 1) {
Map.Entry<String, String> entry = cases.entrySet().iterator().next();
- elements = " (def, key) -> {\n" + externalElements + " if (\"" + entry.getKey() + "\".equals(key)) {\n" + " " + entry.getValue() + "\n" + " return true;\n"
+ elements = " (def, key) -> {\n" + externalElements + " if (\"" + entry.getKey() + "\".equals(key)) {\n"
+ + " " + entry.getValue() + "\n" + " return true;\n"
+ " }\n" + " " + returnClause + "\n" + "}";
} else {
StringBuilder sb = new StringBuilder();
sb.append(" (def, key) -> {\n" + externalElements + " switch (key) {\n");
for (Map.Entry<String, String> entry : cases.entrySet()) {
- sb.append(" case \"").append(entry.getKey()).append("\": ").append(entry.getValue()).append(" break;\n");
+ sb.append(" case \"").append(entry.getKey()).append("\": ").append(entry.getValue())
+ .append(" break;\n");
}
sb.append(" default: ");
if (expressionHandlersDefs.isEmpty()) {
@@ -517,22 +567,24 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
}
// @XmlValue
- String value = members.stream().filter(member -> ((AccessibleObject)member).getAnnotation(XmlValue.class) != null).findFirst().map(member -> {
- String fn = member.getName();
- String sn = member instanceof Method ? fn : "set" + uppercase(fn);
- if (expressionDefinitionClass.isAssignableFrom(member.getDeclaringClass())) {
- return " expressionDefinitionValueHandler()";
- } else {
- return " (def, val) -> def." + sn + "(val)";
- }
- }).orElseGet(() -> {
- for (Class<?> parent = clazz.getSuperclass(); parent != Object.class; parent = parent.getSuperclass()) {
- if (getMembers(parent).stream().anyMatch(member -> ((AccessibleObject)member).getAnnotation(XmlValue.class) != null)) {
- return " " + lowercase(parent.getSimpleName()) + "ValueHandler()";
- }
- }
- return " noValueHandler()";
- });
+ String value = members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlValue.class) != null)
+ .findFirst().map(member -> {
+ String fn = member.getName();
+ String sn = member instanceof Method ? fn : "set" + uppercase(fn);
+ if (expressionDefinitionClass.isAssignableFrom(member.getDeclaringClass())) {
+ return " expressionDefinitionValueHandler()";
+ } else {
+ return " (def, val) -> def." + sn + "(val)";
+ }
+ }).orElseGet(() -> {
+ for (Class<?> parent = clazz.getSuperclass(); parent != Object.class; parent = parent.getSuperclass()) {
+ if (getMembers(parent).stream()
+ .anyMatch(member -> ((AccessibleObject) member).getAnnotation(XmlValue.class) != null)) {
+ return " " + lowercase(parent.getSimpleName()) + "ValueHandler()";
+ }
+ }
+ return " noValueHandler()";
+ });
if (clazz == beansDefinitionClass || clazz == applicationDefinitionClass) {
// for beans/camel we want public methods to be invoked by camel-xml-io-dsl
@@ -549,7 +601,9 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
"return Optional.empty();");
}
- if (clazz == routesDefinitionClass || clazz == routeTemplatesDefinitionClass || clazz == templatedRoutesDefinitionClass || clazz == restsDefinitionClass || clazz == routeConfigurationsDefinitionClass) {
+ if (clazz == routesDefinitionClass || clazz == routeTemplatesDefinitionClass
+ || clazz == templatedRoutesDefinitionClass || clazz == restsDefinitionClass
+ || clazz == routeConfigurationsDefinitionClass) {
// for routes/rests/routeTemplates we want to support single-mode as well, this means
// we check that the tag name is either plural or singular and parse accordingly
@@ -560,18 +614,18 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
String singleName = name.replace("sDefinition", "Definition");
parser.addMethod().setPublic()
- .setReturnType(new GenericType(Optional.class, new GenericType(clazz)))
- .setName("parse" + name)
- .addThrows(IOException.class)
- .addThrows(XML_PULL_PARSER_EXCEPTION)
- .setBody(String.format("String tag = getNextTag(\"%s\", \"%s\");", element, singleElement),
- "if (tag != null) {",
- " switch (tag) {",
- String.format(" case \"%s\" : return Optional.of(doParse%s());", element, name),
- String.format(" case \"%s\" : return parseSingle%s();", singleElement, name),
- " }",
- "}",
- "return Optional.empty();");
+ .setReturnType(new GenericType(Optional.class, new GenericType(clazz)))
+ .setName("parse" + name)
+ .addThrows(IOException.class)
+ .addThrows(XML_PULL_PARSER_EXCEPTION)
+ .setBody(String.format("String tag = getNextTag(\"%s\", \"%s\");", element, singleElement),
+ "if (tag != null) {",
+ " switch (tag) {",
+ String.format(" case \"%s\" : return Optional.of(doParse%s());", element, name),
+ String.format(" case \"%s\" : return parseSingle%s();", singleElement, name),
+ " }",
+ "}",
+ "return Optional.empty();");
parser.addMethod().setPrivate()
.setReturnType(new GenericType(Optional.class, new GenericType(clazz)))
@@ -591,46 +645,68 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
if (hasDerived) {
if (!attributeMembers.isEmpty()) {
- parser.addMethod().setSignature("protected <T extends " + qname + "> AttributeHandler<T> " + lowercase(name) + "AttributeHandler()")
- .setBody("return" + attributes + ";");
+ parser.addMethod()
+ .setSignature("protected <T extends " + qname + "> AttributeHandler<T> " + lowercase(name)
+ + "AttributeHandler()")
+ .setBody("return" + attributes + ";");
}
if (!elementMembers.isEmpty()) {
- parser.addMethod().setSignature("protected <T extends " + qname + "> ElementHandler<T> " + lowercase(name) + "ElementHandler()")
- .setBody("return" + elements + ";");
+ parser.addMethod()
+ .setSignature("protected <T extends " + qname + "> ElementHandler<T> " + lowercase(name)
+ + "ElementHandler()")
+ .setBody("return" + elements + ";");
}
if (!Modifier.isAbstract(clazz.getModifiers())) {
if (externalNamespaces.isEmpty()) {
- parser.addMethod().setSignature("protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
- .setBody("return doParse(new " + qname + "(), " + (attributeMembers.isEmpty() ? attributes : lowercase(name) + "AttributeHandler()") + ", "
- + (elementMembers.isEmpty() ? elements : lowercase(name) + "ElementHandler()") + "," + value + ");\n");
+ parser.addMethod()
+ .setSignature("protected " + qname + " doParse" + name
+ + "() throws IOException, XmlPullParserException")
+ .setBody("return doParse(new " + qname + "(), "
+ + (attributeMembers.isEmpty() ? attributes : lowercase(name) + "AttributeHandler()")
+ + ", "
+ + (elementMembers.isEmpty() ? elements : lowercase(name) + "ElementHandler()") + ","
+ + value + ");\n");
} else {
- parser.addMethod().setSignature("protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
- .setBody("return doParse(new " + qname + "(), " + (attributeMembers.isEmpty() ? attributes : lowercase(name) + "AttributeHandler()") + ", "
- + (elementMembers.isEmpty() ? elements : lowercase(name) + "ElementHandler()") + "," + value + ", true);\n");
+ parser.addMethod()
+ .setSignature("protected " + qname + " doParse" + name
+ + "() throws IOException, XmlPullParserException")
+ .setBody("return doParse(new " + qname + "(), "
+ + (attributeMembers.isEmpty() ? attributes : lowercase(name) + "AttributeHandler()")
+ + ", "
+ + (elementMembers.isEmpty() ? elements : lowercase(name) + "ElementHandler()") + ","
+ + value + ", true);\n");
}
}
} else {
// special for value definition
if ("ValueDefinition".equals(name)) {
- parser.addMethod().setSignature("protected List<" + qname + "> doParse" + name + "() throws IOException, XmlPullParserException")
+ parser.addMethod()
+ .setSignature("protected List<" + qname + "> doParse" + name
+ + "() throws IOException, XmlPullParserException")
.setBody("return doParseValue(() -> new " + qname + "()" + "," + value + ");\n");
} else {
- parser.addMethod().setSignature("protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
- .setBody("return doParse(new " + qname + "()," + attributes + "," + elements + "," + value + ");\n");
+ parser.addMethod()
+ .setSignature(
+ "protected " + qname + " doParse" + name + "() throws IOException, XmlPullParserException")
+ .setBody(
+ "return doParse(new " + qname + "()," + attributes + "," + elements + "," + value + ");\n");
}
}
}
for (Class<?> root : elementRefs) {
- parser.addMethod().setSignature("protected " + root.getSimpleName() + " doParse" + root.getSimpleName() + "Ref(String key) throws IOException, XmlPullParserException")
- .setBody("switch (key) {\n" + model.stream().filter(root::isAssignableFrom).filter(cl -> cl.getAnnotation(XmlRootElement.class) != null).map(cl -> {
- String en = cl.getAnnotation(XmlRootElement.class).name();
- if ("##default".equals(en)) {
- en = lowercase(cl.getSimpleName());
- }
- String tn = cl.getSimpleName();
- return " case \"" + en + "\": return doParse" + tn + "();\n";
- }).collect(Collectors.joining()) + " default: return null;\n" + "}");
+ parser.addMethod()
+ .setSignature("protected " + root.getSimpleName() + " doParse" + root.getSimpleName()
+ + "Ref(String key) throws IOException, XmlPullParserException")
+ .setBody("switch (key) {\n" + model.stream().filter(root::isAssignableFrom)
+ .filter(cl -> cl.getAnnotation(XmlRootElement.class) != null).map(cl -> {
+ String en = cl.getAnnotation(XmlRootElement.class).name();
+ if ("##default".equals(en)) {
+ en = lowercase(cl.getSimpleName());
+ }
+ String tn = cl.getSimpleName();
+ return " case \"" + en + "\": return doParse" + tn + "();\n";
+ }).collect(Collectors.joining()) + " default: return null;\n" + "}");
}
return parser;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index efced93f41c..4f0141cd8b5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -448,8 +448,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
Set<Path> missingFirstVersions = new TreeSet<>();
// find all json files in components and camel-core
- componentFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("component.properties")).collect(Collectors.toCollection(TreeSet::new));
- jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof ComponentModel).collect(Collectors.toCollection(TreeSet::new));
+ componentFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("component.properties"))
+ .collect(Collectors.toCollection(TreeSet::new));
+ jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof ComponentModel)
+ .collect(Collectors.toCollection(TreeSet::new));
componentFiles.stream().filter(p -> p.endsWith("component.properties")).forEach(p -> {
Path parent = getModule(p);
List<Path> jsons = jsonFiles.stream().filter(f -> f.startsWith(parent)).collect(Collectors.toList());
@@ -495,14 +497,17 @@ public class PrepareCatalogMojo extends AbstractMojo {
// check all the component options and grab the label(s) they
// use
- model.getComponentOptions().stream().map(BaseOptionModel::getLabel).filter(l -> !Strings.isNullOrEmpty(l)).flatMap(l -> Stream.of(label.split(",")))
+ model.getComponentOptions().stream().map(BaseOptionModel::getLabel).filter(l -> !Strings.isNullOrEmpty(l))
+ .flatMap(l -> Stream.of(label.split(",")))
.forEach(usedOptionLabels::add);
// check all the endpoint options and grab the label(s) they use
- model.getEndpointOptions().stream().map(BaseOptionModel::getLabel).filter(l -> !Strings.isNullOrEmpty(l)).flatMap(l -> Stream.of(label.split(",")))
+ model.getEndpointOptions().stream().map(BaseOptionModel::getLabel).filter(l -> !Strings.isNullOrEmpty(l))
+ .flatMap(l -> Stream.of(label.split(",")))
.forEach(usedOptionLabels::add);
- long unused = model.getEndpointOptions().stream().map(BaseOptionModel::getLabel).filter(Strings::isNullOrEmpty).count();
+ long unused = model.getEndpointOptions().stream().map(BaseOptionModel::getLabel).filter(Strings::isNullOrEmpty)
+ .count();
if (unused >= UNUSED_LABELS_WARN) {
unlabeledOptions.add(name);
}
@@ -527,10 +532,12 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
Path all = componentsOutDir.resolve("../components.properties");
- Set<String> componentNames = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
+ Set<String> componentNames
+ = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
FileUtil.updateFile(all, String.join("\n", componentNames) + "\n");
- printComponentsReport(jsonFiles, duplicateJsonFiles, missingComponents, usedComponentLabels, usedOptionLabels, unlabeledOptions, missingFirstVersions);
+ printComponentsReport(jsonFiles, duplicateJsonFiles, missingComponents, usedComponentLabels, usedOptionLabels,
+ unlabeledOptions, missingFirstVersions);
// filter out duplicate component names that are alternative scheme
// names
@@ -551,8 +558,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
Set<Path> missingFirstVersions = new TreeSet<>();
// find all data formats from the components directory
- dataFormatFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("dataformat.properties")).collect(Collectors.toCollection(TreeSet::new));
- jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof DataFormatModel).collect(Collectors.toCollection(TreeSet::new));
+ dataFormatFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("dataformat.properties"))
+ .collect(Collectors.toCollection(TreeSet::new));
+ jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof DataFormatModel)
+ .collect(Collectors.toCollection(TreeSet::new));
getLog().info("Found " + dataFormatFiles.size() + " dataformat.properties files");
getLog().info("Found " + jsonFiles.size() + " dataformat json files");
@@ -588,7 +597,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
Path all = dataFormatsOutDir.resolve("../dataformats.properties");
- Set<String> dataFormatNames = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
+ Set<String> dataFormatNames
+ = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
FileUtil.updateFile(all, String.join("\n", dataFormatNames) + "\n");
printDataFormatsReport(jsonFiles, duplicateJsonFiles, usedLabels, missingFirstVersions);
@@ -609,8 +619,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
Set<Path> missingFirstVersions = new TreeSet<>();
// find all languages from the components directory
- languageFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("language.properties")).collect(Collectors.toCollection(TreeSet::new));
- jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof LanguageModel).collect(Collectors.toCollection(TreeSet::new));
+ languageFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("language.properties"))
+ .collect(Collectors.toCollection(TreeSet::new));
+ jsonFiles = allJsonFiles.stream().filter(p -> allModels.get(p) instanceof LanguageModel)
+ .collect(Collectors.toCollection(TreeSet::new));
getLog().info("Found " + languageFiles.size() + " language.properties files");
getLog().info("Found " + jsonFiles.size() + " language json files");
@@ -646,7 +658,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
Path all = languagesOutDir.resolve("../languages.properties");
- Set<String> languagesNames = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
+ Set<String> languagesNames
+ = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
FileUtil.updateFile(all, String.join("\n", languagesNames) + "\n");
printLanguagesReport(jsonFiles, duplicateJsonFiles, usedLabels, missingFirstVersions);
@@ -666,7 +679,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
Map<String, Set<String>> usedLabels = new TreeMap<>();
Set<Path> missingFirstVersions = new TreeSet<>();
- otherFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("other.properties")).collect(Collectors.toCollection(TreeSet::new));
+ otherFiles = allPropertiesFiles.stream().filter(p -> p.endsWith("other.properties"))
+ .collect(Collectors.toCollection(TreeSet::new));
jsonFiles = allJsonFiles.stream().filter(p -> {
Path m = getModule(p);
switch (m.getFileName().toString()) {
@@ -762,7 +776,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
Path all = othersOutDir.resolve("../others.properties");
- Set<String> otherNames = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
+ Set<String> otherNames
+ = jsonFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
FileUtil.updateFile(all, String.join("\n", otherNames) + "\n");
printOthersReport(jsonFiles, duplicateJsonFiles, usedLabels, missingFirstVersions);
@@ -785,7 +800,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
copyFile(mainDir.toPath().resolve("camel-main-configuration-metadata.json"), mainOutDir.toPath());
}
- protected void executeDocuments(Set<String> components, Set<String> dataformats, Set<String> languages, Set<String> others) {
+ protected void executeDocuments(
+ Set<String> components, Set<String> dataformats, Set<String> languages, Set<String> others) {
// lets use sorted set/maps
Set<Path> adocFiles = new TreeSet<>();
Set<Path> missingAdocFiles = new TreeSet<>();
@@ -807,7 +823,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
if (l.isEmpty()) {
String n = dir.getFileName().toString();
boolean isDir = dir.toFile().isDirectory();
- boolean valid = isDir && !n.startsWith(".") && !n.endsWith("-base") && !n.endsWith("-common") && !n.equals("src");
+ boolean valid = isDir && !n.startsWith(".") && !n.endsWith("-base") && !n.endsWith("-common")
+ && !n.equals("src");
if (valid) {
// the dir must be active (inactive can be removed component from old branch)
String[] poms = dir.toFile().list((dir1, name) -> "pom.xml".equals(name));
@@ -827,7 +844,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
// Check duplicates
duplicateAdocFiles = getDuplicates(adocFiles);
- Set<String> docNames = adocFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
+ Set<String> docNames
+ = adocFiles.stream().map(PrepareCatalogMojo::asComponentName).collect(Collectors.toCollection(TreeSet::new));
printDocumentsReport(adocFiles, duplicateAdocFiles, missingAdocFiles);
// find out if we have documents for each component / dataformat /
@@ -835,7 +853,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
printMissingDocumentsReport(docNames, components, dataformats, languages, others);
}
- private void printMissingDocumentsReport(Set<String> docs, Set<String> components, Set<String> dataformats, Set<String> languages, Set<String> others) {
+ private void printMissingDocumentsReport(
+ Set<String> docs, Set<String> components, Set<String> dataformats, Set<String> languages, Set<String> others) {
getLog().info("");
getLog().info("Camel missing documents report");
getLog().info("");
@@ -859,7 +878,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
break;
}
String name = component + "-component";
- if (!docs.contains(name) && (!component.equalsIgnoreCase("salesforce") && !component.equalsIgnoreCase("servicenow"))) {
+ if (!docs.contains(name)
+ && (!component.equalsIgnoreCase("salesforce") && !component.equalsIgnoreCase("servicenow"))) {
missing.add(name);
}
}
@@ -923,7 +943,9 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
}
- private void printModelsReport(Set<Path> json, Set<Path> duplicate, Set<Path> missingLabels, Map<String, Set<String>> usedLabels, Set<Path> missingJavaDoc) {
+ private void printModelsReport(
+ Set<Path> json, Set<Path> duplicate, Set<Path> missingLabels, Map<String, Set<String>> usedLabels,
+ Set<Path> missingJavaDoc) {
getLog().info("================================================================================");
getLog().info("");
@@ -980,8 +1002,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
}
- private void printComponentsReport(Set<Path> json, Set<Path> duplicate, Set<Path> missing, Map<String, Set<String>> usedComponentLabels, Set<String> usedOptionsLabels,
- Set<String> unusedLabels, Set<Path> missingFirstVersions) {
+ private void printComponentsReport(
+ Set<Path> json, Set<Path> duplicate, Set<Path> missing, Map<String, Set<String>> usedComponentLabels,
+ Set<String> usedOptionsLabels,
+ Set<String> unusedLabels, Set<Path> missingFirstVersions) {
getLog().info("================================================================================");
getLog().info("");
getLog().info("Camel component catalog report");
@@ -1039,7 +1063,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
}
- private void printDataFormatsReport(Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
+ private void printDataFormatsReport(
+ Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
getLog().info("================================================================================");
getLog().info("");
getLog().info("Camel data format catalog report");
@@ -1061,7 +1086,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
getLog().info("================================================================================");
}
- private void printLanguagesReport(Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
+ private void printLanguagesReport(
+ Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
getLog().info("================================================================================");
getLog().info("");
getLog().info("Camel language catalog report");
@@ -1083,7 +1109,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
getLog().info("================================================================================");
}
- private void printOthersReport(Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
+ private void printOthersReport(
+ Set<Path> json, Set<Path> duplicate, Map<String, Set<String>> usedLabels, Set<Path> missingFirstVersions) {
getLog().info("================================================================================");
getLog().info("");
getLog().info("Camel other catalog report");
@@ -1145,7 +1172,6 @@ public class PrepareCatalogMojo extends AbstractMojo {
return Stream.concat(l1.stream(), l2.stream()).collect(Collectors.toList());
}
-
private Stream<Path> list(Path dir) {
try {
if (Files.isDirectory(dir)) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
index 5e7c43fe269..badcac4d908 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
@@ -25,24 +25,22 @@ import java.lang.reflect.TypeVariable;
import java.util.Arrays;
public class OwbTypeVariableImpl {
- private static final Class<?>[] TYPE_VARIABLE_TYPES = new Class<?>[] {TypeVariable.class};
+ private static final Class<?>[] TYPE_VARIABLE_TYPES = new Class<?>[] { TypeVariable.class };
/**
- * Java TypeVariable is different in various JDK versions. Thus it is not
- * possible to e.g. write a custom TypeVariable which works in either Java7
- * and Java8 as they introduced new methods in Java8 which have return
- * generics which only exist in Java8 :( As workaround we dynamically crate
- * a proxy to wrap this and do the delegation manually. This is of course
- * slower, but as we do not use it often it might not have much impact.
+ * Java TypeVariable is different in various JDK versions. Thus it is not possible to e.g. write a custom
+ * TypeVariable which works in either Java7 and Java8 as they introduced new methods in Java8 which have return
+ * generics which only exist in Java8 :( As workaround we dynamically crate a proxy to wrap this and do the
+ * delegation manually. This is of course slower, but as we do not use it often it might not have much impact.
*
- * @param typeVariable
- * @param bounds
- * @return the typeVariable with the defined bounds.
+ * @param typeVariable
+ * @param bounds
+ * @return the typeVariable with the defined bounds.
*/
public static TypeVariable createTypeVariable(TypeVariable typeVariable, Type... bounds) {
- return (TypeVariable)Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES,
- new OwbTypeVariableInvocationHandler(typeVariable, bounds));
+ return (TypeVariable) Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES,
+ new OwbTypeVariableInvocationHandler(typeVariable, bounds));
}
public static class OwbTypeVariableInvocationHandler implements InvocationHandler {
@@ -108,8 +106,9 @@ public class OwbTypeVariableImpl {
if (this == object) {
return true;
} else if (object instanceof TypeVariable) {
- TypeVariable<?> that = (TypeVariable<?>)object;
- return name.equals(that.getName()) && genericDeclaration.equals(that.getGenericDeclaration()) && Arrays.equals(bounds, that.getBounds());
+ TypeVariable<?> that = (TypeVariable<?>) object;
+ return name.equals(that.getName()) && genericDeclaration.equals(that.getGenericDeclaration())
+ && Arrays.equals(bounds, that.getBounds());
} else {
return false;
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
index c0dfa8fdb87..d356667934b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
@@ -23,83 +23,93 @@ import org.junit.jupiter.api.Test;
public class JavadocTest {
- public static final String SOURCE_CLASS_1 =
- " /**\n" +
- " * Path to the template.\n" +
- " * <p/>\n" +
- " * The following is supported by the default URIResolver.\n" +
- " * You can prefix with: classpath, file, http, ref, or bean.\n" +
- " * classpath, file and http loads the resource using these protocols (classpath is default).\n" +
- " * ref will lookup the resource in the registry.\n" +
- " * bean will call a method on a bean to be used as the resource.\n" +
- " * For bean you can specify the method name after dot, eg bean:myBean.myMethod\n" +
- " *\n" +
- " * @param resourceUri the resource path\n" +
- " */\n" +
- "class Test {\n" +
- "}";
- public static final String JAVADOC_1 =
- "Path to the template.\n<p/>\nThe following is supported by the default URIResolver.\n" +
- "You can prefix with: classpath, file, http, ref, or bean.\nclasspath, file and http " +
- "loads the resource using these protocols (classpath is default).\nref will lookup the " +
- "resource in the registry.\nbean will call a method on a bean to be used as the " +
- "resource.\nFor bean you can specify the method name after dot, eg bean:myBean.myMethod";
- public static final String SOURCE_CLASS_2 =
- " /**\n" +
- " * Sets how requests and responses will be mapped to/from Camel. Two values are possible:\n" +
- " * <ul>\n" +
- " * <li>SimpleConsumer: This binding style processes request parameters, multiparts, etc. and maps them to IN headers, IN attachments and to the message body.\n" +
- " * It aims to eliminate low-level processing of {@link org.apache.cxf.message.MessageContentsList}.\n" +
- " * It also also adds more flexibility and simplicity to the response mapping.\n" +
- " * Only available for consumers.\n" +
- " * </li>\n" +
- " * <li>Default: The default style. For consumers this passes on a MessageContentsList to the route, requiring low-level processing in the route.\n" +
- " * This is the traditional binding style, which simply dumps the {@link org.apache.cxf.message.MessageContentsList} coming in from the CXF stack\n" +
- " * onto the IN message body. The user is then responsible for processing it according to the contract defined by the JAX-RS method signature.\n" +
- " * </li>\n" +
- " * <li>Custom: allows you to specify a custom binding through the binding option.</li>\n" +
- " * </ul>\n" +
- " */\n" +
- "class Test {\n" +
- "}";
- public static final String JAVADOC_2 =
- "Sets how requests and responses will be mapped to/from Camel. Two values are possible:\n" +
- "<ul>\n<li>SimpleConsumer: This binding style processes request parameters, multiparts, etc. " +
- "and maps them to IN headers, IN attachments and to the message body.\nIt aims to eliminate " +
- "low-level processing of {@link org.apache.cxf.message.MessageContentsList}.\nIt also also adds more " +
- "flexibility and simplicity to the response mapping.\nOnly available for consumers.\n</li>\n" +
- "<li>Default: The default style. For consumers this passes on a MessageContentsList to the " +
- "route, requiring low-level processing in the route.\nThis is the traditional binding style, " +
- "which simply dumps the {@link org.apache.cxf.message.MessageContentsList} coming in from the CXF " +
- "stack\nonto the IN message body. The user is then responsible for processing it according " +
- "to the contract defined by the JAX-RS method signature.\n</li>\n<li>Custom: allows you to " +
- "specify a custom binding through the binding option.</li>\n</ul>";
- public static final String SOURCE_CLASS_3 =
- " /**\n" +
- " * Sets the alias used to query the KeyStore for keys and {@link java.security.cert.Certificate Certificates}\n" +
- " * to be used in signing and verifying exchanges. This value can be provided at runtime via the message header\n" +
- " * {@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS}\n" +
- " */\n" +
- "class Test {\n" +
- "}";
- public static final String JAVADOC_3 =
- "Sets the alias used to query the KeyStore for keys and " +
- "{@link java.security.cert.Certificate Certificates}\n" +
- "to be used in signing and verifying exchanges. This value can be provided at runtime " +
- "via the message header\n" +
- "{@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS}";
- public static final String SOURCE_CLASS_4 =
- "/**\n" +
- " * Messaging with AMQP protocol using Apache QPid Client.\n" +
- " *\n" +
- " * This class extends JmsEndpoint because it uses Apache Qpid JMS-compatible client for\n" +
- " * performing the AMQP connectivity.\n" +
- " */\n" +
- "class Test {\n" +
- "}";
- public static final String JAVADOC_4 =
- "Messaging with AMQP protocol using Apache QPid Client.\n\nThis class extends JmsEndpoint " +
- "because it uses Apache Qpid JMS-compatible client for\nperforming the AMQP connectivity.";
+ public static final String SOURCE_CLASS_1 = " /**\n" +
+ " * Path to the template.\n" +
+ " * <p/>\n" +
+ " * The following is supported by the default URIResolver.\n" +
+ " * You can prefix with: classpath, file, http, ref, or bean.\n" +
+ " * classpath, file and http loads the resource using these protocols (classpath is default).\n"
+ +
+ " * ref will lookup the resource in the registry.\n" +
+ " * bean will call a method on a bean to be used as the resource.\n" +
+ " * For bean you can specify the method name after dot, eg bean:myBean.myMethod\n"
+ +
+ " *\n" +
+ " * @param resourceUri the resource path\n" +
+ " */\n" +
+ "class Test {\n" +
+ "}";
+ public static final String JAVADOC_1
+ = "Path to the template.\n<p/>\nThe following is supported by the default URIResolver.\n" +
+ "You can prefix with: classpath, file, http, ref, or bean.\nclasspath, file and http " +
+ "loads the resource using these protocols (classpath is default).\nref will lookup the " +
+ "resource in the registry.\nbean will call a method on a bean to be used as the " +
+ "resource.\nFor bean you can specify the method name after dot, eg bean:myBean.myMethod";
+ public static final String SOURCE_CLASS_2 = " /**\n" +
+ " * Sets how requests and responses will be mapped to/from Camel. Two values are possible:\n"
+ +
+ " * <ul>\n" +
+ " * <li>SimpleConsumer: This binding style processes request parameters, multiparts, etc. and maps them to IN headers, IN attachments and to the message body.\n"
+ +
+ " * It aims to eliminate low-level processing of {@link org.apache.cxf.message.MessageContentsList}.\n"
+ +
+ " * It also also adds more flexibility and simplicity to the response mapping.\n"
+ +
+ " * Only available for consumers.\n" +
+ " * </li>\n" +
+ " * <li>Default: The default style. For consumers this passes on a MessageContentsList to the route, requiring low-level processing in the route.\n"
+ +
+ " * This is the traditional binding style, which simply dumps the {@link org.apache.cxf.message.MessageContentsList} coming in from the CXF stack\n"
+ +
+ " * onto the IN message body. The user is then responsible for processing it according to the contract defined by the JAX-RS method signature.\n"
+ +
+ " * </li>\n" +
+ " * <li>Custom: allows you to specify a custom binding through the binding option.</li>\n"
+ +
+ " * </ul>\n" +
+ " */\n" +
+ "class Test {\n" +
+ "}";
+ public static final String JAVADOC_2
+ = "Sets how requests and responses will be mapped to/from Camel. Two values are possible:\n" +
+ "<ul>\n<li>SimpleConsumer: This binding style processes request parameters, multiparts, etc. " +
+ "and maps them to IN headers, IN attachments and to the message body.\nIt aims to eliminate " +
+ "low-level processing of {@link org.apache.cxf.message.MessageContentsList}.\nIt also also adds more " +
+ "flexibility and simplicity to the response mapping.\nOnly available for consumers.\n</li>\n" +
+ "<li>Default: The default style. For consumers this passes on a MessageContentsList to the " +
+ "route, requiring low-level processing in the route.\nThis is the traditional binding style, " +
+ "which simply dumps the {@link org.apache.cxf.message.MessageContentsList} coming in from the CXF " +
+ "stack\nonto the IN message body. The user is then responsible for processing it according " +
+ "to the contract defined by the JAX-RS method signature.\n</li>\n<li>Custom: allows you to " +
+ "specify a custom binding through the binding option.</li>\n</ul>";
+ public static final String SOURCE_CLASS_3 = " /**\n" +
+ " * Sets the alias used to query the KeyStore for keys and {@link java.security.cert.Certificate Certificates}\n"
+ +
+ " * to be used in signing and verifying exchanges. This value can be provided at runtime via the message header\n"
+ +
+ " * {@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS}\n"
+ +
+ " */\n" +
+ "class Test {\n" +
+ "}";
+ public static final String JAVADOC_3 = "Sets the alias used to query the KeyStore for keys and " +
+ "{@link java.security.cert.Certificate Certificates}\n" +
+ "to be used in signing and verifying exchanges. This value can be provided at runtime "
+ +
+ "via the message header\n" +
+ "{@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS}";
+ public static final String SOURCE_CLASS_4 = "/**\n" +
+ " * Messaging with AMQP protocol using Apache QPid Client.\n" +
+ " *\n" +
+ " * This class extends JmsEndpoint because it uses Apache Qpid JMS-compatible client for\n"
+ +
+ " * performing the AMQP connectivity.\n" +
+ " */\n" +
+ "class Test {\n" +
+ "}";
+ public static final String JAVADOC_4
+ = "Messaging with AMQP protocol using Apache QPid Client.\n\nThis class extends JmsEndpoint " +
+ "because it uses Apache Qpid JMS-compatible client for\nperforming the AMQP connectivity.";
@Test
public void testJavadoc1() {
[camel] 16/18: CAMEL-19461 - make camel-dependencies work with mvn license:format, copy only version properties to camel-dependencies
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 16cfb52d4febae059fa2313e869e138e72f19114
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 13:32:42 2023 +0200
CAMEL-19461 - make camel-dependencies work with mvn license:format, copy
only version properties to camel-dependencies
---
camel-dependencies/pom.xml | 855 ++++++++++-----------
tooling/maven/sync-properties-maven-plugin/pom.xml | 5 +
.../maven/sync/properties/SyncPropertiesMojo.java | 158 +++-
.../main/resources/camel-dependencies-template.xml | 25 +-
4 files changed, 575 insertions(+), 468 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0659179bb92..874823dcc11 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -38,471 +38,462 @@
<!-- sync properties here from parent/pom.xml -->
<properties>
- <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
- <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
- <camel.surefire.forkCount>1</camel.surefire.forkCount>
- <camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
- <camel.surefire.reuseForks>true</camel.surefire.reuseForks>
- <camel.surefire.parallel>false</camel.surefire.parallel>
- <camel.surefire.parallel.factor>1</camel.surefire.parallel.factor>
- <camel.surefire.parallel.strategy>dynamic</camel.surefire.parallel.strategy>
- <camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
- <cxf.xjc.jvmArgs />
- <trimStackTrace>false</trimStackTrace>
- <sourcecheckExcludes></sourcecheckExcludes>
- <sourcecheckExcludesComma></sourcecheckExcludesComma>
-
- <!-- dependency versions -->
- <abdera-version>1.1.3</abdera-version>
- <activemq-version>5.18.1</activemq-version>
- <activemq-artemis-version>2.29.0</activemq-artemis-version>
- <angus-mail-version>2.0.2</angus-mail-version>
- <apacheds-version>2.0.0.AM26</apacheds-version>
- <apache-drill-version>1.21.1</apache-drill-version>
- <apicurio-version>1.1.27</apicurio-version>
- <arangodb-java-version>6.20.0</arangodb-java-version>
- <as2-lib-version>4.11.0</as2-lib-version>
- <ascii-table-version>1.8.0</ascii-table-version>
- <asm-version>8.0.1</asm-version>
- <asn1bean-version>1.13.0</asn1bean-version>
- <assertj-version>3.24.2</assertj-version>
+ <grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
+ <mustache-java-version>0.9.10</mustache-java-version>
+ <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
+ <geronimo-interceptor-1.2-spec-version>1.0</geronimo-interceptor-1.2-spec-version>
+ <jackson-jq-version>1.0.0-preview.20230409</jackson-jq-version>
+ <google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
+ <google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
<asterisk-java-version>3.37.0</asterisk-java-version>
- <atlasmap-version>2.5.2</atlasmap-version>
- <atlassian-fugue-version>3.0.0</atlassian-fugue-version>
- <atmosphere-version>3.0.3</atmosphere-version>
- <avro-version>1.11.1</avro-version>
+ <debezium-mysql-connector-version>8.0.32</debezium-mysql-connector-version>
+ <jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
+ <snmp4j-version>2.8.15</snmp4j-version>
+ <mapstruct-version>1.5.5.Final</mapstruct-version>
+ <hk2-version>2.6.1</hk2-version>
+ <slf4j-version>2.0.6</slf4j-version>
+ <vysper-version>0.7</vysper-version>
+ <httpclient4-version>4.5.14</httpclient4-version>
+ <commons-codec-version>1.15</commons-codec-version>
+ <log4j2-version>2.20.0</log4j2-version>
+ <squareup-okhttp-version>3.14.9</squareup-okhttp-version>
+ <caffeine-version>3.1.6</caffeine-version>
+ <commons-collections4-version>4.4</commons-collections4-version>
+ <jose4j-version>0.6.4</jose4j-version>
+ <json-unit-version>2.32.0</json-unit-version>
+ <velocity-tools-version>3.1</velocity-tools-version>
<avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
+ <hsqldb-version>2.7.1</hsqldb-version>
+ <smallrye-fault-tolerance-version>6.2.3</smallrye-fault-tolerance-version>
+ <jnats-version>2.16.12</jnats-version>
+ <sql-maven-plugin-version>1.5</sql-maven-plugin-version>
+ <mina-version>2.2.2</mina-version>
+ <jackson2-module-scala-version>2.15.1</jackson2-module-scala-version>
+ <cxf-version>4.0.2</cxf-version>
+ <commons-validator-version>1.7</commons-validator-version>
+ <hapi-version>2.3</hapi-version>
+ <maven-owasp-plugin-version>8.2.1</maven-owasp-plugin-version>
+ <geronimo-j2ee-jacc-spec-version>1.1</geronimo-j2ee-jacc-spec-version>
+ <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
+ <narayana-version>5.12.7.Final</narayana-version>
+ <commons-pool2-version>2.11.1</commons-pool2-version>
+ <atmosphere-version>3.0.3</atmosphere-version>
+ <djl-mxnet-native-version>1.8.0</djl-mxnet-native-version>
+ <shiro-version>1.11.0</shiro-version>
+ <minio-version>8.5.3</minio-version>
+ <swagger-openapi3-version>2.2.10</swagger-openapi3-version>
+ <olingo4-version>4.8.0</olingo4-version>
+ <jedis-client-version>4.4.2</jedis-client-version>
+ <jslt-version>0.1.14</jslt-version>
+ <protostream-version>4.6.2.Final</protostream-version>
+ <hibernate-validator-version>8.0.0.Final</hibernate-validator-version>
+ <maven-shared-utils-plugin-version>3.3.4</maven-shared-utils-plugin-version>
+ <quickfixj-version>2.3.1</quickfixj-version>
+ <microprofile-fault-tolerance-version>4.0.2</microprofile-fault-tolerance-version>
<avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
- <awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.20.91</aws-java-sdk2-version>
- <aws-xray-version>2.14.0</aws-xray-version>
- <axiom-version>1.2.14</axiom-version>
- <azure-sdk-bom-version>1.2.13</azure-sdk-bom-version>
- <azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
<bouncycastle-version>1.74</bouncycastle-version>
- <box-java-sdk-version>2.58.0</box-java-sdk-version>
- <braintree-gateway-version>3.24.0</braintree-gateway-version>
- <build-helper-maven-plugin-version>3.4.0</build-helper-maven-plugin-version>
- <c3p0-version>0.9.5.5</c3p0-version>
- <caffeine-version>3.1.6</caffeine-version>
- <californium-version>2.7.2</californium-version>
- <californium-scandium-version>2.7.4</californium-scandium-version>
- <cassandra-driver-version>4.15.0</cassandra-driver-version>
- <jta-api-1.2-version>1.2</jta-api-1.2-version>
- <cglib-version>3.2.12</cglib-version>
- <chunk-templates-version>3.6.2</chunk-templates-version>
- <classgraph-version>4.8.157</classgraph-version>
- <cometd-java-client-version>7.0.9</cometd-java-client-version>
- <cometd-java-server-version>7.0.9</cometd-java-server-version>
- <commons-beanutils-version>1.9.4</commons-beanutils-version>
- <commons-codec-version>1.15</commons-codec-version>
- <commons-collections-version>3.2.2</commons-collections-version>
- <commons-collections4-version>4.4</commons-collections4-version>
- <!-- Please check CAMEL-19229 before upgrading -->
- <commons-compress-version>1.21</commons-compress-version>
- <commons-configuration-version>1.9</commons-configuration-version>
- <commons-configuration2-version>2.8.0</commons-configuration2-version>
- <commons-csv-version>1.8</commons-csv-version>
- <commons-cli-version>1.4</commons-cli-version>
- <commons-dbcp-version>1.4</commons-dbcp-version>
+ <spring-version>6.0.10</spring-version>
+ <libthrift-version>0.18.1</libthrift-version>
+ <mongo-hadoop-version>1.5.0</mongo-hadoop-version>
+ <maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
+ <stompjms-version>1.19</stompjms-version>
+ <jcr-version>2.0</jcr-version>
+ <testcontainers-version>1.17.6</testcontainers-version>
+ <jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
+ <leveldb-version>0.12</leveldb-version>
+ <geronimo-j2ee-connector-spec-version>2.0.0</geronimo-j2ee-connector-spec-version>
+ <geronimo-interceptor-1.1-spec-version>1.0</geronimo-interceptor-1.1-spec-version>
+ <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
+ <nessus-hyperledger-aries-version>0.2.0</nessus-hyperledger-aries-version>
+ <okclient-version>3.14.9</okclient-version>
<commons-dbcp2-version>2.9.0</commons-dbcp2-version>
- <commons-exec-version>1.3</commons-exec-version>
- <commons-io-version>2.13.0</commons-io-version>
- <commons-lang-version>2.6</commons-lang-version>
- <commons-lang3-version>3.12.0</commons-lang3-version>
+ <xmlsec-version>2.2.3</xmlsec-version>
+ <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
+ <impsort-maven-plugin-version>1.9.0</impsort-maven-plugin-version>
+ <logback-version>1.4.8</logback-version>
+ <pgjdbc-ng-driver-version>0.8.9</pgjdbc-ng-driver-version>
<commons-logging-version>1.2</commons-logging-version>
- <commons-math3-version>3.6.1</commons-math3-version>
- <commons-net-version>3.9.0</commons-net-version>
- <commons-pool2-version>2.11.1</commons-pool2-version>
- <commons-text-version>1.10.0</commons-text-version>
- <commons-validator-version>1.7</commons-validator-version>
- <compress-lzf-version>1.1</compress-lzf-version>
- <consul-client-version>1.5.3</consul-client-version>
- <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
- <corda-version>4.10</corda-version>
- <couchbase-client-version>3.4.7</couchbase-client-version>
- <curator-version>5.4.0</curator-version>
- <cxf-version>4.0.2</cxf-version>
- <cxf-codegen-plugin-version>4.0.2</cxf-codegen-plugin-version>
- <!-- cxf-xjc is not released as often -->
- <cxf-xjc-plugin-version>4.0.0</cxf-xjc-plugin-version>
- <cxf-xjc-utils-version>4.0.0</cxf-xjc-utils-version>
- <datasonnet-mapper-version>2.5.2-jakarta4</datasonnet-mapper-version>
- <debezium-version>2.2.1.Final</debezium-version>
- <debezium-mysql-connector-version>8.0.32</debezium-mysql-connector-version>
- <depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
- <derby-version>10.14.2.0</derby-version>
- <digitalocean-api-client-version>2.17</digitalocean-api-client-version>
- <directory-watcher-version>0.18.0</directory-watcher-version>
- <disruptor-version>3.4.4</disruptor-version>
- <dnsjava-version>3.5.1</dnsjava-version>
- <djl-version>0.21.0</djl-version>
- <djl-mxnet-native-version>1.8.0</djl-mxnet-native-version>
- <djl-pytorch-native-version>1.9.1</djl-pytorch-native-version>
+ <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
+ <protobuf-version>3.19.6</protobuf-version>
+ <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
+ <javassist-version>3.28.0-GA</javassist-version>
+ <atlassian-fugue-version>3.0.0</atlassian-fugue-version>
+ <google-maps-services-version>2.2.0</google-maps-services-version>
+ <jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
+ <xchange-guava-version>32.0.0-jre</xchange-guava-version>
+ <kubernetes-model-version>6.7.2</kubernetes-model-version>
+ <jxmpp-version>0.6.4</jxmpp-version>
+ <azure-sdk-bom-version>1.2.13</azure-sdk-bom-version>
+ <irclib-version>1.10</irclib-version>
+ <azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
+ <jgroups-version>4.2.17.Final</jgroups-version>
+ <junit-jupiter-version>5.9.2</junit-jupiter-version>
+ <javacc-maven-plugin-version>3.0.1</javacc-maven-plugin-version>
+ <optaplanner-version>9.37.0.Final</optaplanner-version>
+ <java-grok-version>0.1.9</java-grok-version>
+ <netty-version>4.1.94.Final</netty-version>
+ <jcache-version>1.1.1</jcache-version>
+ <parquet-avro-version>1.12.3</parquet-avro-version>
+ <sshd-version>2.9.2</sshd-version>
+ <nessus-weka-version>1.0.1</nessus-weka-version>
<djl-tensorflow-native-version>2.4.1</djl-tensorflow-native-version>
- <docker-java-version>3.3.1</docker-java-version>
- <dropbox-version>5.4.5</dropbox-version>
- <eddsa-version>0.3.0</eddsa-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
- <ehcache3-version>3.10.8</ehcache3-version>
- <elasticsearch-java-client-version>8.8.1</elasticsearch-java-client-version>
- <elasticsearch-java-client-sniffer-version>8.8.1</elasticsearch-java-client-sniffer-version>
- <elytron-web>1.10.2.Final</elytron-web>
- <exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
+ <jetty-version>11.0.15</jetty-version>
+ <plc4x-version>0.10.0</plc4x-version>
<facebook4j-core-version>2.4.13</facebook4j-core-version>
- <fastjson-version>2.0.33</fastjson-version>
- <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
- <google-maps-services-version>2.2.0</google-maps-services-version>
- <flatpack-version>4.0.5</flatpack-version>
- <flink-version>1.17.1</flink-version>
- <fop-version>2.8</fop-version>
- <formatter-maven-plugin-version>2.21.0</formatter-maven-plugin-version>
- <ftpserver-version>1.1.2</ftpserver-version>
- <freemarker-version>2.3.32</freemarker-version>
- <geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
- <geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
- <geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
- <geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>
- <geronimo-interceptor-1.1-spec-version>1.0</geronimo-interceptor-1.1-spec-version>
- <geronimo-interceptor-1.2-spec-version>1.0</geronimo-interceptor-1.2-spec-version>
- <geronimo-j2ee-connector-spec-version>2.0.0</geronimo-j2ee-connector-spec-version>
- <geronimo-j2ee-jacc-spec-version>1.1</geronimo-j2ee-jacc-spec-version>
- <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
- <geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
- <geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
- <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
- <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
- <jakarta-json-api-version>2.1.1</jakarta-json-api-version>
- <jakarta-json-bind-api-version>3.0.0</jakarta-json-bind-api-version>
- <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
- <jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
- <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
- <google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
- <google-api-client-version>1.35.2</google-api-client-version>
- <google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
- <google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
+ <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
<google-api-services-sheets-version>v4-rev20210629-1.32.1</google-api-services-sheets-version>
- <google-api-services-mail-version>v1-rev20211108-1.32.1</google-api-services-mail-version>
- <google-oauth-client-version>1.34.0</google-oauth-client-version>
- <google-cloud-bom-version>26.1.6</google-cloud-bom-version>
+ <hazelcast-version>5.3.1</hazelcast-version>
+ <jakarta-json-bind-api-version>3.0.0</jakarta-json-bind-api-version>
+ <zendesk-client-version>0.19.0</zendesk-client-version>
+ <jolt-version>0.1.7</jolt-version>
+ <jython-version>2.7.3</jython-version>
+ <arangodb-java-version>6.20.0</arangodb-java-version>
+ <commons-collections-version>3.2.2</commons-collections-version>
+ <docker-java-version>3.3.1</docker-java-version>
+ <pulsar-version>2.11.1</pulsar-version>
+ <jaxp-ri-version>1.4.5</jaxp-ri-version>
<google-cloud-functions-bom-version>2.2.0</google-cloud-functions-bom-version>
- <google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
+ <commons-lang-version>2.6</commons-lang-version>
+ <jackson2.14-version>2.14.3</jackson2.14-version>
+ <web3j-quorum-version>0.8.0</web3j-quorum-version>
+ <univocity-parsers-version>2.9.1</univocity-parsers-version>
+ <pooled-jms-version>3.1.0</pooled-jms-version>
+ <jakarta-json-api-version>2.1.1</jakarta-json-api-version>
+ <neoscada-version>0.4.0</neoscada-version>
+ <os-maven-plugin-version>1.7.0</os-maven-plugin-version>
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
- <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
- <graaljs-version>22.3.0</graaljs-version>
- <graphql-java-version>18.4</graphql-java-version>
- <greenmail-version>2.0.0</greenmail-version>
- <grizzly-websockets-version>2.4.4</grizzly-websockets-version>
- <grpc-version>1.54.0</grpc-version>
- <!-- keep grpc-google-auth-library-version in sync with that used by grpc-auth -->
- <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
- <grpc-guava-version>32.0.0-jre</grpc-guava-version>
- <grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
- <grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
- <grpc-protobuf-version>3.22.2</grpc-protobuf-version>
- <gson-version>2.10.1</gson-version>
- <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
- <guice3-version>3.0</guice3-version>
- <hadoop3-version>3.3.5</hadoop3-version>
- <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
- <hamcrest-version>2.2</hamcrest-version>
- <hapi-version>2.3</hapi-version>
- <hapi-base-version>2.3</hapi-base-version>
- <hapi-fhir-version>6.4.2</hapi-fhir-version>
- <hazelcast-version>5.3.1</hazelcast-version>
- <hdrhistrogram-version>2.1.11</hdrhistrogram-version>
- <hibernate-validator-version>8.0.0.Final</hibernate-validator-version>
- <hibernate-version>5.6.15.Final</hibernate-version>
- <hk2-version>2.6.1</hk2-version>
- <hsqldb-version>2.7.1</hsqldb-version>
- <httpunit-version>1.7</httpunit-version>
- <httpcore-version>5.2.2</httpcore-version>
- <httpclient-version>5.1.4</httpclient-version>
- <httpcore4-version>4.4.16</httpcore4-version>
- <httpclient4-version>4.5.14</httpclient4-version>
- <httpasyncclient-version>4.1.5</httpasyncclient-version>
- <huaweicloud-obs-version>3.23.3</huaweicloud-obs-version>
- <huaweicloud-sdk-version>3.1.38</huaweicloud-sdk-version>
- <ical4j-version>1.0.7</ical4j-version>
- <icu4j-version>73.1</icu4j-version>
- <ignite-version>2.15.0</ignite-version>
- <impsort-maven-plugin-version>1.9.0</impsort-maven-plugin-version>
- <infinispan-version>14.0.11.Final</infinispan-version>
- <influx-java-driver-version>2.22</influx-java-driver-version>
- <influx-client-java-driver-version>6.8.0</influx-client-java-driver-version>
- <irclib-version>1.10</irclib-version>
- <ironmq-version>3.0.5</ironmq-version>
- <ivy-version>2.5.1</ivy-version>
- <jackson-jq-version>1.0.0-preview.20230409</jackson-jq-version>
- <jackson2-version>2.15.2</jackson2-version>
- <!-- For projects not yet compatible with Jackson 2.15 -->
- <jackson2.14-version>2.14.3</jackson2.14-version>
- <jackson2-module-scala-version>2.15.1</jackson2-module-scala-version>
- <jackrabbit-version>2.21.16</jackrabbit-version>
- <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
- <jandex-version>3.1.1</jandex-version>
- <jansi-version>2.4.0</jansi-version>
- <jasypt-version>1.9.3</jasypt-version>
- <java-grok-version>0.1.9</java-grok-version>
- <java-util-version>2.0.0</java-util-version>
- <jnats-version>2.16.12</jnats-version>
- <javacc-maven-plugin-version>3.0.1</javacc-maven-plugin-version>
- <javacrumbs-version>0.22</javacrumbs-version>
- <javaparser-version>3.13.10</javaparser-version>
- <javapoet-version>1.11.1</javapoet-version>
- <javassist-version>3.28.0-GA</javassist-version>
- <javax-el3-version>3.0.0</javax-el3-version>
- <jakarta-el-api-hibernate-validator-version>5.0.1</jakarta-el-api-hibernate-validator-version>
+ <slack-api-model-version>1.8.1</slack-api-model-version>
+ <junit-toolbox-version>2.4</junit-toolbox-version>
+ <jool-version>0.9.15</jool-version>
+ <freemarker-version>2.3.32</freemarker-version>
+ <xml-resolver-version>1.2</xml-resolver-version>
<jakarta-el-expressly-version>5.0.0</jakarta-el-expressly-version>
- <jakarta-activation-version>2.1.1</jakarta-activation-version>
- <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
- <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
- <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
- <jakarta-api-version>2.1.5</jakarta-api-version>
- <jakarta.el-version>3.0.3</jakarta.el-version>
- <jakarta-inject-version>2.0.1</jakarta-inject-version>
- <jakarta-xml-bind-api-version>4.0.0</jakarta-xml-bind-api-version>
- <jakarta-xml-soap-api-version>3.0.0</jakarta-xml-soap-api-version>
- <jakarta-xml-ws-api-version>4.0.0</jakarta-xml-ws-api-version>
- <glassfish-javax-json>1.0.4</glassfish-javax-json>
- <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
- <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
- <jaxp-ri-version>1.4.5</jaxp-ri-version>
- <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
- <jboss-logging-version>3.4.3.Final</jboss-logging-version>
- <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
- <jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
- <jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
- <jcache-version>1.1.1</jcache-version>
- <jcommander-version>1.72</jcommander-version>
- <jcr-version>2.0</jcr-version>
- <jedis-client-version>4.4.2</jedis-client-version>
- <jetcd-version>0.7.5</jetcd-version>
- <jetty-version>11.0.15</jetty-version>
- <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
- <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
- <jettison-version>1.5.4</jettison-version>
- <jgit-version>6.5.0.202303070854-r</jgit-version>
- <jgroups-version>4.2.17.Final</jgroups-version>
- <jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
- <jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
- <jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
- <jira-guava-version>32.0.0-jre</jira-guava-version>
- <jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
- <libthrift-version>0.18.1</libthrift-version>
+ <flatpack-version>4.0.5</flatpack-version>
+ <jakarta-el-api-hibernate-validator-version>5.0.1</jakarta-el-api-hibernate-validator-version>
<jodatime2-version>2.11.1</jodatime2-version>
- <jolokia-version>1.7.2</jolokia-version>
- <jolt-version>0.1.7</jolt-version>
- <jool-version>0.9.15</jool-version>
- <jooq-version>3.18.4</jooq-version>
- <joor-version>0.9.14</joor-version>
- <johnzon-version>1.2.20</johnzon-version>
- <jose4j-version>0.6.4</jose4j-version>
- <jslt-version>0.1.14</jslt-version>
- <jsmpp-version>2.3.11</jsmpp-version>
- <jsch-version>0.2.1</jsch-version>
- <json-api>1.0</json-api>
- <jsonassert-version>1.5.1</jsonassert-version>
- <json-path-version>2.8.0</json-path-version>
- <json-patch-version>1.13</json-patch-version>
- <jsonata4java-version>2.2.4</jsonata4java-version>
- <json-schema-validator-version>2.2.14</json-schema-validator-version>
- <json-unit-version>2.32.0</json-unit-version>
+ <hibernate-version>5.6.15.Final</hibernate-version>
+ <mockito-version>3.12.4</mockito-version>
+ <maven-plugin-annotations-version>3.9.0</maven-plugin-annotations-version>
+ <properties-maven-plugin-version>1.1.0</properties-maven-plugin-version>
+ <maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
<jsoup-version>1.15.3</jsoup-version>
- <jt400-version>11.2</jt400-version>
- <junit-toolbox-version>2.4</junit-toolbox-version>
- <junit-version>4.13.2</junit-version>
- <junit-jupiter-version>5.9.2</junit-jupiter-version>
- <junit-pioneer-version>1.7.1</junit-pioneer-version>
- <jxmpp-version>0.6.4</jxmpp-version>
- <jython-version>2.7.3</jython-version>
- <jython-standalone-version>2.7.3</jython-standalone-version>
- <jzlib-version>1.1.3</jzlib-version>
- <kafka-version>3.5.0</kafka-version>
- <kotlin-version>1.8.22</kotlin-version>
- <kubernetes-client-version>6.7.2</kubernetes-client-version>
- <kubernetes-model-version>6.7.2</kubernetes-model-version>
- <kudu-version>1.16.0</kudu-version>
- <leveldbjni-version>1.8</leveldbjni-version>
- <leveldb-api-version>0.12</leveldb-api-version>
- <leveldb-version>0.12</leveldb-version>
+ <geronimo-annotation-1.2-spec-version>1.0</geronimo-annotation-1.2-spec-version>
+ <commons-text-version>1.10.0</commons-text-version>
+ <jettison-version>1.5.4</jettison-version>
+ <commons-exec-version>1.3</commons-exec-version>
+ <cometd-java-client-version>7.0.9</cometd-java-client-version>
+ <graphql-java-version>18.4</graphql-java-version>
+ <axiom-version>1.2.14</axiom-version>
+ <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
+ <cometd-java-server-version>7.0.9</cometd-java-server-version>
+ <commons-io-version>2.13.0</commons-io-version>
+ <xmlgraphics-batik-version>1.16</xmlgraphics-batik-version>
+ <rest-assured-version>5.3.0</rest-assured-version>
+ <icu4j-version>73.1</icu4j-version>
+ <joor-version>0.9.14</joor-version>
+ <hapi-base-version>2.3</hapi-base-version>
+ <hadoop3-version>3.3.5</hadoop3-version>
+ <xerces-version>2.12.2</xerces-version>
<leveldb-guava-version>32.0.0-jre</leveldb-guava-version>
- <libphonenumber-version>8.13.3</libphonenumber-version>
- <!-- virtual dependency only used by Eclipse m2e -->
- <lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
- <log4j2-version>2.20.0</log4j2-version>
- <logback-version>1.4.8</logback-version>
- <lucene-version>9.6.0</lucene-version>
- <lightcouch-version>0.2.0</lightcouch-version>
- <mapstruct-version>1.5.5.Final</mapstruct-version>
- <!-- needed from tooling/archetypes -->
- <maven-version>3.8.8</maven-version>
- <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
- <maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
- <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
- <maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
- <maven-owasp-plugin-version>8.2.1</maven-owasp-plugin-version>
+ <formatter-maven-plugin-version>2.21.0</formatter-maven-plugin-version>
+ <mvel-version>2.4.15.Final</mvel-version>
+ <roaster-version>2.28.0.Final</roaster-version>
+ <maven-war-plugin-version>3.3.1</maven-war-plugin-version>
+ <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
+ <jboss-logging-version>3.4.3.Final</jboss-logging-version>
+ <httpcore4-version>4.4.16</httpcore4-version>
<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
- <maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
+ <saxon-version>12.2</saxon-version>
+ <twilio-version>9.6.2</twilio-version>
+ <mock-javamail-version>2.0</mock-javamail-version>
<maven-plugin-plugin-version>3.9.0</maven-plugin-plugin-version>
- <maven-plugin-annotations-version>3.9.0</maven-plugin-annotations-version>
- <maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
- <!-- resources plugin needed by Camel maven archetypes -->
- <maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
- <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
- <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
- <maven-resolver-version>1.9.10</maven-resolver-version>
- <maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
- <maven-shared-utils-plugin-version>3.3.4</maven-shared-utils-plugin-version>
- <maven-surefire-report-plugin-version>3.0.0</maven-surefire-report-plugin-version>
- <maven-wagon-version>3.5.2</maven-wagon-version>
- <maven-war-plugin-version>3.3.1</maven-war-plugin-version>
- <metrics-version>4.2.19</metrics-version>
- <micrometer-version>1.11.1</micrometer-version>
- <micrometer-tracing-version>1.1.2</micrometer-tracing-version>
- <microprofile-config-version>3.0.3</microprofile-config-version>
- <microprofile-fault-tolerance-version>4.0.2</microprofile-fault-tolerance-version>
- <mina-version>2.2.2</mina-version>
- <minidns-version>0.3.4</minidns-version>
+ <zookeeper-version>3.8.1</zookeeper-version>
+ <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
+ <qpid-broker-version>9.0.0</qpid-broker-version>
<minimal-json-version>0.9.5</minimal-json-version>
- <minio-version>8.5.3</minio-version>
- <mock-javamail-version>2.0</mock-javamail-version>
- <mockwebserver-version>0.2.2</mockwebserver-version>
- <mockito-version>3.12.4</mockito-version>
- <mongo-java-driver-version>4.9.0</mongo-java-driver-version>
- <mongo-hadoop-version>1.5.0</mongo-hadoop-version>
- <msal4j-version>1.13.8</msal4j-version>
- <mustache-java-version>0.9.10</mustache-java-version>
- <mvel-version>2.4.15.Final</mvel-version>
- <mybatis-version>3.5.13</mybatis-version>
- <narayana-version>5.12.7.Final</narayana-version>
- <nessus-hyperledger-aries-version>0.2.0</nessus-hyperledger-aries-version>
- <nessus-weka-version>1.0.1</nessus-weka-version>
- <neoscada-version>0.4.0</neoscada-version>
- <netty-version>4.1.94.Final</netty-version>
- <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
- <networknt-json-schema-validator-version>1.0.81</networknt-json-schema-validator-version>
- <nimbus-jose-jwt>9.22</nimbus-jose-jwt>
- <nitrite-version>3.4.4</nitrite-version>
- <okclient-version>3.14.9</okclient-version>
- <olingo2-version>2.0.11</olingo2-version>
- <olingo4-version>4.8.0</olingo4-version>
+ <commons-beanutils-version>1.9.4</commons-beanutils-version>
+ <google-oauth-client-version>1.34.0</google-oauth-client-version>
+ <huaweicloud-sdk-version>3.1.38</huaweicloud-sdk-version>
+ <build-helper-maven-plugin-version>3.4.0</build-helper-maven-plugin-version>
+ <maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
+ <parquet-common-version>1.12.3</parquet-common-version>
+ <leveldb-api-version>0.12</leveldb-api-version>
+ <validation-api-version>2.0.1.Final</validation-api-version>
+ <box-java-sdk-version>2.58.0</box-java-sdk-version>
+ <commons-lang3-version>3.12.0</commons-lang3-version>
+ <yasson-version>3.0.3</yasson-version>
+ <johnzon-version>1.2.20</johnzon-version>
+ <fop-version>2.8</fop-version>
<ognl-version>3.3.4</ognl-version>
- <openapi-generator>6.2.1</openapi-generator>
- <openjpa-version>3.2.2</openjpa-version>
- <openstack4j-version>3.10</openstack4j-version>
- <opentelemetry-version>1.26.0</opentelemetry-version>
- <opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
- <optaplanner-version>9.37.0.Final</optaplanner-version>
- <os-maven-plugin-version>1.7.0</os-maven-plugin-version>
+ <templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
+ <commons-net-version>3.9.0</commons-net-version>
+ <httpcore-version>5.2.2</httpcore-version>
+ <geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
+ <ftpserver-version>1.1.2</ftpserver-version>
+ <couchbase-client-version>3.4.7</couchbase-client-version>
<paho-version>1.2.5</paho-version>
- <parquet-common-version>1.12.3</parquet-common-version>
- <parquet-avro-version>1.12.3</parquet-avro-version>
- <pdfbox-version>2.0.28</pdfbox-version>
- <pgjdbc-driver-version>42.6.0</pgjdbc-driver-version>
- <pgjdbc-ng-driver-version>0.8.9</pgjdbc-ng-driver-version>
- <picocli-version>4.7.3</picocli-version>
- <plc4x-version>0.10.0</plc4x-version>
- <pooled-jms-version>3.1.0</pooled-jms-version>
- <powermock-version>2.0.7</powermock-version>
- <properties-maven-plugin-version>1.1.0</properties-maven-plugin-version>
- <protobuf-version>3.19.6</protobuf-version>
- <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
- <protonpack-version>1.8</protonpack-version>
- <protostream-version>4.6.2.Final</protostream-version>
- <prowide-version>SRU2022-10.0.1</prowide-version>
- <pubnub-version>6.3.5</pubnub-version>
- <pulsar-version>2.11.1</pulsar-version>
- <qpid-broker-version>9.0.0</qpid-broker-version>
- <qpid-proton-j-version>0.34.1</qpid-proton-j-version>
+ <hdrhistrogram-version>2.1.11</hdrhistrogram-version>
+ <rome-version>1.18.0</rome-version>
+ <smallrye-health-version>4.0.2</smallrye-health-version>
+ <httpunit-version>1.7</httpunit-version>
+ <consul-client-version>1.5.3</consul-client-version>
+ <spring-vault-core-version>3.0.3</spring-vault-core-version>
+ <graaljs-version>22.3.0</graaljs-version>
+ <grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<qpid-jms-client-version>2.3.0</qpid-jms-client-version>
+ <microprofile-config-version>3.0.3</microprofile-config-version>
+ <spring-data-redis-version>3.1.1</spring-data-redis-version>
+ <spring-rabbitmq-version>3.0.5</spring-rabbitmq-version>
+ <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
+ <geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
+ <javacrumbs-version>0.22</javacrumbs-version>
+ <californium-scandium-version>2.7.4</californium-scandium-version>
+ <djl-pytorch-native-version>1.9.1</djl-pytorch-native-version>
+ <jolokia-version>1.7.2</jolokia-version>
+ <kubernetes-client-version>6.7.2</kubernetes-client-version>
+ <httpasyncclient-version>4.1.5</httpasyncclient-version>
+ <json-schema-validator-version>2.2.14</json-schema-validator-version>
+ <zxing-version>3.5.0</zxing-version>
+ <flink-version>1.17.1</flink-version>
+ <cxf-codegen-plugin-version>4.0.2</cxf-codegen-plugin-version>
+ <httpclient-version>5.1.4</httpclient-version>
+ <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
+ <networknt-json-schema-validator-version>1.0.81</networknt-json-schema-validator-version>
+ <qpid-proton-j-version>0.34.1</qpid-proton-j-version>
+ <braintree-gateway-version>3.24.0</braintree-gateway-version>
+ <compress-lzf-version>1.1</compress-lzf-version>
+ <nitrite-version>3.4.4</nitrite-version>
+ <lucene-version>9.6.0</lucene-version>
+ <vavr-version>0.10.4</vavr-version>
+ <spring-security-version>6.1.1</spring-security-version>
+ <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
+ <micrometer-version>1.11.1</micrometer-version>
+ <tika-version>2.8.0</tika-version>
+ <abdera-version>1.1.3</abdera-version>
+ <lightcouch-version>0.2.0</lightcouch-version>
+ <jakarta-xml-bind-api-version>4.0.0</jakarta-xml-bind-api-version>
+ <spock-version>2.3-groovy-4.0</spock-version>
+ <grizzly-websockets-version>2.4.4</grizzly-websockets-version>
+ <geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>
+ <java-util-version>2.0.0</java-util-version>
+ <google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
+ <opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
+ <maven-version>3.8.8</maven-version>
<quartz-version>2.3.2</quartz-version>
- <quickfixj-version>2.3.1</quickfixj-version>
- <reactive-streams-version>1.0.4</reactive-streams-version>
- <reactor-version>3.5.6</reactor-version>
+ <curator-version>5.4.0</curator-version>
+ <exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
+ <wiremock-version>3.0.0-beta-9</wiremock-version>
<reactor-netty-version>1.1.6</reactor-netty-version>
+ <grpc-protobuf-version>3.22.2</grpc-protobuf-version>
+ <opentelemetry-version>1.26.0</opentelemetry-version>
+ <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
+ <depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
+ <snakeyaml-engine-version>2.3</snakeyaml-engine-version>
+ <json-patch-version>1.13</json-patch-version>
+ <fastjson-version>2.0.33</fastjson-version>
+ <commons-configuration-version>1.9</commons-configuration-version>
+ <mybatis-version>3.5.13</mybatis-version>
+ <swagger-openapi3-java-parser-version>2.1.14</swagger-openapi3-java-parser-version>
+ <metrics-version>4.2.19</metrics-version>
+ <derby-version>10.14.2.0</derby-version>
+ <protonpack-version>1.8</protonpack-version>
+ <velocity-version>2.3</velocity-version>
+ <msal4j-version>1.13.8</msal4j-version>
+ <jackson2-version>2.15.2</jackson2-version>
+ <jython-standalone-version>2.7.3</jython-standalone-version>
+ <c3p0-version>0.9.5.5</c3p0-version>
+ <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+ <greenmail-version>2.0.0</greenmail-version>
+ <pgjdbc-driver-version>42.6.0</pgjdbc-driver-version>
+ <apacheds-version>2.0.0.AM26</apacheds-version>
+ <jackrabbit-version>2.21.16</jackrabbit-version>
+ <yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version>
+ <activemq-version>5.18.1</activemq-version>
+ <asn1bean-version>1.13.0</asn1bean-version>
+ <smack-version>4.3.5</smack-version>
+ <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
+ <vertx-version>4.4.2</vertx-version>
+ <aws-xray-version>2.14.0</aws-xray-version>
+ <debezium-version>2.2.1.Final</debezium-version>
+ <digitalocean-api-client-version>2.17</digitalocean-api-client-version>
+ <picocli-version>4.7.3</picocli-version>
+ <maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
+ <huaweicloud-obs-version>3.23.3</huaweicloud-obs-version>
+ <grpc-version>1.54.0</grpc-version>
+ <assertj-version>3.24.2</assertj-version>
+ <scala-datasonnet-version>2.13.10</scala-datasonnet-version>
+ <javaparser-version>3.13.10</javaparser-version>
+ <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
+ <woodstox-version>4.4.1</woodstox-version>
+ <commons-compress-version>1.21</commons-compress-version>
<redisson-version>3.22.0</redisson-version>
- <resilience4j-version>2.0.2</resilience4j-version>
- <rest-assured-version>5.3.0</rest-assured-version>
- <roaster-version>2.28.0.Final</roaster-version>
+ <kotlin-version>1.8.22</kotlin-version>
+ <dropbox-version>5.4.5</dropbox-version>
+ <spring-ldap-version>3.1.0</spring-ldap-version>
+ <squareup-okio-version>1.17.2</squareup-okio-version>
+ <cxf-xjc-plugin-version>4.0.0</cxf-xjc-plugin-version>
+ <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
+ <commons-math3-version>3.6.1</commons-math3-version>
<robotframework-version>4.1.2</robotframework-version>
- <rocketmq-version>4.9.4</rocketmq-version>
- <rome-version>1.18.0</rome-version>
- <rxjava2-version>2.2.21</rxjava2-version>
- <saxon-version>12.2</saxon-version>
- <scala-version>2.11.12</scala-version>
- <scala-datasonnet-version>2.13.10</scala-datasonnet-version>
- <servicemix-specs-version>2.9.0</servicemix-specs-version>
- <shiro-version>1.11.0</shiro-version>
- <slack-api-model-version>1.8.1</slack-api-model-version>
+ <djl-version>0.21.0</djl-version>
+ <influx-java-driver-version>2.22</influx-java-driver-version>
+ <avro-version>1.11.1</avro-version>
+ <jcommander-version>1.72</jcommander-version>
+ <classgraph-version>4.8.157</classgraph-version>
+ <google-cloud-bom-version>26.1.6</google-cloud-bom-version>
+ <jasypt-version>1.9.3</jasypt-version>
+ <pdfbox-version>2.0.28</pdfbox-version>
+ <chunk-templates-version>3.6.2</chunk-templates-version>
+ <reactor-version>3.5.6</reactor-version>
+ <dnsjava-version>3.5.1</dnsjava-version>
+ <xml-apis-version>1.4.01</xml-apis-version>
+ <commons-configuration2-version>2.8.0</commons-configuration2-version>
+ <geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
+ <elasticsearch-java-client-version>8.8.1</elasticsearch-java-client-version>
+ <xml-apis-ext-version>1.3.04</xml-apis-ext-version>
+ <jta-api-1.2-version>1.2</jta-api-1.2-version>
+ <jooq-version>3.18.4</jooq-version>
+ <jakarta-activation-version>2.1.1</jakarta-activation-version>
+ <minidns-version>0.3.4</minidns-version>
+ <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
+ <javapoet-version>1.11.1</javapoet-version>
<slf4j-api-version>2.0.6</slf4j-api-version>
- <slf4j-version>2.0.6</slf4j-version>
- <smack-version>4.3.5</smack-version>
- <smallrye-config-version>3.2.1</smallrye-config-version>
- <smallrye-health-version>4.0.2</smallrye-health-version>
- <smallrye-fault-tolerance-version>6.2.3</smallrye-fault-tolerance-version>
- <snakeyaml-version>2.0</snakeyaml-version>
- <snakeyaml-engine-version>2.3</snakeyaml-engine-version>
- <snmp4j-version>2.8.15</snmp4j-version>
+ <angus-mail-version>2.0.2</angus-mail-version>
+ <jsonata4java-version>2.2.4</jsonata4java-version>
+ <aws-java-sdk2-version>2.20.91</aws-java-sdk2-version>
+ <jansi-version>2.4.0</jansi-version>
+ <jakarta-api-version>2.1.5</jakarta-api-version>
+ <jt400-version>11.2</jt400-version>
+ <jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
+ <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
<splunk-version>1.9.0_1</splunk-version>
- <spock-version>2.3-groovy-4.0</spock-version>
+ <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
+ <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
+ <scala-version>2.11.12</scala-version>
+ <directory-watcher-version>0.18.0</directory-watcher-version>
+ <jzlib-version>1.1.3</jzlib-version>
+ <ascii-table-version>1.8.0</ascii-table-version>
+ <google-api-client-version>1.35.2</google-api-client-version>
+ <apache-drill-version>1.21.1</apache-drill-version>
+ <jgit-version>6.5.0.202303070854-r</jgit-version>
+ <javax-el3-version>3.0.0</javax-el3-version>
+ <pubnub-version>6.3.5</pubnub-version>
+ <jandex-version>3.1.1</jandex-version>
+ <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
+ <jakarta-inject-version>2.0.1</jakarta-inject-version>
+ <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
+ <junit-pioneer-version>1.7.1</junit-pioneer-version>
+ <openjpa-version>3.2.2</openjpa-version>
+ <snakeyaml-version>2.0</snakeyaml-version>
+ <jakarta-xml-ws-api-version>4.0.0</jakarta-xml-ws-api-version>
+ <prowide-version>SRU2022-10.0.1</prowide-version>
+ <twitter4j-version>4.0.7</twitter4j-version>
+ <gson-version>2.10.1</gson-version>
<spring-batch-version>5.0.2</spring-batch-version>
- <spring-data-redis-version>3.1.1</spring-data-redis-version>
- <spring-ldap-version>3.1.0</spring-ldap-version>
- <spring-vault-core-version>3.0.3</spring-vault-core-version>
- <spring-version>6.0.10</spring-version>
- <spring-rabbitmq-version>3.0.5</spring-rabbitmq-version>
- <spring-security-version>6.1.1</spring-security-version>
- <spring-ws-version>4.0.5</spring-ws-version>
- <sql-maven-plugin-version>1.5</sql-maven-plugin-version>
- <squareup-okhttp-version>3.14.9</squareup-okhttp-version>
- <squareup-okio-version>1.17.2</squareup-okio-version>
- <sshd-version>2.9.2</sshd-version>
- <stompjms-version>1.19</stompjms-version>
- <swagger-java-version>1.6.10</swagger-java-version>
- <swagger-openapi3-version>2.2.10</swagger-openapi3-version>
- <swagger-java-parser-version>1.0.65</swagger-java-parser-version>
- <swagger-openapi3-java-parser-version>2.1.14</swagger-openapi3-java-parser-version>
+ <commons-csv-version>1.8</commons-csv-version>
+ <maven-wagon-version>3.5.2</maven-wagon-version>
<stax-api-version>1.0.1</stax-api-version>
- <stringtemplate-version>4.3.4</stringtemplate-version>
- <templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
- <testcontainers-version>1.17.6</testcontainers-version>
- <tika-version>2.8.0</tika-version>
- <twilio-version>9.6.2</twilio-version>
- <twitter4j-version>4.0.7</twitter4j-version>
- <undertow-version>2.3.7.Final</undertow-version>
- <univocity-parsers-version>2.9.1</univocity-parsers-version>
- <validation-api-version>2.0.1.Final</validation-api-version>
- <vavr-version>0.10.4</vavr-version>
- <velocity-tools-version>3.1</velocity-tools-version>
- <velocity-version>2.3</velocity-version>
- <vertx-version>4.4.2</vertx-version>
- <vysper-version>0.7</vysper-version>
- <web3j-version>3.6.0</web3j-version>
- <web3j-quorum-version>0.8.0</web3j-quorum-version>
- <wildfly-elytron>1.15.17.Final</wildfly-elytron>
- <wiremock-version>3.0.0-beta-9</wiremock-version>
- <woodstox-version>4.4.1</woodstox-version>
+ <ignite-version>2.15.0</ignite-version>
+ <corda-version>4.10</corda-version>
+ <jira-guava-version>32.0.0-jre</jira-guava-version>
+ <lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
+ <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
+ <jsmpp-version>2.3.11</jsmpp-version>
+ <micrometer-tracing-version>1.1.2</micrometer-tracing-version>
+ <influx-client-java-driver-version>6.8.0</influx-client-java-driver-version>
<woodstox-core-version>6.4.0</woodstox-core-version>
- <xbean-spring-version>4.21</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
- <xchange-version>5.0.14</xchange-version>
- <xchange-guava-version>32.0.0-jre</xchange-guava-version>
- <xerces-version>2.12.2</xerces-version>
- <!-- needed to manage the xml-apis version in camel-xmljson -->
- <xml-apis-version>1.4.01</xml-apis-version>
- <xml-apis-ext-version>1.3.04</xml-apis-ext-version>
- <xml-resolver-version>1.2</xml-resolver-version>
- <xmlgraphics-batik-version>1.16</xmlgraphics-batik-version>
- <xmlsec-version>2.2.3</xmlsec-version>
- <xmlunit-version>2.9.1</xmlunit-version>
+ <google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
+ <jsonassert-version>1.5.1</jsonassert-version>
+ <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
+ <disruptor-version>3.4.4</disruptor-version>
+ <elasticsearch-java-client-sniffer-version>8.8.1</elasticsearch-java-client-sniffer-version>
+ <grpc-guava-version>32.0.0-jre</grpc-guava-version>
+ <eddsa-version>0.3.0</eddsa-version>
+ <jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
+ <jetcd-version>0.7.5</jetcd-version>
+ <jakarta.el-version>3.0.3</jakarta.el-version>
<xpp3-version>1.1.4c</xpp3-version>
- <yasson-version>3.0.3</yasson-version>
- <yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version>
- <zendesk-client-version>0.19.0</zendesk-client-version>
- <zookeeper-version>3.8.1</zookeeper-version>
- <zxing-version>3.5.0</zxing-version>
+ <swagger-java-parser-version>1.0.65</swagger-java-parser-version>
+ <kafka-version>3.5.0</kafka-version>
+ <as2-lib-version>4.11.0</as2-lib-version>
+ <jsch-version>0.2.1</jsch-version>
+ <ivy-version>2.5.1</ivy-version>
+ <ical4j-version>1.0.7</ical4j-version>
+ <maven-resolver-version>1.9.10</maven-resolver-version>
+ <ehcache3-version>3.10.8</ehcache3-version>
+ <awaitility-version>4.2.0</awaitility-version>
+ <maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
+ <swagger-java-version>1.6.10</swagger-java-version>
+ <guice3-version>3.0</guice3-version>
+ <openstack4j-version>3.10</openstack4j-version>
+ <maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
+ <leveldbjni-version>1.8</leveldbjni-version>
+ <spring-ws-version>4.0.5</spring-ws-version>
+ <xmlunit-version>2.9.1</xmlunit-version>
+ <junit-version>4.13.2</junit-version>
+ <maven-surefire-report-plugin-version>3.0.0</maven-surefire-report-plugin-version>
+ <atlasmap-version>2.5.2</atlasmap-version>
+ <infinispan-version>14.0.11.Final</infinispan-version>
+ <stringtemplate-version>4.3.4</stringtemplate-version>
+ <json-path-version>2.8.0</json-path-version>
+ <hapi-fhir-version>6.4.2</hapi-fhir-version>
+ <google-api-services-mail-version>v1-rev20211108-1.32.1</google-api-services-mail-version>
+ <smallrye-config-version>3.2.1</smallrye-config-version>
+ <geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
+ <mongo-java-driver-version>4.9.0</mongo-java-driver-version>
+ <cassandra-driver-version>4.15.0</cassandra-driver-version>
+ <libphonenumber-version>8.13.3</libphonenumber-version>
+ <rxjava2-version>2.2.21</rxjava2-version>
+ <xchange-version>5.0.14</xchange-version>
+ <undertow-version>2.3.7.Final</undertow-version>
+ <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
+ <cxf-xjc-utils-version>4.0.0</cxf-xjc-utils-version>
+ <kudu-version>1.16.0</kudu-version>
+ <jakarta-xml-soap-api-version>3.0.0</jakarta-xml-soap-api-version>
+ <datasonnet-mapper-version>2.5.2-jakarta4</datasonnet-mapper-version>
+ <reactive-streams-version>1.0.4</reactive-streams-version>
+ <hamcrest-version>2.2</hamcrest-version>
+ <jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
+ <cglib-version>3.2.12</cglib-version>
+ <commons-dbcp-version>1.4</commons-dbcp-version>
+ <apicurio-version>1.1.27</apicurio-version>
+ <californium-version>2.7.2</californium-version>
+ <asm-version>8.0.1</asm-version>
+ <activemq-artemis-version>2.29.0</activemq-artemis-version>
+ <ironmq-version>3.0.5</ironmq-version>
+ <rocketmq-version>4.9.4</rocketmq-version>
+ <mockwebserver-version>0.2.2</mockwebserver-version>
+ <olingo2-version>2.0.11</olingo2-version>
+ <powermock-version>2.0.7</powermock-version>
+ <resilience4j-version>2.0.2</resilience4j-version>
+ <xbean-spring-version>4.21</xbean-spring-version>
+ <commons-cli-version>1.4</commons-cli-version>
+ <web3j-version>3.6.0</web3j-version>
+ <servicemix-specs-version>2.9.0</servicemix-specs-version>
+ <mycila-license-version>4.2</mycila-license-version>
</properties>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${mycila-license-version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml b/tooling/maven/sync-properties-maven-plugin/pom.xml
index fb583d9db96..a7ada0d0047 100644
--- a/tooling/maven/sync-properties-maven-plugin/pom.xml
+++ b/tooling/maven/sync-properties-maven-plugin/pom.xml
@@ -68,6 +68,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
diff --git a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
index 7d8a3884143..7137aca62dd 100644
--- a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
+++ b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
@@ -17,79 +17,167 @@
package org.apache.camel.maven.sync.properties;
import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
import java.nio.file.Files;
-import java.util.regex.Matcher;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.camel.tooling.util.FileUtil;
-import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.util.IOHelper;
+import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
- * Copy the properties from a source POM to a different destination POM for syncing purposes.
+ * Copy the properties {@link #sourcePomXml} to {@link #targetPomXml}, applying filters defined in
+ * {@link #propertyIncludes} and {@link #propertyExcludes}.
*/
@Mojo(name = "sync-properties", defaultPhase = LifecyclePhase.VALIDATE, threadSafe = true)
public class SyncPropertiesMojo extends AbstractMojo {
/**
- * The base directory
+ * The path to {@code camel-parent} {@code pom.xml}
+ *
+ * @since 4.0.0
*/
- @Parameter(defaultValue = "${project.basedir}")
- protected File baseDir;
+ @Parameter(defaultValue = "${maven.multiModuleProjectDirectory}/parent/pom.xml", property = "camel.camelParentPomXml")
+ private File sourcePomXml;
/**
- * The Maven project.
+ * The path to {@code camel-dependencies} {@code pom.xml}
+ *
+ * @since 4.0.0
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
- protected MavenProject project;
+ @Parameter(defaultValue = "${maven.multiModuleProjectDirectory}/camel-dependencies/pom.xml",
+ property = "camel.camelDependenciesPomXml")
+ private File targetPomXml;
+
+ /**
+ * The path to the root {@code pom.xml} of the Camel source tree
+ *
+ * @since 4.0.0
+ */
+ @Parameter(defaultValue = "${maven.multiModuleProjectDirectory}/pom.xml", property = "camel.camelPomXml")
+ private File camelPomXml;
+
+ /**
+ * The encoding to read and write files
+ *
+ * @since 4.0.0
+ */
+ @Parameter(defaultValue = "${project.build.sourceEncoding}", property = "camel.encoding")
+ private String encoding;
+
+ /**
+ * The version of the current Maven module
+ *
+ * @since 4.0.0
+ */
+ @Parameter(defaultValue = "${project.version}")
+ private String version;
+
+ /**
+ * List of regular expressions to select properties from {@link #sourcePomXml}
+ *
+ * @since 4.0.0
+ */
+ @Parameter(defaultValue = ".*-version")
+ private List<String> propertyIncludes;
+
+ /**
+ * List of regular expressions to ignore from {@link #sourcePomXml}
+ *
+ * @since 4.0.0
+ */
+ @Parameter
+ private List<String> propertyExcludes;
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- File dir = PackageHelper.findCamelDirectory(baseDir, "parent");
- File sourcePom = new File(dir, "pom.xml");
- dir = PackageHelper.findCamelDirectory(baseDir, "camel-dependencies");
- File targetPom = new File(dir, "pom.xml");
+ final Path camelParentPomXmlPath = sourcePomXml.toPath();
+ if (!Files.isRegularFile(camelParentPomXmlPath)) {
+ throw new MojoExecutionException("camelParentPomXml " + sourcePomXml + " does not exist");
+ }
+ final Path camelDependenciesPomXmlPath = targetPomXml.toPath();
+ if (!Files.isRegularFile(camelDependenciesPomXmlPath)) {
+ throw new MojoExecutionException("camelDependenciesPomXml " + targetPomXml + " does not exist");
+ }
+ final Path camelPomXmlPath = camelPomXml.toPath();
+ if (!Files.isRegularFile(camelDependenciesPomXmlPath)) {
+ throw new MojoExecutionException("camelPomXml " + camelPomXml + " does not exist");
+ }
+ final Charset charset = Charset.forName(encoding);
- try {
- String sourceStr = IOHelper.toString(ReaderFactory.newXmlReader(Files.newInputStream(sourcePom.toPath())));
- String targetStr = IOHelper.toString(ReaderFactory
- .newXmlReader(SyncPropertiesMojo.class.getResourceAsStream("/camel-dependencies-template.xml")));
+ final Model camelParentPomXmlModel;
+ try (Reader r = Files.newBufferedReader(camelParentPomXmlPath, charset)) {
+ camelParentPomXmlModel = new org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r);
+ } catch (XmlPullParserException | IOException e) {
+ throw new RuntimeException("Could not parse " + camelParentPomXmlPath, e);
+ }
+
+ final Model camelPomXmlModel;
+ try (Reader r = Files.newBufferedReader(camelPomXmlPath, charset)) {
+ camelPomXmlModel = new org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r);
+ } catch (XmlPullParserException | IOException e) {
+ throw new RuntimeException("Could not parse " + camelPomXmlPath, e);
+ }
- String version = findGroup(sourceStr, "<parent>.*?(?<v><version>.*?</version>).*?</parent>", "v");
- String properties = findGroup(sourceStr, "(?<p><properties>.*?</properties>)", "p");
+ final String template;
+ try (InputStream in = SyncPropertiesMojo.class.getResourceAsStream("/camel-dependencies-template.xml");
+ Reader r = new InputStreamReader(in, charset)) {
+ template = IOHelper.toString(r);
+ } catch (IOException e) {
+ throw new MojoExecutionException("Could not read camel-dependencies-template.xml from class path", e);
+ }
- version = version.replaceAll("\\$", "\\\\\\$");
- properties = properties.replaceAll("\\$", "\\\\\\$");
+ final Predicate<String> includes = toPredicate(propertyIncludes, true);
+ final Predicate<String> excludes = toPredicate(propertyExcludes, false);
+ final String properties = Stream.concat(
+ camelParentPomXmlModel.getProperties().entrySet().stream(),
+ camelPomXmlModel.getProperties().entrySet().stream()
+ .filter(property -> property.getKey().equals("mycila-license-version")))
+ .filter(property -> includes.test((String) property.getKey()) && !excludes.test((String) property.getKey()))
+ .map(property -> "<" + property.getKey() + ">" + property.getValue() + "</" + property.getKey() + ">")
+ .collect(Collectors.joining("\n "));
- targetStr = targetStr.replaceFirst("\\Q<version>@version@</version>\\E", version);
- targetStr = targetStr.replaceFirst("\\Q<properties>@properties@</properties>\\E", properties);
+ try {
+ final String camelPropertiesContent = template
+ .replace("@version@", version)
+ .replace("@properties@", properties);
// write lines
- boolean updated = FileUtil.updateFile(targetPom.toPath(), targetStr, StandardCharsets.UTF_8);
+ boolean updated = FileUtil.updateFile(camelDependenciesPomXmlPath, camelPropertiesContent, charset);
if (updated) {
- getLog().info("Updated: " + targetPom);
+ getLog().info("Updated: " + camelDependenciesPomXmlPath);
}
getLog().debug("Finished.");
- } catch (Exception ex) {
- throw new MojoExecutionException("Cannot copy the properties between POMs", ex);
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Could not write to " + camelDependenciesPomXmlPath, ex);
}
}
- private String findGroup(String str, String regex, String group) {
- Matcher m = Pattern.compile(regex, Pattern.DOTALL).matcher(str);
- if (m.find()) {
- return m.group(group);
+ static Predicate<String> toPredicate(List<String> regularExpressions, boolean defaultResult) {
+ if (regularExpressions == null || regularExpressions.isEmpty()) {
+ return key -> defaultResult;
+ } else {
+ final List<Pattern> patterns = regularExpressions.stream()
+ .map(Pattern::compile)
+ .collect(Collectors.toList());
+ return key -> patterns.stream().anyMatch(pattern -> pattern.matcher(key).matches());
}
- return str;
}
}
diff --git a/tooling/maven/sync-properties-maven-plugin/src/main/resources/camel-dependencies-template.xml b/tooling/maven/sync-properties-maven-plugin/src/main/resources/camel-dependencies-template.xml
index 88f5174071e..054e4e6fee7 100644
--- a/tooling/maven/sync-properties-maven-plugin/src/main/resources/camel-dependencies-template.xml
+++ b/tooling/maven/sync-properties-maven-plugin/src/main/resources/camel-dependencies-template.xml
@@ -37,6 +37,29 @@
<description>Camel Dependencies POM</description>
<!-- sync properties here from parent/pom.xml -->
- <properties>@properties@</properties>
+ <properties>
+ @properties@
+ </properties>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${mycila-license-version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
[camel] 07/18: CAMEL-19461 - Newcomer friendly source formatting
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 711fac89866a62f5b08d0a024528cac2445b242e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Jun 18 00:13:45 2023 +0200
CAMEL-19461 - Newcomer friendly source formatting
---
camel-dependencies/pom.xml | 3 +
dsl/camel-componentdsl/pom.xml | 4 --
dsl/camel-endpointdsl/pom.xml | 4 --
.../camel-yaml-dsl-maven-plugin/pom.xml | 7 ---
parent/pom.xml | 66 ++++++++++------------
5 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 52da7e84fe8..0659179bb92 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -49,6 +49,9 @@
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
<cxf.xjc.jvmArgs />
<trimStackTrace>false</trimStackTrace>
+ <sourcecheckExcludes></sourcecheckExcludes>
+ <sourcecheckExcludesComma></sourcecheckExcludesComma>
+
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<activemq-version>5.18.1</activemq-version>
diff --git a/dsl/camel-componentdsl/pom.xml b/dsl/camel-componentdsl/pom.xml
index 70c667f56d1..2c06a878e09 100644
--- a/dsl/camel-componentdsl/pom.xml
+++ b/dsl/camel-componentdsl/pom.xml
@@ -177,10 +177,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index 272da97074f..a424875e5d6 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -193,10 +193,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index e43ca0fc034..c22fc184d28 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -165,13 +165,6 @@
</mojoDependencies>
</configuration>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3a652c86eb9..026fbae3190 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,6 +44,9 @@
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
<cxf.xjc.jvmArgs />
<trimStackTrace>false</trimStackTrace>
+ <sourcecheckExcludes></sourcecheckExcludes>
+ <sourcecheckExcludesComma></sourcecheckExcludesComma>
+
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<activemq-version>5.18.1</activemq-version>
@@ -2895,15 +2898,6 @@
<staticAfter>true</staticAfter>
<removeUnused>true</removeUnused>
</configuration>
- <executions>
- <execution>
- <id>sort-imports</id>
- <phase>validate</phase>
- <goals>
- <goal>sort</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
@@ -2927,15 +2921,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <executions>
- <execution>
- <id>format</id>
- <phase>validate</phase>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -3245,25 +3230,6 @@
</properties>
</profile>
- <profile>
- <id>format</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>net.revelc.code</groupId>
- <artifactId>impsort-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<id>sourcecheck</id>
<build>
@@ -3408,6 +3374,32 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>format</id>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>impsort-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sort-imports</id>
+ <goals>
+ <goal>sort</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
[camel] 11/18: CAMEL-19461 - Add missing license-maven-plugin configuration
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 39455bfd81c1c4a91ae0873b2b4f8f7d0f98cffb
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 20 10:58:16 2023 +0200
CAMEL-19461 - Add missing license-maven-plugin configuration
---
Jenkinsfile.dryrun | 27 ++--
.../resources/ldif-properties-headerdefinition.xml | 34 ++++++
camel-dependencies/pom.xml | 16 +++
pom.xml | 136 ++++++++++++++++++---
4 files changed, 182 insertions(+), 31 deletions(-)
diff --git a/Jenkinsfile.dryrun b/Jenkinsfile.dryrun
index d7436efd290..b289d94cdad 100644
--- a/Jenkinsfile.dryrun
+++ b/Jenkinsfile.dryrun
@@ -1,22 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
diff --git a/buildingtools/src/main/resources/ldif-properties-headerdefinition.xml b/buildingtools/src/main/resources/ldif-properties-headerdefinition.xml
new file mode 100644
index 00000000000..442c340795c
--- /dev/null
+++ b/buildingtools/src/main/resources/ldif-properties-headerdefinition.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<additionalHeaders>
+ <ldif_style>
+ <firstLine>## ---------------------------------------------------------------------------</firstLine>
+ <beforeEachLine>## </beforeEachLine>
+ <endLine>## ---------------------------------------------------------------------------</endLine>
+ <skipLine><![CDATA[^version:.*$]]></skipLine>
+ <firstLineDetectionPattern>^## -+$</firstLineDetectionPattern>
+ <lastLineDetectionPattern>^## -+$</lastLineDetectionPattern>
+ <firstLineDetectionPattern>^#$</firstLineDetectionPattern>
+ <lastLineDetectionPattern>^#$</lastLineDetectionPattern>
+ <allowBlankLines>true</allowBlankLines>
+ <multiLine>true</multiLine>
+ </ldif_style>
+</additionalHeaders>
+
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0659179bb92..1c3aef5506b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -51,6 +51,7 @@
<trimStackTrace>false</trimStackTrace>
<sourcecheckExcludes></sourcecheckExcludes>
<sourcecheckExcludesComma></sourcecheckExcludesComma>
+ <mycila-license-version>4.2</mycila-license-version>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
@@ -505,4 +506,19 @@
<zxing-version>3.5.0</zxing-version>
</properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${mycila-license-version}</version>
+ <configuration>
+ <failIfUnknown>true</failIfUnknown>
+ <header>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/header.txt</header>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index bed94c8d522..0f4d659712f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,37 +265,141 @@
<failIfUnknown>true</failIfUnknown>
<header>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/header.txt</header>
<excludes>
- <exclude>KEYS</exclude>
- <exclude>**/NOTICE</exclude>
+ <exclude>**/*.MockMaker</exclude>
+ <exclude>**/*.adm</exclude>
+ <exclude>**/*.adoc.template</exclude>
+ <exclude>**/*.adoc</exclude>
+ <exclude>**/*.arff</exclude>
+ <exclude>**/*.asn1</exclude>
+ <exclude>**/*.avpr</exclude>
+ <exclude>**/*.avsc</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.cat</exclude>
+ <exclude>**/*.cer</exclude>
+ <exclude>**/*.chtml</exclude>
+ <exclude>**/*.csv</exclude>
+ <exclude>**/*.gpg</exclude>
+ <exclude>**/*.graphql*</exclude>
+ <exclude>**/*.ics</exclude>
+ <exclude>**/*.joor</exclude>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jslt</exclude>
+ <exclude>**/*.key</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.model</exclude>
+ <exclude>**/*.mp3</exclude>
+ <exclude>**/*.mp4</exclude>
+ <exclude>**/*.p12</exclude>
+ <exclude>**/*.params</exclude>
+ <exclude>**/*.parquet</exclude>
+ <exclude>**/*.pem</exclude>
+ <exclude>**/*.pfx</exclude>
+ <exclude>**/*.pgp</exclude>
+ <exclude>**/*.tm</exclude>
+ <exclude>**/*.truststore</exclude>
+ <exclude>**/*.tt</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.webp</exclude>
+ <exclude>**/*.xquery</exclude>
+ <exclude>**/*utf16.ftl</exclude>
+ <exclude>**/*utf16.vm</exclude>
+ <exclude>**/.eslint*</exclude>
+ <exclude>**/.pnp*</exclude>
+ <exclude>**/.yarn/**</exclude>
+ <exclude>**/.yarnrc.yml</exclude>
+ <exclude>**/CamelJBang.java</exclude>
+ <exclude>**/LICENSE.txt</exclude>
<exclude>**/LICENSE</exclude>
+ <exclude>**/META-INF/cxf/**</exclude>
+ <exclude>**/META-INF/groovy/**</exclude>
+ <exclude>**/META-INF/kotlin/**</exclude>
+ <exclude>**/META-INF/persistence*.xsd</exclude>
+ <exclude>**/MySecondBarConfigurer.java</exclude>
+ <exclude>**/MySecondFooConfigurer.java</exclude>
<exclude>**/NOTICE.txt</exclude>
- <exclude>**/LICENSE.txt</exclude>
- <exclude>doap.rdf</exclude>
+ <exclude>**/NOTICE</exclude>
<exclude>**/README</exclude>
- <exclude>**/*.adoc</exclude>
- <exclude>**/node_modules/**</exclude>
+ <exclude>**/TestImpl*</exclude>
+ <exclude>**/archetype-resources/**</exclude>
+ <exclude>**/ca-openssl.cnf</exclude>
<exclude>**/cacerts</exclude>
- <exclude>**/*.p12</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.mp3</exclude>
- <exclude>**/*.mp4</exclude>
+ <exclude>**/cxf.extension</exclude>
+ <exclude>**/dhis.conf</exclude>
+ <exclude>**/driver.conf</exclude>
+ <exclude>**/expressions.spec</exclude>
+ <exclude>**/git.config</exclude>
+ <exclude>**/id_file</exclude>
+ <exclude>**/id_rsa</exclude>
+ <exclude>**/ignite/**</exclude>
+ <exclude>**/it/resources/*.connectedApp</exclude>
+ <exclude>**/it/resources/salesforce/**</exclude>
+ <exclude>**/javamail.default.*</exclude>
+ <exclude>**/kafka*.config</exclude>
+ <exclude>**/known_hosts*</exclude>
+ <exclude>**/leveldb.dat/**</exclude>
+ <exclude>**/mosquitto.conf</exclude>
+ <exclude>**/myjaas.config</exclude>
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/salesforce/dto/generated/**</exclude>
+ <exclude>**/src/generated/**</exclude>
+ <exclude>**/src/generated/**</exclude>
+ <exclude>**/src/main/resources/templates/*.tmpl</exclude>
+ <exclude>**/src/test/resources/generated/**</exclude>
+ <exclude>**/test-kerb5.conf</exclude>
+ <exclude>**/yarn.lock</exclude>
+ <exclude>**/zkserver*.conf</exclude>
<exclude>.mvn/**</exclude>
- <exclude>mvnw*</exclude>
- <exclude>**/META-INF/persistence*.xsd</exclude>
+ <exclude>KEYS</exclude>
<exclude>camel-sbom/*.xml</exclude>
+ <exclude>doap.rdf</exclude>
+ <exclude>mvnw*</exclude>
</excludes>
<mapping>
- <java>SLASHSTAR_STYLE</java>
- <properties>CAMEL_PROPERTIES_STYLE</properties>
- <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
- <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>
+ <Adapter>CAMEL_PROPERTIES_STYLE</Adapter>
+ <Dockerfile.jvm>SCRIPT_STYLE</Dockerfile.jvm>
+ <Dockerfile.legacy-jar>SCRIPT_STYLE</Dockerfile.legacy-jar>
+ <Dockerfile.native-micro>SCRIPT_STYLE</Dockerfile.native-micro>
+ <Dockerfile.native>SCRIPT_STYLE</Dockerfile.native>
+ <Dockerfile>SCRIPT_STYLE</Dockerfile>
<Jenkinsfile.deploy>SLASHSTAR_STYLE</Jenkinsfile.deploy>
+ <Jenkinsfile.dryrun>SLASHSTAR_STYLE</Jenkinsfile.dryrun>
<Jenkinsfile.jdk17>SLASHSTAR_STYLE</Jenkinsfile.jdk17>
<Jenkinsfile.ppc64le>SLASHSTAR_STYLE</Jenkinsfile.ppc64le>
<Jenkinsfile.s390x>SLASHSTAR_STYLE</Jenkinsfile.s390x>
+ <atom>XML_STYLE</atom>
+ <bpmn>XML_STYLE</bpmn>
+ <camel-eclipse-pmd>XML_STYLE</camel-eclipse-pmd>
+ <cql>DOUBLEDASHES_STYLE</cql>
+ <ds>SLASHSTAR_STYLE</ds>
+ <gdsl>SLASHSTAR_STYLE</gdsl>
+ <ini>SCRIPT_STYLE</ini>
+ <java>SLASHSTAR_STYLE</java>
+ <javamail.providers>CAMEL_PROPERTIES_STYLE</javamail.providers>
+ <jaxb.index>CAMEL_PROPERTIES_STYLE</jaxb.index>
+ <jj>DOUBLESLASH_STYLE</jj>
+ <jsh>SLASHSTAR_STYLE</jsh>
+ <kts>SLASHSTAR_STYLE</kts>
+ <ldif>LDIF_STYLE</ldif>
+ <libsonnet>SLASHSTAR_STYLE</libsonnet>
+ <motd>SCRIPT_STYLE</motd>
+ <mvel>MVEL_STYLE</mvel>
+ <properties>CAMEL_PROPERTIES_STYLE</properties>
+ <proto>SLASHSTAR_STYLE</proto>
+ <qf.cfg>CAMEL_PROPERTIES_STYLE</qf.cfg>
+ <robot>SCRIPT_STYLE</robot>
+ <sch>XML_STYLE</sch>
+ <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
+ <spring.handlers>CAMEL_PROPERTIES_STYLE</spring.handlers>
+ <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>
+ <spring.schemas>CAMEL_PROPERTIES_STYLE</spring.schemas>
+ <sql>DOUBLEDASHES_STYLE</sql>
+ <thrift>JAVADOC_STYLE</thrift>
+ <unrealircd.conf>SLASHSTAR_STYLE</unrealircd.conf>
+ <vm>CAMEL_PROPERTIES_STYLE</vm>
</mapping>
<headerDefinitions>
<headerDefinition>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/license-properties-headerdefinition.xml</headerDefinition>
+ <headerDefinition>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/ldif-properties-headerdefinition.xml</headerDefinition>
</headerDefinitions>
</configuration>
</plugin>
[camel] 14/18: CAMEL-19461 - Fix YAML DSL tests after reformatting the license headers
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 787810f8af8233d6219bb5a47fad7a1ba64b94e3
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed Jun 21 11:54:30 2023 +0200
CAMEL-19461 - Fix YAML DSL tests after reformatting the license headers
---
...mpModelAsYamlSplitNestedChoiceEndRouteTest.java | 5 ++--
.../util/DumpModelAsYamlTransformRouteTest.java | 5 ++--
.../util/DumpModelAsYamlUriAsParametersTest.java | 5 ++--
.../main/java/org/apache/camel/util/IOHelper.java | 28 +++++++++++++++++++
.../org/apache/camel/yaml/out/ModelWriterTest.java | 25 +++++++++--------
.../yaml/out/ModelWriterUriAsParametersTest.java | 25 +++++++++--------
.../apache/camel/dsl/yaml/LineNumberTest.groovy | 32 +++++++++++-----------
7 files changed, 79 insertions(+), 46 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlSplitNestedChoiceEndRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlSplitNestedChoiceEndRouteTest.java
index 8db57bf39ca..28aece50986 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlSplitNestedChoiceEndRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlSplitNestedChoiceEndRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.util;
-import java.io.FileInputStream;
+import java.nio.file.Paths;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.PluginHelper;
@@ -33,7 +33,8 @@ public class DumpModelAsYamlSplitNestedChoiceEndRouteTest extends DumpModelAsYam
assertNotNull(out);
log.info(out);
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/org/apache/camel/util/split-choice.yaml"));
+ String expected = IOHelper.stripLineComments(Paths.get("src/test/resources/org/apache/camel/util/split-choice.yaml"),
+ "#", true);
Assertions.assertEquals(expected, out);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlTransformRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlTransformRouteTest.java
index 7ae7efd684d..ac9be91a288 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlTransformRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlTransformRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.util;
-import java.io.FileInputStream;
+import java.nio.file.Paths;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.PluginHelper;
@@ -33,7 +33,8 @@ public class DumpModelAsYamlTransformRouteTest extends DumpModelAsYamlTestSuppor
assertNotNull(out);
log.info(out);
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/org/apache/camel/util/transform.yaml"));
+ String expected
+ = IOHelper.stripLineComments(Paths.get("src/test/resources/org/apache/camel/util/transform.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlUriAsParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlUriAsParametersTest.java
index b25439c166f..3268951e050 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlUriAsParametersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsYamlUriAsParametersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.util;
-import java.io.FileInputStream;
+import java.nio.file.Paths;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.PluginHelper;
@@ -35,7 +35,8 @@ public class DumpModelAsYamlUriAsParametersTest extends DumpModelAsYamlTestSuppo
log.info(out);
String expected
- = IOHelper.loadText(new FileInputStream("src/test/resources/org/apache/camel/util/uri-as-parameters.yaml"));
+ = IOHelper.stripLineComments(Paths.get("src/test/resources/org/apache/camel/util/uri-as-parameters.yaml"), "#",
+ true);
Assertions.assertEquals(expected, out);
}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 3e78bf2b057..1b61ee984e5 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -41,7 +41,10 @@ import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.function.Supplier;
+import java.util.stream.Stream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -740,4 +743,29 @@ public final class IOHelper {
public static BufferedWriter toWriter(FileOutputStream os, Charset charset) {
return IOHelper.buffered(new EncodingFileWriter(os, charset));
}
+
+ /**
+ * Reads the file under the given {@code path}, strips lines starting with {@code commentPrefix} and optionally also
+ * strips blank lines (the ones for which {@link String#isBlank()} returns {@code true}. Normalizes EOL characters
+ * to {@code '\n'}.
+ *
+ * @param path the path of the file to read
+ * @param commentPrefix the leading character sequence of comment lines.
+ * @param stripEmptylines if true {@code true} the lines matching {@link String#isBlank()} will not appear in the
+ * result
+ * @return the filtered content of the file
+ */
+ public static String stripLineComments(Path path, String commentPrefix, boolean stripBlankLines) {
+ StringBuilder result = new StringBuilder();
+ try (Stream<String> lines = Files.lines(path)) {
+ lines
+ .filter(l -> !l.isBlank())
+ .filter(line -> !line.startsWith(commentPrefix))
+ .forEach(line -> result.append(line).append('\n'));
+ } catch (IOException e) {
+ throw new RuntimeException("Could not read " + path, e);
+ }
+ return result.toString();
+ }
+
}
diff --git a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
index ea45413f77f..6aa74d25ec0 100644
--- a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
+++ b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.yaml.out;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.StringWriter;
+import java.nio.file.Paths;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -39,10 +39,11 @@ import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.HeaderExpression;
import org.apache.camel.model.language.SimpleExpression;
-import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.util.IOHelper.stripLineComments;
+
public class ModelWriterTest {
@Test
@@ -61,7 +62,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route0b.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route0b.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -82,7 +83,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route1.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route1.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -108,7 +109,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route2.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route2.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -138,7 +139,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route3.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route3.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -159,7 +160,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route4.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route4.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -184,7 +185,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route5.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route5.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -207,7 +208,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route6.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route6.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -239,7 +240,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(mcc.getRouteDefinition("myRoute7"));
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route7.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route7.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -272,7 +273,7 @@ public class ModelWriterTest {
writer.writeRoutesDefinition(routes);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route8b.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route8b.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -292,7 +293,7 @@ public class ModelWriterTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route9.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route9.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
diff --git a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
index 6148224029d..503202bd9a6 100644
--- a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
+++ b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.yaml.out;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.StringWriter;
+import java.nio.file.Paths;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -39,10 +39,11 @@ import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.HeaderExpression;
import org.apache.camel.model.language.SimpleExpression;
-import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.util.IOHelper.stripLineComments;
+
public class ModelWriterUriAsParametersTest {
@Test
@@ -62,7 +63,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route0.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route0.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -84,7 +85,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route1.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route1.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -111,7 +112,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route2.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route2.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -142,7 +143,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route3.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route3.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -164,7 +165,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route4.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route4.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -190,7 +191,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route5.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route5.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -214,7 +215,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route6.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route6.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -247,7 +248,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(mcc.getRouteDefinition("myRoute7"));
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route7.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route7.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -281,7 +282,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRoutesDefinition(routes);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route8.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route8.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
@@ -302,7 +303,7 @@ public class ModelWriterUriAsParametersTest {
writer.writeRouteDefinition(route);
String out = sw.toString();
- String expected = IOHelper.loadText(new FileInputStream("src/test/resources/route9.yaml"));
+ String expected = stripLineComments(Paths.get("src/test/resources/route9.yaml"), "#", true);
Assertions.assertEquals(expected, out);
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
index 5a1953dafd7..4a1a38c6cb9 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
@@ -31,12 +31,12 @@ class LineNumberTest extends YamlTestSupport {
loadRoutes '''
- from:
uri: "direct:start"
- steps:
+ steps:
- log:
logging-level: "ERROR"
message: "test"
log-name: "yaml"
- - to: "direct:result"
+ - to: "direct:result"
'''
then:
context.routeDefinitions.size() == 1
@@ -91,30 +91,30 @@ class LineNumberTest extends YamlTestSupport {
with(context.routeDefinitions[0].input, FromDefinition) {
uri == "quartz:foo?cron={{myCron}}"
- lineNumber == 20
+ lineNumber == 21
}
with(context.routeDefinitions[0].outputs[0], LogDefinition) {
message == 'Start'
- lineNumber == 22
+ lineNumber == 23
}
with(context.routeDefinitions[0].outputs[1], ToDefinition) {
uri == "bean:myBean?method=hello"
- lineNumber == 23
+ lineNumber == 24
}
with(context.routeDefinitions[0].outputs[3], ToDefinition) {
uri == "bean:myBean?method=bye"
- lineNumber == 25
+ lineNumber == 26
}
with(context.routeDefinitions[0].outputs[4], LogDefinition) {
message == '${body}'
- lineNumber == 26
+ lineNumber == 27
}
with(context.routeDefinitions[0].outputs[5], ChoiceDefinition) {
- lineNumber == 27
+ lineNumber == 28
}
with(context.routeDefinitions[0].outputs[6], LogDefinition) {
message == '${header.textProp}'
- lineNumber == 39
+ lineNumber == 40
}
}
@@ -129,30 +129,30 @@ class LineNumberTest extends YamlTestSupport {
with(context.routeDefinitions[0].input, FromDefinition) {
uri == "quartz:foo?cron={{myCron}}"
- lineNumber == 22
+ lineNumber == 23
}
with(context.routeDefinitions[0].outputs[0], LogDefinition) {
message == 'Start'
- lineNumber == 25
+ lineNumber == 26
}
with(context.routeDefinitions[0].outputs[1], ToDefinition) {
uri == "bean:myBean?method=hello"
- lineNumber == 26
+ lineNumber == 27
}
with(context.routeDefinitions[0].outputs[3], ToDefinition) {
uri == "bean:myBean?method=bye"
- lineNumber == 30
+ lineNumber == 31
}
with(context.routeDefinitions[0].outputs[4], LogDefinition) {
message == '${body}'
- lineNumber == 31
+ lineNumber == 32
}
with(context.routeDefinitions[0].outputs[5], ChoiceDefinition) {
- lineNumber == 33 // TODO: should be 32
+ lineNumber == 34 // TODO: should be 32
}
with(context.routeDefinitions[0].outputs[6], LogDefinition) {
message == '${header.textProp}'
- lineNumber == 49
+ lineNumber == 50
}
}
[camel] 01/18: CAMEL-19465 - Move Apache snapshots repository to a separate Maven profile for better build reproducibility
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 88759d58aa3dba727d7a8b83837d7fb4034a4d0e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 11:54:06 2023 +0200
CAMEL-19465 - Move Apache snapshots repository to a separate Maven
profile for better build reproducibility
---
Jenkinsfile.deploy | 2 +-
pom.xml | 27 ++++++++++++++++-----------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 18ca2c4e456..cba5f0767b6 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -69,7 +69,7 @@ pipeline {
}
}
steps {
- sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true clean deploy"
+ sh "./mvnw $MAVEN_PARAMS -Pdeploy,apache-snapshots -Dmaven.test.skip.exec=true clean deploy"
}
}
diff --git a/pom.xml b/pom.xml
index 7448ed0841b..440a1350c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,17 +182,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <repository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots/</url>
- <name>Apache Snapshot Repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -757,5 +746,21 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>apache-snapshots</id>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots/</url>
+ <name>Apache Snapshot Repo</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
</project>
[camel] 10/18: CAMEL-19461 - Enable license-maven-plugin's format mojo in full profile
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 50314d12312686bc88fac2cafba22c6095d1ceb3
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Jun 19 16:32:58 2023 +0200
CAMEL-19461 - Enable license-maven-plugin's format mojo in full profile
---
.../camel/support/builder/ExpressionBuilder.java | 2 +-
pom.xml | 108 +++++++++++----------
2 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 136a206b3c1..cb12a4c7285 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -2054,7 +2054,7 @@ public class ExpressionBuilder {
return null;
} else if (body.startsWith("{") && body.endsWith("}") || body.startsWith("[") && body.endsWith("]")) {
return Jsoner.prettyPrint(body); //json
- } else if(body.startsWith("<") && body.endsWith(">")) {
+ } else if (body.startsWith("<") && body.endsWith(">")) {
return ExpressionBuilder.prettyXml(body); //xml
}
diff --git a/pom.xml b/pom.xml
index 17ef5a0199d..bed94c8d522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
<jaxb-osgi-version>4.0.1</jaxb-osgi-version>
<jaxb-xjc-version>4.0.1</jaxb-xjc-version>
<jaxb-jxc-version>4.0.1</jaxb-jxc-version>
- <mycila-license-version>3.0</mycila-license-version>
+ <mycila-license-version>4.2</mycila-license-version>
<gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
<groovy-version>4.0.12</groovy-version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
@@ -257,6 +257,48 @@
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>${mycila-license-version}</version>
+ <configuration>
+ <failIfUnknown>true</failIfUnknown>
+ <header>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/header.txt</header>
+ <excludes>
+ <exclude>KEYS</exclude>
+ <exclude>**/NOTICE</exclude>
+ <exclude>**/LICENSE</exclude>
+ <exclude>**/NOTICE.txt</exclude>
+ <exclude>**/LICENSE.txt</exclude>
+ <exclude>doap.rdf</exclude>
+ <exclude>**/README</exclude>
+ <exclude>**/*.adoc</exclude>
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/cacerts</exclude>
+ <exclude>**/*.p12</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.mp3</exclude>
+ <exclude>**/*.mp4</exclude>
+ <exclude>.mvn/**</exclude>
+ <exclude>mvnw*</exclude>
+ <exclude>**/META-INF/persistence*.xsd</exclude>
+ <exclude>camel-sbom/*.xml</exclude>
+ </excludes>
+ <mapping>
+ <java>SLASHSTAR_STYLE</java>
+ <properties>CAMEL_PROPERTIES_STYLE</properties>
+ <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
+ <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>
+ <Jenkinsfile.deploy>SLASHSTAR_STYLE</Jenkinsfile.deploy>
+ <Jenkinsfile.jdk17>SLASHSTAR_STYLE</Jenkinsfile.jdk17>
+ <Jenkinsfile.ppc64le>SLASHSTAR_STYLE</Jenkinsfile.ppc64le>
+ <Jenkinsfile.s390x>SLASHSTAR_STYLE</Jenkinsfile.s390x>
+ </mapping>
+ <headerDefinitions>
+ <headerDefinition>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/license-properties-headerdefinition.xml</headerDefinition>
+ </headerDefinitions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -705,57 +747,6 @@
</profile>
<profile>
- <id>license</id>
- <build>
- <defaultGoal>license:format</defaultGoal>
- <plugins>
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>${mycila-license-version}</version>
- <configuration>
- <header>header.txt</header>
- <excludes>
- <exclude>KEYS</exclude>
- <exclude>**/NOTICE</exclude>
- <exclude>**/LICENSE</exclude>
- <exclude>**/NOTICE.txt</exclude>
- <exclude>**/LICENSE.txt</exclude>
- <exclude>doap.rdf</exclude>
- <exclude>**/README</exclude>
- <exclude>**/*.adoc</exclude>
- <exclude>**/node_modules/**</exclude>
- <exclude>**/cacerts</exclude>
- <exclude>**/*.p12</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.mp3</exclude>
- <exclude>**/*.mp4</exclude>
- <exclude>.mvn/**</exclude>
- <exclude>mvnw*</exclude>
- <exclude>**/META-INF/persistence*.xsd</exclude>
- </excludes>
- <mapping>
- <java>SLASHSTAR_STYLE</java>
- <properties>CAMEL_PROPERTIES_STYLE</properties>
- <spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
- <spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>
- </mapping>
- <headerDefinitions>
- <headerDefinition>license-properties-headerdefinition.xml</headerDefinition>
- </headerDefinitions>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>sbom</id>
<build>
<plugins>
@@ -810,6 +801,19 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-format</id>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
[camel] 13/18: CAMEL-19461 - Reformat license headers with the new configuration
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 32f3f4b405e33dfa1c4bdaf2e1ba29a3a4fc535a
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 20 15:08:26 2023 +0200
CAMEL-19461 - Reformat license headers with the new configuration
---
Jenkinsfile.deploy | 27 +++++++--------
Jenkinsfile.jdk17 | 27 +++++++--------
Jenkinsfile.ppc64le | 27 +++++++--------
Jenkinsfile.s390x | 27 +++++++--------
buildingtools/src/main/resources/camel-eclipse-pmd | 32 +++++++++---------
camel-dependencies/pom.xml | 16 ---------
.../src/main/resources/mdnDescription.vm | 32 +++++++++---------
.../as2/AS2ClientManagerEndpointConfiguration.java | 1 -
.../as2/AS2ServerManagerEndpointConfiguration.java | 1 -
.../component/as2/internal/AS2ApiCollection.java | 1 -
.../camel/component/as2/internal/AS2ApiName.java | 1 -
.../as2/internal/AS2ClientManagerApiMethod.java | 1 -
.../as2/internal/AS2ServerManagerApiMethod.java | 1 -
.../camel-atom/src/test/data/empty-feed.atom | 4 ++-
components/camel-atom/src/test/data/feed.atom | 4 ++-
.../camel-atom/src/test/data/unsortedfeed.atom | 4 ++-
.../camel-azure-storage-datalake/pom.xml | 4 +++
...CollaborationsManagerEndpointConfiguration.java | 1 -
.../BoxCommentsManagerEndpointConfiguration.java | 1 -
.../BoxEventLogsManagerEndpointConfiguration.java | 1 -
.../box/BoxEventsManagerEndpointConfiguration.java | 1 -
.../box/BoxFilesManagerEndpointConfiguration.java | 1 -
.../BoxFoldersManagerEndpointConfiguration.java | 1 -
.../box/BoxGroupsManagerEndpointConfiguration.java | 1 -
.../box/BoxSearchManagerEndpointConfiguration.java | 1 -
.../box/BoxTasksManagerEndpointConfiguration.java | 1 -
.../box/BoxUsersManagerEndpointConfiguration.java | 1 -
.../component/box/internal/BoxApiCollection.java | 1 -
.../camel/component/box/internal/BoxApiName.java | 1 -
.../BoxCollaborationsManagerApiMethod.java | 1 -
.../box/internal/BoxCommentsManagerApiMethod.java | 1 -
.../box/internal/BoxEventLogsManagerApiMethod.java | 1 -
.../box/internal/BoxEventsManagerApiMethod.java | 1 -
.../box/internal/BoxFilesManagerApiMethod.java | 1 -
.../box/internal/BoxFoldersManagerApiMethod.java | 1 -
.../box/internal/BoxGroupsManagerApiMethod.java | 1 -
.../box/internal/BoxSearchManagerApiMethod.java | 1 -
.../box/internal/BoxTasksManagerApiMethod.java | 1 -
.../box/internal/BoxUsersManagerApiMethod.java | 1 -
.../AddOnGatewayEndpointConfiguration.java | 1 -
.../AddressGatewayEndpointConfiguration.java | 1 -
.../ClientTokenGatewayEndpointConfiguration.java | 1 -
...rdVerificationGatewayEndpointConfiguration.java | 1 -
.../CustomerGatewayEndpointConfiguration.java | 1 -
.../DiscountGatewayEndpointConfiguration.java | 1 -
.../DisputeGatewayEndpointConfiguration.java | 1 -
...DocumentUploadGatewayEndpointConfiguration.java | 1 -
...erchantAccountGatewayEndpointConfiguration.java | 1 -
.../PaymentMethodGatewayEndpointConfiguration.java | 1 -
...entMethodNonceGatewayEndpointConfiguration.java | 1 -
.../PlanGatewayEndpointConfiguration.java | 1 -
.../ReportGatewayEndpointConfiguration.java | 1 -
...ntBatchSummaryGatewayEndpointConfiguration.java | 1 -
.../SubscriptionGatewayEndpointConfiguration.java | 1 -
.../TransactionGatewayEndpointConfiguration.java | 1 -
...okNotificationGatewayEndpointConfiguration.java | 1 -
.../braintree/internal/AddOnGatewayApiMethod.java | 1 -
.../internal/AddressGatewayApiMethod.java | 1 -
.../braintree/internal/BraintreeApiCollection.java | 1 -
.../braintree/internal/BraintreeApiName.java | 1 -
.../internal/ClientTokenGatewayApiMethod.java | 1 -
.../CreditCardVerificationGatewayApiMethod.java | 1 -
.../internal/CustomerGatewayApiMethod.java | 1 -
.../internal/DiscountGatewayApiMethod.java | 1 -
.../internal/DisputeGatewayApiMethod.java | 1 -
.../internal/DocumentUploadGatewayApiMethod.java | 1 -
.../internal/MerchantAccountGatewayApiMethod.java | 1 -
.../internal/PaymentMethodGatewayApiMethod.java | 1 -
.../PaymentMethodNonceGatewayApiMethod.java | 1 -
.../braintree/internal/PlanGatewayApiMethod.java | 1 -
.../braintree/internal/ReportGatewayApiMethod.java | 1 -
.../SettlementBatchSummaryGatewayApiMethod.java | 1 -
.../internal/SubscriptionGatewayApiMethod.java | 1 -
.../internal/TransactionGatewayApiMethod.java | 1 -
.../WebhookNotificationGatewayApiMethod.java | 1 -
.../src/test/resources/BasicDataSet.cql | 17 ++++++++++
.../src/test/resources/IdempotentDataSet.cql | 17 ++++++++++
.../src/test/resources/NamedIdempotentDataSet.cql | 17 ++++++++++
.../src/test/resources/initScript.cql | 17 ++++++++++
.../camel/component/cxf/jaxrs/testbean/jaxb.index | 6 ++--
.../src/test/resources/HelloWorld.wsdl | 2 +-
.../src/test/resources/MultiPartTest.wsdl | 18 ++++++++++
.../camel-cxf-soap/src/test/resources/bare.wsdl | 2 +-
.../camel-cxf-soap/src/test/resources/order.wsdl | 4 ++-
.../src/test/resources/person-non-wrapper.wsdl | 2 +-
.../camel-cxf-soap/src/test/resources/person.wsdl | 8 ++---
.../src/test/resources/pizza_service.wsdl | 32 +++++++++---------
.../src/test/resources/soap_header.wsdl | 32 +++++++++---------
.../src/main/resources/META-INF/spring.handlers | 36 +++++++++-----------
.../src/main/resources/META-INF/spring.schemas | 36 +++++++++-----------
.../camel/component/cxf/jaxrs/testbean/jaxb.index | 6 ++--
components/camel-cxf/camel-cxf-spring-soap/rm.sh | 17 ++++++++++
.../src/main/resources/META-INF/spring.handlers | 36 +++++++++-----------
.../src/main/resources/META-INF/spring.schemas | 36 +++++++++-----------
.../src/test/resources/GetToken.wsdl | 2 +-
.../src/test/resources/HelloWorld.wsdl | 2 +-
.../src/test/resources/MultiPartTest.wsdl | 18 ++++++++++
.../src/test/resources/bare.wsdl | 2 +-
.../src/test/resources/hello/HelloWorld-DOC.wsdl | 2 +-
.../src/test/resources/hello_world_wssec.wsdl | 32 +++++++++---------
.../src/test/resources/mtom.wsdl | 32 +++++++++---------
.../src/test/resources/order.wsdl | 4 ++-
.../src/test/resources/person-non-wrapper.wsdl | 2 +-
.../src/test/resources/person.wsdl | 8 ++---
.../src/test/resources/pizza_service.wsdl | 32 +++++++++---------
.../src/test/resources/soap_header.wsdl | 32 +++++++++---------
.../src/main/resources/META-INF/spring.handlers | 36 +++++++++-----------
.../src/main/resources/META-INF/spring.schemas | 36 +++++++++-----------
.../src/test/resources/person.wsdl | 8 ++---
.../src/test/resources/person.wsdl | 8 ++---
.../dhis2/Dhis2DeleteEndpointConfiguration.java | 1 -
.../dhis2/Dhis2GetEndpointConfiguration.java | 1 -
.../dhis2/Dhis2PostEndpointConfiguration.java | 1 -
.../dhis2/Dhis2PutEndpointConfiguration.java | 1 -
.../Dhis2ResourceTablesEndpointConfiguration.java | 1 -
.../dhis2/internal/Dhis2ApiCollection.java | 1 -
.../component/dhis2/internal/Dhis2ApiName.java | 1 -
.../dhis2/internal/Dhis2DeleteApiMethod.java | 1 -
.../dhis2/internal/Dhis2GetApiMethod.java | 1 -
.../dhis2/internal/Dhis2PostApiMethod.java | 1 -
.../dhis2/internal/Dhis2PutApiMethod.java | 1 -
.../internal/Dhis2ResourceTablesApiMethod.java | 1 -
components/camel-djl/pom.xml | 3 +-
.../FhirCapabilitiesEndpointConfiguration.java | 1 -
.../fhir/FhirCreateEndpointConfiguration.java | 1 -
.../fhir/FhirDeleteEndpointConfiguration.java | 1 -
.../fhir/FhirHistoryEndpointConfiguration.java | 1 -
.../fhir/FhirLoadPageEndpointConfiguration.java | 1 -
.../fhir/FhirMetaEndpointConfiguration.java | 1 -
.../fhir/FhirOperationEndpointConfiguration.java | 1 -
.../fhir/FhirPatchEndpointConfiguration.java | 1 -
.../fhir/FhirReadEndpointConfiguration.java | 1 -
.../fhir/FhirSearchEndpointConfiguration.java | 1 -
.../fhir/FhirTransactionEndpointConfiguration.java | 1 -
.../fhir/FhirUpdateEndpointConfiguration.java | 1 -
.../fhir/FhirValidateEndpointConfiguration.java | 1 -
.../component/fhir/internal/FhirApiCollection.java | 1 -
.../camel/component/fhir/internal/FhirApiName.java | 1 -
.../fhir/internal/FhirCapabilitiesApiMethod.java | 1 -
.../fhir/internal/FhirCreateApiMethod.java | 1 -
.../fhir/internal/FhirDeleteApiMethod.java | 1 -
.../fhir/internal/FhirHistoryApiMethod.java | 1 -
.../fhir/internal/FhirLoadPageApiMethod.java | 1 -
.../component/fhir/internal/FhirMetaApiMethod.java | 1 -
.../fhir/internal/FhirOperationApiMethod.java | 1 -
.../fhir/internal/FhirPatchApiMethod.java | 1 -
.../component/fhir/internal/FhirReadApiMethod.java | 1 -
.../fhir/internal/FhirSearchApiMethod.java | 1 -
.../fhir/internal/FhirTransactionApiMethod.java | 1 -
.../fhir/internal/FhirUpdateApiMethod.java | 1 -
.../fhir/internal/FhirValidateApiMethod.java | 1 -
.../calendar/CalendarAclEndpointConfiguration.java | 1 -
.../CalendarCalendarListEndpointConfiguration.java | 1 -
.../CalendarCalendarsEndpointConfiguration.java | 1 -
.../CalendarChannelsEndpointConfiguration.java | 1 -
.../CalendarColorsEndpointConfiguration.java | 1 -
.../CalendarEventsEndpointConfiguration.java | 1 -
.../CalendarFreebusyEndpointConfiguration.java | 1 -
.../CalendarSettingsEndpointConfiguration.java | 1 -
.../calendar/internal/CalendarAclApiMethod.java | 1 -
.../internal/CalendarCalendarListApiMethod.java | 1 -
.../internal/CalendarCalendarsApiMethod.java | 1 -
.../internal/CalendarChannelsApiMethod.java | 1 -
.../calendar/internal/CalendarColorsApiMethod.java | 1 -
.../calendar/internal/CalendarEventsApiMethod.java | 1 -
.../internal/CalendarFreebusyApiMethod.java | 1 -
.../internal/CalendarSettingsApiMethod.java | 1 -
.../internal/GoogleCalendarApiCollection.java | 1 -
.../calendar/internal/GoogleCalendarApiName.java | 1 -
.../drive/DriveAboutEndpointConfiguration.java | 1 -
.../drive/DriveAppsEndpointConfiguration.java | 1 -
.../drive/DriveChangesEndpointConfiguration.java | 1 -
.../drive/DriveChannelsEndpointConfiguration.java | 1 -
.../drive/DriveChildrenEndpointConfiguration.java | 1 -
.../drive/DriveCommentsEndpointConfiguration.java | 1 -
.../drive/DriveDrivesEndpointConfiguration.java | 1 -
.../drive/DriveFilesEndpointConfiguration.java | 1 -
.../drive/DriveParentsEndpointConfiguration.java | 1 -
.../DrivePermissionsEndpointConfiguration.java | 1 -
.../DrivePropertiesEndpointConfiguration.java | 1 -
.../drive/DriveRepliesEndpointConfiguration.java | 1 -
.../drive/DriveRevisionsEndpointConfiguration.java | 1 -
.../DriveTeamdrivesEndpointConfiguration.java | 1 -
.../google/drive/internal/DriveAboutApiMethod.java | 1 -
.../google/drive/internal/DriveAppsApiMethod.java | 1 -
.../drive/internal/DriveChangesApiMethod.java | 1 -
.../drive/internal/DriveChannelsApiMethod.java | 1 -
.../drive/internal/DriveChildrenApiMethod.java | 1 -
.../drive/internal/DriveCommentsApiMethod.java | 1 -
.../drive/internal/DriveDrivesApiMethod.java | 1 -
.../google/drive/internal/DriveFilesApiMethod.java | 1 -
.../drive/internal/DriveParentsApiMethod.java | 1 -
.../drive/internal/DrivePermissionsApiMethod.java | 1 -
.../drive/internal/DrivePropertiesApiMethod.java | 1 -
.../drive/internal/DriveRepliesApiMethod.java | 1 -
.../drive/internal/DriveRevisionsApiMethod.java | 1 -
.../drive/internal/DriveTeamdrivesApiMethod.java | 1 -
.../drive/internal/GoogleDriveApiCollection.java | 1 -
.../google/drive/internal/GoogleDriveApiName.java | 1 -
.../GmailUsersDraftsEndpointConfiguration.java | 1 -
.../mail/GmailUsersEndpointConfiguration.java | 1 -
.../GmailUsersHistoryEndpointConfiguration.java | 1 -
.../GmailUsersLabelsEndpointConfiguration.java | 1 -
...rsMessagesAttachmentsEndpointConfiguration.java | 1 -
.../GmailUsersMessagesEndpointConfiguration.java | 1 -
.../GmailUsersThreadsEndpointConfiguration.java | 1 -
.../google/mail/internal/GmailUsersApiMethod.java | 1 -
.../mail/internal/GmailUsersDraftsApiMethod.java | 1 -
.../mail/internal/GmailUsersHistoryApiMethod.java | 1 -
.../mail/internal/GmailUsersLabelsApiMethod.java | 1 -
.../mail/internal/GmailUsersMessagesApiMethod.java | 1 -
.../GmailUsersMessagesAttachmentsApiMethod.java | 1 -
.../mail/internal/GmailUsersThreadsApiMethod.java | 1 -
.../mail/internal/GoogleMailApiCollection.java | 1 -
.../google/mail/internal/GoogleMailApiName.java | 1 -
.../SheetsSpreadsheetsEndpointConfiguration.java | 1 -
...etsSpreadsheetsValuesEndpointConfiguration.java | 1 -
.../sheets/internal/GoogleSheetsApiCollection.java | 1 -
.../sheets/internal/GoogleSheetsApiName.java | 1 -
.../internal/SheetsSpreadsheetsApiMethod.java | 1 -
.../SheetsSpreadsheetsValuesApiMethod.java | 1 -
.../camel-grpc/src/test/proto/pingpong.proto | 2 +-
.../camel-hyperledger-aries/docker-compose.yml | 4 +--
components/camel-irc/src/test/unrealircd/ircd.motd | 3 +-
.../resources/org/apache/camel/example/jaxb.index | 6 ++--
.../apache/camel/component/ldap/LdapRouteTest.ldif | 38 +++++++++-------------
.../apache/camel/component/ldif/AddDuplicate.ldif | 38 +++++++++-------------
.../camel/component/ldif/AddDuplicateSetup.ldif | 38 +++++++++-------------
.../org/apache/camel/component/ldif/AddOne.ldif | 38 +++++++++-------------
.../org/apache/camel/component/ldif/DeleteOne.ldif | 38 +++++++++-------------
.../camel/component/ldif/DeleteOneSetup.ldif | 38 +++++++++-------------
.../org/apache/camel/component/ldif/ModDn.ldif | 38 +++++++++-------------
.../apache/camel/component/ldif/ModDnSetup.ldif | 38 +++++++++-------------
.../org/apache/camel/component/ldif/ModRdn.ldif | 38 +++++++++-------------
.../apache/camel/component/ldif/ModRdnSetup.ldif | 38 +++++++++-------------
.../org/apache/camel/component/ldif/Modify.ldif | 38 +++++++++-------------
.../apache/camel/component/ldif/ModifySetup.ldif | 38 +++++++++-------------
.../src/test/resources/another.mustache | 16 +++++++++
.../src/test/resources/child.mustache | 16 +++++++++
.../src/test/resources/included.mustache | 16 +++++++++
.../src/test/resources/includer.mustache | 16 +++++++++
.../src/test/resources/letter.mustache | 16 +++++++++
.../src/test/resources/parent.mustache | 16 +++++++++
.../src/test/resources/simple.mustache | 16 +++++++++
.../camel-mvel/src/test/resources/template.mvel | 16 +++++++++
.../camel-mvel/src/test/resources/template2.mvel | 16 +++++++++
.../olingo2/Olingo2AppEndpointConfiguration.java | 1 -
.../olingo2/internal/Olingo2ApiCollection.java | 1 -
.../component/olingo2/internal/Olingo2ApiName.java | 1 -
.../olingo2/internal/Olingo2AppApiMethod.java | 1 -
.../olingo4/Olingo4AppEndpointConfiguration.java | 1 -
.../olingo4/internal/Olingo4ApiCollection.java | 1 -
.../component/olingo4/internal/Olingo4ApiName.java | 1 -
.../olingo4/internal/Olingo4AppApiMethod.java | 1 -
.../src/test/proto/addressbook.proto | 16 +++++++++
.../src/test/resources/alt-openapi.yaml | 17 ++++++++++
.../src/test/resources/alt-petstore.yaml | 17 ++++++++++
.../src/test/resources/openapi-v3.yaml | 17 ++++++++++
.../src/test/resources/openapi.yaml | 17 ++++++++++
.../src/test/resources/petstore-3.1.yaml | 17 ++++++++++
...obot_with_camel_exchange_value_as_numeric.robot | 3 ++
...robot_with_camel_exchange_value_as_string.robot | 3 ++
...send_no_camel_exchnage_only_camel_configs.robot | 4 ++-
.../robotframework/set_variable_camel_body.robot | 2 ++
.../set_variable_camel_exchange.robot | 2 ++
.../robotframework/set_variable_camel_header.robot | 2 ++
.../set_variable_camel_property.robot | 2 ++
components/camel-rocketmq/pom.xml | 29 +++++++++--------
.../src/main/resources/sobject-picklist.vm | 6 ++--
.../src/main/resources/sobject-pojo-optional.vm | 6 ++--
.../src/main/resources/sobject-pojo.vm | 6 ++--
.../resources/sobject-query-records-optional.vm | 6 ++--
.../src/main/resources/sobject-query-records.vm | 6 ++--
.../src/main/resources/sobject-picklist.vm | 6 ++--
.../src/main/resources/sobject-pojo-optional.vm | 6 ++--
.../src/main/resources/sobject-pojo.vm | 6 ++--
.../resources/sobject-query-records-optional.vm | 6 ++--
.../src/main/resources/sobject-query-records.vm | 6 ++--
.../src/test/resources/flight-info.vm | 32 +++++++++---------
.../test/resources/custom-resolver/title-rules.sch | 26 ++++++++-------
.../src/test/resources/sch/schematron-1.sch | 30 +++++++++--------
.../src/test/resources/sch/schematron-2.sch | 30 +++++++++--------
.../src/test/resources/sch/schematron-3.sch | 26 ++++++++-------
.../src/test/resources/securityconfig.ini | 26 +++++++--------
.../src/test/resources/data-dos.yaml | 17 ++++++++++
.../camel-snakeyaml/src/test/resources/data.yaml | 17 ++++++++++
.../camel/dataformat/soap/CustomerService.wsdl | 2 +-
.../camel/dataformat/soap/CustomerService2.wsdl | 2 +-
.../dataformat/soap/MultiPartCustomerService.wsdl | 2 +-
.../apache/camel/dataformat/soap/TestService.wsdl | 18 ++++++++++
.../src/main/resources/META-INF/spring.handlers | 36 +++++++++-----------
.../src/main/resources/META-INF/spring.schemas | 32 +++++++++---------
.../camel/component/spring/ws/jaxb/jaxb.index | 6 ++--
.../component/spring/ws/soap-header-transform.xslt | 18 ++++++++++
.../src/main/resources/META-INF/spring.handlers | 32 +++++++++---------
.../src/main/resources/META-INF/spring.schemas | 32 +++++++++---------
.../component/sql/stored/template/grammar/sspt.jj | 4 +--
.../sql/idempotentWithOrphanLockRemoval.sql | 17 ++++++++++
.../apache/camel/component/stax/model/jaxb.index | 6 ++--
.../src/test/resources/jsse/createCertificate.sh | 17 ++++++++++
.../twilio/AccountEndpointConfiguration.java | 1 -
...sDependentPhoneNumberEndpointConfiguration.java | 1 -
.../twilio/AddressEndpointConfiguration.java | 1 -
.../twilio/ApplicationEndpointConfiguration.java | 1 -
...blePhoneNumberCountryEndpointConfiguration.java | 1 -
...oneNumberCountryLocalEndpointConfiguration.java | 1 -
...neNumberCountryMobileEndpointConfiguration.java | 1 -
...NumberCountryTollFreeEndpointConfiguration.java | 1 -
.../twilio/CallEndpointConfiguration.java | 1 -
.../twilio/CallFeedbackEndpointConfiguration.java | 1 -
.../CallFeedbackSummaryEndpointConfiguration.java | 1 -
.../CallNotificationEndpointConfiguration.java | 1 -
.../twilio/CallRecordingEndpointConfiguration.java | 1 -
.../twilio/ConferenceEndpointConfiguration.java | 1 -
...ConferenceParticipantEndpointConfiguration.java | 1 -
.../twilio/ConnectAppEndpointConfiguration.java | 1 -
.../IncomingPhoneNumberEndpointConfiguration.java | 1 -
...omingPhoneNumberLocalEndpointConfiguration.java | 1 -
...mingPhoneNumberMobileEndpointConfiguration.java | 1 -
...ngPhoneNumberTollFreeEndpointConfiguration.java | 1 -
.../component/twilio/KeyEndpointConfiguration.java | 1 -
.../twilio/MessageEndpointConfiguration.java | 1 -
.../MessageFeedbackEndpointConfiguration.java | 1 -
.../twilio/MessageMediaEndpointConfiguration.java | 1 -
.../twilio/NewKeyEndpointConfiguration.java | 1 -
.../twilio/NewSigningKeyEndpointConfiguration.java | 1 -
.../twilio/NotificationEndpointConfiguration.java | 1 -
.../OutgoingCallerIdEndpointConfiguration.java | 1 -
.../twilio/QueueEndpointConfiguration.java | 1 -
.../twilio/QueueMemberEndpointConfiguration.java | 1 -
.../RecordingAddOnResultEndpointConfiguration.java | 1 -
...ingAddOnResultPayloadEndpointConfiguration.java | 1 -
.../twilio/RecordingEndpointConfiguration.java | 1 -
...ecordingTranscriptionEndpointConfiguration.java | 1 -
.../twilio/ShortCodeEndpointConfiguration.java | 1 -
.../twilio/SigningKeyEndpointConfiguration.java | 1 -
.../twilio/SipCredentialEndpointConfiguration.java | 1 -
.../SipCredentialListEndpointConfiguration.java | 1 -
...CredentialListMappingEndpointConfiguration.java | 1 -
.../twilio/SipDomainEndpointConfiguration.java | 1 -
...essControlListMappingEndpointConfiguration.java | 1 -
...ipIpAccessControlListEndpointConfiguration.java | 1 -
...sControlListIpAddressEndpointConfiguration.java | 1 -
.../twilio/TokenEndpointConfiguration.java | 1 -
.../twilio/TranscriptionEndpointConfiguration.java | 1 -
.../UsageRecordAllTimeEndpointConfiguration.java | 1 -
.../UsageRecordDailyEndpointConfiguration.java | 1 -
.../twilio/UsageRecordEndpointConfiguration.java | 1 -
.../UsageRecordLastMonthEndpointConfiguration.java | 1 -
.../UsageRecordMonthlyEndpointConfiguration.java | 1 -
.../UsageRecordThisMonthEndpointConfiguration.java | 1 -
.../UsageRecordTodayEndpointConfiguration.java | 1 -
.../UsageRecordYearlyEndpointConfiguration.java | 1 -
.../UsageRecordYesterdayEndpointConfiguration.java | 1 -
.../twilio/UsageTriggerEndpointConfiguration.java | 1 -
.../ValidationRequestEndpointConfiguration.java | 1 -
.../twilio/internal/AccountApiMethod.java | 1 -
.../twilio/internal/AddressApiMethod.java | 1 -
.../AddressDependentPhoneNumberApiMethod.java | 1 -
.../twilio/internal/ApplicationApiMethod.java | 1 -
.../AvailablePhoneNumberCountryApiMethod.java | 1 -
.../AvailablePhoneNumberCountryLocalApiMethod.java | 1 -
...AvailablePhoneNumberCountryMobileApiMethod.java | 1 -
...ailablePhoneNumberCountryTollFreeApiMethod.java | 1 -
.../component/twilio/internal/CallApiMethod.java | 1 -
.../twilio/internal/CallFeedbackApiMethod.java | 1 -
.../internal/CallFeedbackSummaryApiMethod.java | 1 -
.../twilio/internal/CallNotificationApiMethod.java | 1 -
.../twilio/internal/CallRecordingApiMethod.java | 1 -
.../twilio/internal/ConferenceApiMethod.java | 1 -
.../internal/ConferenceParticipantApiMethod.java | 1 -
.../twilio/internal/ConnectAppApiMethod.java | 1 -
.../internal/IncomingPhoneNumberApiMethod.java | 1 -
.../IncomingPhoneNumberLocalApiMethod.java | 1 -
.../IncomingPhoneNumberMobileApiMethod.java | 1 -
.../IncomingPhoneNumberTollFreeApiMethod.java | 1 -
.../component/twilio/internal/KeyApiMethod.java | 1 -
.../twilio/internal/MessageApiMethod.java | 1 -
.../twilio/internal/MessageFeedbackApiMethod.java | 1 -
.../twilio/internal/MessageMediaApiMethod.java | 1 -
.../component/twilio/internal/NewKeyApiMethod.java | 1 -
.../twilio/internal/NewSigningKeyApiMethod.java | 1 -
.../twilio/internal/NotificationApiMethod.java | 1 -
.../twilio/internal/OutgoingCallerIdApiMethod.java | 1 -
.../component/twilio/internal/QueueApiMethod.java | 1 -
.../twilio/internal/QueueMemberApiMethod.java | 1 -
.../internal/RecordingAddOnResultApiMethod.java | 1 -
.../RecordingAddOnResultPayloadApiMethod.java | 1 -
.../twilio/internal/RecordingApiMethod.java | 1 -
.../internal/RecordingTranscriptionApiMethod.java | 1 -
.../twilio/internal/ShortCodeApiMethod.java | 1 -
.../twilio/internal/SigningKeyApiMethod.java | 1 -
.../twilio/internal/SipCredentialApiMethod.java | 1 -
.../internal/SipCredentialListApiMethod.java | 1 -
.../twilio/internal/SipDomainApiMethod.java | 1 -
.../SipDomainCredentialListMappingApiMethod.java | 1 -
...pDomainIpAccessControlListMappingApiMethod.java | 1 -
.../internal/SipIpAccessControlListApiMethod.java | 1 -
.../SipIpAccessControlListIpAddressApiMethod.java | 1 -
.../component/twilio/internal/TokenApiMethod.java | 1 -
.../twilio/internal/TranscriptionApiMethod.java | 1 -
.../twilio/internal/TwilioApiCollection.java | 1 -
.../component/twilio/internal/TwilioApiName.java | 1 -
.../internal/UsageRecordAllTimeApiMethod.java | 1 -
.../twilio/internal/UsageRecordApiMethod.java | 1 -
.../twilio/internal/UsageRecordDailyApiMethod.java | 1 -
.../internal/UsageRecordLastMonthApiMethod.java | 1 -
.../internal/UsageRecordMonthlyApiMethod.java | 1 -
.../internal/UsageRecordThisMonthApiMethod.java | 1 -
.../twilio/internal/UsageRecordTodayApiMethod.java | 1 -
.../internal/UsageRecordYearlyApiMethod.java | 1 -
.../internal/UsageRecordYesterdayApiMethod.java | 1 -
.../twilio/internal/UsageTriggerApiMethod.java | 1 -
.../internal/ValidationRequestApiMethod.java | 1 -
.../camel/component/velocity/AppleTemplate.vm | 6 ++--
.../camel/component/velocity/BodyAsDomainObject.vm | 6 ++--
.../apache/camel/component/velocity/Concurrent.vm | 6 ++--
.../camel/component/velocity/OrangeTemplate.vm | 6 ++--
.../org/apache/camel/component/velocity/escape.vm | 6 ++--
.../org/apache/camel/component/velocity/example.vm | 6 ++--
.../org/apache/camel/component/velocity/header.vm | 6 ++--
.../org/apache/camel/component/velocity/letter.vm | 6 ++--
.../org/apache/camel/component/velocity/letter2.vm | 6 ++--
.../camel/component/velocity/letterWithParser.vm | 6 ++--
.../component/velocity/letterWithoutHeader.vm | 6 ++--
.../component/velocity/someValuesNotInExchange.vm | 6 ++--
.../org/apache/camel/component/xj/identity.xsl | 32 +++++++++---------
.../camel-xj/src/test/resources/hellojson2xml.xsl | 32 +++++++++---------
.../camel-xj/src/test/resources/helloxml2json.xsl | 32 +++++++++---------
.../component/xslt/extensions/extensions.xslt | 4 ++-
.../src/test/resources/data/test1_definition.bpmn | 18 ++++++++++
.../zendesk/ZendeskEndpointConfiguration.java | 1 -
.../zendesk/internal/ZendeskApiCollection.java | 1 -
.../zendesk/internal/ZendeskApiMethod.java | 1 -
.../component/zendesk/internal/ZendeskApiName.java | 1 -
components/fix-eip-xrefs.sh | 17 ++++++++++
.../org/apache/camel/util/split-choice.yaml | 17 ++++++++++
.../resources/org/apache/camel/util/transform.yaml | 17 ++++++++++
.../org/apache/camel/util/uri-as-parameters.yaml | 17 ++++++++++
core/camel-main/src/main/docs/main.adoc | 9 +++++
core/camel-yaml-io/src/test/resources/route0.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route0b.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route1.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route2.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route3.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route4.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route5.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route6.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route7.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route8.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route8b.yaml | 17 ++++++++++
core/camel-yaml-io/src/test/resources/route9.yaml | 17 ++++++++++
.../test/resources/routes/MyRoutesWithPackage.java | 16 +++++++++
.../routes/MyRoutesWithPackageAndLineComment.java | 16 +++++++++
dsl/camel-jbang/camel-jbang-container/Dockerfile | 22 +++++++------
.../main/resources/quarkus-docker/Dockerfile.jvm | 17 ++++++++++
.../resources/quarkus-docker/Dockerfile.legacy-jar | 17 ++++++++++
.../resources/quarkus-docker/Dockerfile.native | 17 ++++++++++
.../quarkus-docker/Dockerfile.native-micro | 17 ++++++++++
.../routes/routes-with-component-configuration.js | 16 +++++++++
.../resources/routes/routes-with-processors.js | 16 +++++++++
.../routes/routes-with-rest-configuration.js | 16 +++++++++
.../test/resources/routes/routes-with-rest-dsl.js | 16 +++++++++
.../src/test/resources/my-camel-k.yaml | 4 +--
.../src/test/resources/my-modeline.yaml | 4 +--
.../src/test/resources/my-route.yaml | 4 +--
.../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt | 2 +-
.../org/apache/camel/dsl/kotlin/support/MyBean.kt | 2 +-
.../org/apache/camel/dsl/yaml/MainTest.groovy | 2 +-
.../resources/kamelets/error-handler.kamelet.yaml | 4 +--
.../test/resources/kamelets/log-sink.kamelet.yaml | 5 +--
.../test/resources/kamelets/mySetBody.kamelet.yaml | 1 +
.../resources/kamelets/prefix-action.kamelet.yaml | 4 +--
.../kamelets/route-timer-source.kamelet.yaml | 4 +--
.../resources/kamelets/timer-source.kamelet.yaml | 4 +--
.../routes/rest-allowable-values-dsl.yaml | 17 ++++++++++
.../src/test/resources/routes/rest-dsl.yaml | 17 ++++++++++
.../src/test/resources/routes/routes.yaml | 1 +
.../src/test/resources/stuff/my-route-comment.yaml | 1 +
.../src/test/resources/stuff/my-route.yaml | 1 +
parent/pom.xml | 2 +-
.../camel/test/infra/artemis/services/Dockerfile | 23 +++++++------
.../pom.xml | 4 +++
test-infra/camel-test-infra-core/pom.xml | 32 +++++++++---------
.../test/infra/dispatch/router/services/Dockerfile | 23 +++++++------
.../org/apache/camel/itest/jetty/header.vm | 6 ++--
.../org/apache/camel/itest/jms/jaxb.index | 6 ++--
.../apache/camel/itest/restlet/example/jaxb.index | 6 ++--
.../src/test/resources/securityconfig.ini | 26 +++++++--------
.../test/resources/wsdl/CustomerService-1.0.0.wsdl | 4 ++-
.../wsdl/CustomerService_noSoapAction.wsdl | 4 ++-
.../src/test/resources/wsdl/hello_world.wsdl | 32 +++++++++---------
.../src/main/resources/api-collection.vm | 22 ++-----------
.../src/main/resources/api-endpoint-config.vm | 22 ++-----------
.../src/main/resources/api-method-enum.vm | 22 ++-----------
.../src/main/resources/api-name-enum.vm | 22 ++-----------
.../src/main/resources/api-route-test.vm | 22 ++-----------
.../src/test/resources/enriched-camel-spring.xsd | 18 ++++++++++
.../src/main/resources/annotation-options.mvel | 16 +++++++++
.../src/main/resources/component-header.mvel | 16 +++++++++
.../src/main/resources/component-options.mvel | 16 +++++++++
.../src/main/resources/dataformat-options.mvel | 16 +++++++++
.../src/main/resources/eip-options.mvel | 16 +++++++++
.../src/main/resources/language-options.mvel | 16 +++++++++
.../src/main/resources/main-options.mvel | 16 +++++++++
.../src/main/resources/readme-examples.mvel | 16 +++++++++
.../src/it/expanded-v3-yaml/src/spec/openapi.yaml | 17 ++++++++++
.../src/it/simple-v3-yaml/src/spec/openapi.yaml | 17 ++++++++++
.../camel/generator/openapi/petstore-v3.yaml | 17 ++++++++++
509 files changed, 2144 insertions(+), 1420 deletions(-)
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index cba5f0767b6..d30ac9c0965 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -1,22 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile.jdk17
index 5d7400ee6db..a04c9349957 100644
--- a/Jenkinsfile.jdk17
+++ b/Jenkinsfile.jdk17
@@ -1,22 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le
index 5b3ce865e74..d5e438cdf6d 100644
--- a/Jenkinsfile.ppc64le
+++ b/Jenkinsfile.ppc64le
@@ -1,22 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
def AGENT_LABEL = 'ppc64le'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 4138bf27969..2b95cea5193 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -1,22 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
def AGENT_LABEL = 's390x'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
diff --git a/buildingtools/src/main/resources/camel-eclipse-pmd b/buildingtools/src/main/resources/camel-eclipse-pmd
index f1bd7be03aa..37543fb80af 100644
--- a/buildingtools/src/main/resources/camel-eclipse-pmd
+++ b/buildingtools/src/main/resources/camel-eclipse-pmd
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<pmd>
<useProjectRuleSet>true</useProjectRuleSet>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 1c3aef5506b..0659179bb92 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -51,7 +51,6 @@
<trimStackTrace>false</trimStackTrace>
<sourcecheckExcludes></sourcecheckExcludes>
<sourcecheckExcludesComma></sourcecheckExcludesComma>
- <mycila-license-version>4.2</mycila-license-version>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
@@ -506,19 +505,4 @@
<zxing-version>3.5.0</zxing-version>
</properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>${mycila-license-version}</version>
- <configuration>
- <failIfUnknown>true</failIfUnknown>
- <header>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/header.txt</header>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
diff --git a/components/camel-as2/camel-as2-api/src/main/resources/mdnDescription.vm b/components/camel-as2/camel-as2-api/src/main/resources/mdnDescription.vm
index cd74601155e..f3b75cabb95 100644
--- a/components/camel-as2/camel-as2-api/src/main/resources/mdnDescription.vm
+++ b/components/camel-as2/camel-as2-api/src/main/resources/mdnDescription.vm
@@ -1,19 +1,19 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
MDN for -
Message ID: $requestHeaders["Message-Id"]
Subject: $requestHeaders["Subject"]
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
index cbbb73a3f8d..06906f6ae24 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
index 973a55126d7..c504a4753c7 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
index 9a456b4b20b..a26f911a412 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiName.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiName.java
index 0e47a9ba697..9bec76c5352 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiName.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ClientManagerApiMethod.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ClientManagerApiMethod.java
index 715db5ced4b..c23d6f81c16 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ClientManagerApiMethod.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ClientManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ServerManagerApiMethod.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ServerManagerApiMethod.java
index 035c0a177a7..7ee9b7ff256 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ServerManagerApiMethod.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ServerManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-atom/src/test/data/empty-feed.atom b/components/camel-atom/src/test/data/empty-feed.atom
index 9a3c9047903..6c976343e78 100644
--- a/components/camel-atom/src/test/data/empty-feed.atom
+++ b/components/camel-atom/src/test/data/empty-feed.atom
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?><?xml-stylesheet href="http://www.blogger.com/styles/atom.css" type="text/css"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/'>
<id>tag:blogger.com,1999:blog-637417304187784899</id>
diff --git a/components/camel-atom/src/test/data/feed.atom b/components/camel-atom/src/test/data/feed.atom
index bd2ce84414d..ce79de42e01 100644
--- a/components/camel-atom/src/test/data/feed.atom
+++ b/components/camel-atom/src/test/data/feed.atom
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?><?xml-stylesheet href="http://www.blogger.com/styles/atom.css" type="text/css"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/'>
<id>tag:blogger.com,1999:blog-637417304187784899</id>
diff --git a/components/camel-atom/src/test/data/unsortedfeed.atom b/components/camel-atom/src/test/data/unsortedfeed.atom
index 54656896580..605fb47e831 100644
--- a/components/camel-atom/src/test/data/unsortedfeed.atom
+++ b/components/camel-atom/src/test/data/unsortedfeed.atom
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="http://feeds.feedburner.com/~d/styles/atom10full.xsl" type="text/xsl" media="screen"?><?xml-stylesheet href="http://feeds.feedburner.com/~d/styles/itemcontent.css" type="text/css" media="screen"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -8,13 +9,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
<title type="text">Jon Anstey's Blog</title>
diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml b/components/camel-azure/camel-azure-storage-datalake/pom.xml
index b5cc96abee5..33421ed5521 100644
--- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
+++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
@@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
index ffd9ed7563c..c6ac8a2ba4d 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
index 354d4c42fa5..5251ffb84f0 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
index ad9697bae4c..3ab4be41c1d 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventsManagerEndpointConfiguration.java
index 46abd664199..226252245d3 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventsManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFilesManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFilesManagerEndpointConfiguration.java
index 9650c4acdb2..65ddc896b39 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFilesManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFilesManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFoldersManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFoldersManagerEndpointConfiguration.java
index fad7296ca81..cf72d32ca10 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFoldersManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxFoldersManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxGroupsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxGroupsManagerEndpointConfiguration.java
index b8ecf7d2269..28c37830854 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxGroupsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxGroupsManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxSearchManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxSearchManagerEndpointConfiguration.java
index d8bd195a6a0..70ed8a318fd 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxSearchManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxSearchManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxTasksManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxTasksManagerEndpointConfiguration.java
index f7f3b7ead48..26504387fd4 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxTasksManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxTasksManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxUsersManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxUsersManagerEndpointConfiguration.java
index 77a728bce30..9d96a61dc6b 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxUsersManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxUsersManagerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
index 195e11474d0..dbd1ba35d63 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiName.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiName.java
index 7220759b617..03d0fb33d87 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiName.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCollaborationsManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCollaborationsManagerApiMethod.java
index 570c9cb5c8f..13bbdcfdf31 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCollaborationsManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCollaborationsManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCommentsManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCommentsManagerApiMethod.java
index 3eaec0ddd04..43c52f1d67b 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCommentsManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxCommentsManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventLogsManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventLogsManagerApiMethod.java
index 7711309247e..2d143841fae 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventLogsManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventLogsManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventsManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventsManagerApiMethod.java
index 7210bc7c3e1..9f2ec56ce76 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventsManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxEventsManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFilesManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFilesManagerApiMethod.java
index ff985e07bb4..b1e3fff5347 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFilesManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFilesManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFoldersManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFoldersManagerApiMethod.java
index 7dce2b4502b..b2263e34c10 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFoldersManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxFoldersManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxGroupsManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxGroupsManagerApiMethod.java
index 7e469418a4e..1ae9b070f9c 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxGroupsManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxGroupsManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxSearchManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxSearchManagerApiMethod.java
index 5970634b3f8..b72d11e4cd2 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxSearchManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxSearchManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxTasksManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxTasksManagerApiMethod.java
index 7d0a0f3296c..e669d65ae7d 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxTasksManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxTasksManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxUsersManagerApiMethod.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxUsersManagerApiMethod.java
index 25fad423c84..a266267a3c0 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxUsersManagerApiMethod.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxUsersManagerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddOnGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddOnGatewayEndpointConfiguration.java
index c67e6d2c179..74315a762c6 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddOnGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddOnGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddressGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddressGatewayEndpointConfiguration.java
index 238892d3e09..c26f565fd5e 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddressGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/AddressGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ClientTokenGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ClientTokenGatewayEndpointConfiguration.java
index d2b40f37332..b25056c4db4 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ClientTokenGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ClientTokenGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayEndpointConfiguration.java
index a45a1573d9a..3c9e924560c 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CustomerGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CustomerGatewayEndpointConfiguration.java
index 4274f3210fa..85e261b4e0c 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CustomerGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/CustomerGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DiscountGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DiscountGatewayEndpointConfiguration.java
index de0d22bc523..fa96a23bf14 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DiscountGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DiscountGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DisputeGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DisputeGatewayEndpointConfiguration.java
index c505214f5f5..209a9ca864a 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DisputeGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DisputeGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DocumentUploadGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DocumentUploadGatewayEndpointConfiguration.java
index 9d7527b97ed..585fc589d3e 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DocumentUploadGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/DocumentUploadGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java
index d09e8951350..fbfbc05e761 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/MerchantAccountGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodGatewayEndpointConfiguration.java
index 29f6bd4258e..4a5f70a73c0 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayEndpointConfiguration.java
index 1424a0eb35e..f72ecc85592 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PlanGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PlanGatewayEndpointConfiguration.java
index 85fa1c858a7..e1eadf07336 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PlanGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/PlanGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ReportGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ReportGatewayEndpointConfiguration.java
index e093ea9d6e7..768dad8c336 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ReportGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/ReportGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayEndpointConfiguration.java
index 98621053428..11344383da9 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SubscriptionGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SubscriptionGatewayEndpointConfiguration.java
index 44859a91346..992489672bf 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SubscriptionGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/SubscriptionGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java
index c6e186a31bf..c75e6bc9f12 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/TransactionGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/WebhookNotificationGatewayEndpointConfiguration.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/WebhookNotificationGatewayEndpointConfiguration.java
index a6af240121f..d6de9108d87 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/WebhookNotificationGatewayEndpointConfiguration.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/WebhookNotificationGatewayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddOnGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddOnGatewayApiMethod.java
index 3803583471b..7ce49166a45 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddOnGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddOnGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddressGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddressGatewayApiMethod.java
index bd70fb3eabb..c426313a3dd 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddressGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/AddressGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
index 912659c9980..d207d029360 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiName.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiName.java
index 2d8dc54db64..8a0488df6ff 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiName.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ClientTokenGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ClientTokenGatewayApiMethod.java
index 34f0613f32a..692cd2428d1 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ClientTokenGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ClientTokenGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CreditCardVerificationGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CreditCardVerificationGatewayApiMethod.java
index 8b714703087..2155c42e304 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CreditCardVerificationGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CreditCardVerificationGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CustomerGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CustomerGatewayApiMethod.java
index b6d7b691fa7..115897eb4ec 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CustomerGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/CustomerGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DiscountGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DiscountGatewayApiMethod.java
index 0fb2cac351f..ee8fd8bde3b 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DiscountGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DiscountGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DisputeGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DisputeGatewayApiMethod.java
index cd947fbacce..04d7642d808 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DisputeGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DisputeGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DocumentUploadGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DocumentUploadGatewayApiMethod.java
index 65b659719ee..20ea9d25a4d 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DocumentUploadGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/DocumentUploadGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java
index 2b32ba1c50f..ce80ab95a42 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/MerchantAccountGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodGatewayApiMethod.java
index e3deb415eac..7b08357c624 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodNonceGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodNonceGatewayApiMethod.java
index c5a19503cd5..e70baa4d82c 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodNonceGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PaymentMethodNonceGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PlanGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PlanGatewayApiMethod.java
index 0196b96e5c8..d310f8348fa 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PlanGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/PlanGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ReportGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ReportGatewayApiMethod.java
index 734f6349458..2f3d8dabe39 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ReportGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/ReportGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SettlementBatchSummaryGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SettlementBatchSummaryGatewayApiMethod.java
index d8f71d65c21..e9beee2745f 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SettlementBatchSummaryGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SettlementBatchSummaryGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SubscriptionGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SubscriptionGatewayApiMethod.java
index a683d67be29..b08aa50682d 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SubscriptionGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/SubscriptionGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java
index 6b625d4feef..66dcaa3b38e 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/TransactionGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/WebhookNotificationGatewayApiMethod.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/WebhookNotificationGatewayApiMethod.java
index f2616276d0a..8a768ae646d 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/WebhookNotificationGatewayApiMethod.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/WebhookNotificationGatewayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-cassandraql/src/test/resources/BasicDataSet.cql b/components/camel-cassandraql/src/test/resources/BasicDataSet.cql
index 9054e4082ab..f77e9470f84 100644
--- a/components/camel-cassandraql/src/test/resources/BasicDataSet.cql
+++ b/components/camel-cassandraql/src/test/resources/BasicDataSet.cql
@@ -1,3 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
TRUNCATE camel_user;
INSERT INTO camel_user(login, first_name, last_name)
diff --git a/components/camel-cassandraql/src/test/resources/IdempotentDataSet.cql b/components/camel-cassandraql/src/test/resources/IdempotentDataSet.cql
index 2d4b974c934..d7b039337fe 100644
--- a/components/camel-cassandraql/src/test/resources/IdempotentDataSet.cql
+++ b/components/camel-cassandraql/src/test/resources/IdempotentDataSet.cql
@@ -1,3 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
TRUNCATE CAMEL_IDEMPOTENT;
INSERT INTO CAMEL_IDEMPOTENT(KEY)
diff --git a/components/camel-cassandraql/src/test/resources/NamedIdempotentDataSet.cql b/components/camel-cassandraql/src/test/resources/NamedIdempotentDataSet.cql
index a8adebd0d32..288123aab81 100644
--- a/components/camel-cassandraql/src/test/resources/NamedIdempotentDataSet.cql
+++ b/components/camel-cassandraql/src/test/resources/NamedIdempotentDataSet.cql
@@ -1,3 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
TRUNCATE NAMED_CAMEL_IDEMPOTENT;
INSERT INTO NAMED_CAMEL_IDEMPOTENT(NAME, KEY)
diff --git a/components/camel-cassandraql/src/test/resources/initScript.cql b/components/camel-cassandraql/src/test/resources/initScript.cql
index 0253f9b0924..bf6cd48b011 100644
--- a/components/camel-cassandraql/src/test/resources/initScript.cql
+++ b/components/camel-cassandraql/src/test/resources/initScript.cql
@@ -1,3 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
CREATE KEYSPACE IF NOT EXISTS camel_ks WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};
CREATE TABLE camel_ks.camel_user (
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index b/components/camel-cxf/camel-cxf-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
index afefb9aea31..80aa26d261e 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
+++ b/components/camel-cxf/camel-cxf-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Customer
Order
Product
\ No newline at end of file
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/HelloWorld.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/HelloWorld.wsdl
index 07be170e0b4..97a28666722 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/HelloWorld.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/HelloWorld.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/MultiPartTest.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/MultiPartTest.wsdl
index 3ff0b7d9f36..bc6c18974ce 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/MultiPartTest.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/MultiPartTest.wsdl
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://camel.apache.org/cxf/multipart" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="flow"
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/bare.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/bare.wsdl
index f4a12028b70..f8e789b38c4 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/bare.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/bare.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/order.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/order.wsdl
index 5656b3ff9a6..42233436b39 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/order.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/order.wsdl
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/person-non-wrapper.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/person-non-wrapper.wsdl
index 327fda4d0bc..e7491d64c4a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/person-non-wrapper.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/person-non-wrapper.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/person.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/person.wsdl
index 26d1d5a141b..90f7b13ec16 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/person.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/person.wsdl
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/pizza_service.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/pizza_service.wsdl
index 3a3d227eb8b..117fb86f7f6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/pizza_service.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/pizza_service.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<wsdl:definitions
name="PizzaService"
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/resources/soap_header.wsdl b/components/camel-cxf/camel-cxf-soap/src/test/resources/soap_header.wsdl
index 45d60da22f2..4fd933c4454 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/resources/soap_header.wsdl
+++ b/components/camel-cxf/camel-cxf-soap/src/test/resources/soap_header.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<definitions name="soap_header"
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.handlers b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.handlers
index dc6a610dc05..5f920f9d1b9 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.handlers
@@ -1,21 +1,17 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/cxf/jaxrs=org.apache.camel.component.cxf.spring.jaxrs.NamespaceHandler
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
index c08b5a66127..6c69b046ab7 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/main/resources/META-INF/spring.schemas
@@ -1,23 +1,19 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf.xsd=schema/cxfJaxrsEndpoint.xsd
http\://camel.apache.org/schema/cxf/jaxrs/camel-cxf-${camel.version}.xsd=schema/cxfJaxrsEndpoint.xsd
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index b/components/camel-cxf/camel-cxf-spring-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
index afefb9aea31..80aa26d261e 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testbean/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Customer
Order
Product
\ No newline at end of file
diff --git a/components/camel-cxf/camel-cxf-spring-soap/rm.sh b/components/camel-cxf/camel-cxf-spring-soap/rm.sh
index 493404fae22..7289056dc2e 100755
--- a/components/camel-cxf/camel-cxf-spring-soap/rm.sh
+++ b/components/camel-cxf/camel-cxf-spring-soap/rm.sh
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
while read -r filename; do
rm "$filename"
done <list.txt
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.handlers b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.handlers
index 5a694525935..6e01f4276e2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.handlers
@@ -1,21 +1,17 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/cxf/jaxws=org.apache.camel.component.cxf.spring.jaxws.NamespaceHandler
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
index 44d376bc1c4..66bff88535e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/META-INF/spring.schemas
@@ -1,23 +1,19 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/cxf/jaxws/camel-cxf.xsd=schema/cxfJaxwsEndpoint.xsd
http\://camel.apache.org/schema/cxf/jaxws/camel-cxf-${camel.version}.xsd=schema/cxfJaxwsEndpoint.xsd
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/GetToken.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/GetToken.wsdl
index 3adc98faa66..b19df58bd63 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/GetToken.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/GetToken.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/HelloWorld.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/HelloWorld.wsdl
index 07be170e0b4..97a28666722 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/HelloWorld.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/HelloWorld.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/MultiPartTest.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/MultiPartTest.wsdl
index 3ff0b7d9f36..bc6c18974ce 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/MultiPartTest.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/MultiPartTest.wsdl
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://camel.apache.org/cxf/multipart" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="flow"
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/bare.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/bare.wsdl
index f4a12028b70..f8e789b38c4 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/bare.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/bare.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello/HelloWorld-DOC.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello/HelloWorld-DOC.wsdl
index 2e2eefe3b75..62470124c5c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello/HelloWorld-DOC.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello/HelloWorld-DOC.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello_world_wssec.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello_world_wssec.wsdl
index 7d0d9f68e9b..03c967b60de 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello_world_wssec.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/hello_world_wssec.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<wsdl:definitions name="HelloWorld" targetNamespace="http://camel.apache.org/hello_world_soap_http"
xmlns="http://schemas.xmlsoap.org/wsdl/"
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/mtom.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/mtom.wsdl
index ccd13c7bfc8..079f59eec05 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/mtom.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/mtom.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<wsdl:definitions xmlns:types="http://apache.org/camel/cxf/mtom_feature/types"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/order.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/order.wsdl
index 5656b3ff9a6..42233436b39 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/order.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/order.wsdl
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person-non-wrapper.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person-non-wrapper.wsdl
index 327fda4d0bc..e7491d64c4a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person-non-wrapper.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person-non-wrapper.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person.wsdl
index 26d1d5a141b..90f7b13ec16 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/person.wsdl
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/pizza_service.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/pizza_service.wsdl
index 3a3d227eb8b..117fb86f7f6 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/pizza_service.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/pizza_service.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<wsdl:definitions
name="PizzaService"
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/soap_header.wsdl b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/soap_header.wsdl
index 45d60da22f2..4fd933c4454 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/soap_header.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/resources/soap_header.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<definitions name="soap_header"
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.handlers b/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.handlers
index e268d6d0347..964e8c19db0 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.handlers
@@ -1,21 +1,17 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://cxf.apache.org/transports/camel=org.apache.camel.component.cxf.spring.transport.NamespaceHandler
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.schemas b/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.schemas
index ed1049b1d92..427191ca3a0 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/main/resources/META-INF/spring.schemas
@@ -1,23 +1,19 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
# since we don't publish the camel schema in the cxf site, we will always use the schema file in the class path
http\://cxf.apache.org/transports/camel.xsd=schema/configuration/camel.xsd
\ No newline at end of file
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/resources/person.wsdl b/components/camel-cxf/camel-cxf-spring-transport/src/test/resources/person.wsdl
index 26d1d5a141b..90f7b13ec16 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/resources/person.wsdl
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/resources/person.wsdl
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/resources/person.wsdl b/components/camel-cxf/camel-cxf-transport/src/test/resources/person.wsdl
index 26d1d5a141b..90f7b13ec16 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/resources/person.wsdl
+++ b/components/camel-cxf/camel-cxf-transport/src/test/resources/person.wsdl
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2DeleteEndpointConfiguration.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2DeleteEndpointConfiguration.java
index a636eb75a24..d6740e68952 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2DeleteEndpointConfiguration.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2DeleteEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2GetEndpointConfiguration.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2GetEndpointConfiguration.java
index 9ec1227a69f..95588764051 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2GetEndpointConfiguration.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2GetEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PostEndpointConfiguration.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PostEndpointConfiguration.java
index ec69c4cfdf9..c0a8e48f094 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PostEndpointConfiguration.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PostEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PutEndpointConfiguration.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PutEndpointConfiguration.java
index a921b7c07cf..3a2b8e6bff9 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PutEndpointConfiguration.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2PutEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2ResourceTablesEndpointConfiguration.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2ResourceTablesEndpointConfiguration.java
index d9b868d4672..c07fa155b9c 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2ResourceTablesEndpointConfiguration.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2ResourceTablesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
index 51fe147975d..61be650c8c8 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiName.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiName.java
index 8b5d2e3a1db..c1df71856dc 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiName.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2DeleteApiMethod.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2DeleteApiMethod.java
index c42a86827af..e0217484e13 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2DeleteApiMethod.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2DeleteApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2GetApiMethod.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2GetApiMethod.java
index 66cca60bd5c..f60bb74d97d 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2GetApiMethod.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2GetApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PostApiMethod.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PostApiMethod.java
index 365899e6e41..3bec78cc7f8 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PostApiMethod.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PostApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PutApiMethod.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PutApiMethod.java
index de8a070e285..236b0026d8b 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PutApiMethod.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2PutApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ResourceTablesApiMethod.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ResourceTablesApiMethod.java
index 4a8d7aa0c08..5781469edc2 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ResourceTablesApiMethod.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ResourceTablesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index 89f6a843482..be72a10d2f1 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -16,7 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCapabilitiesEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCapabilitiesEndpointConfiguration.java
index bf71ae20841..a9872f2eb45 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCapabilitiesEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCapabilitiesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCreateEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCreateEndpointConfiguration.java
index ab9ce5b9f21..08216ee69ca 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCreateEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirCreateEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirDeleteEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirDeleteEndpointConfiguration.java
index c518856c074..e232ea5a280 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirDeleteEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirDeleteEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirHistoryEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirHistoryEndpointConfiguration.java
index c894a1b050f..5629ef59b26 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirHistoryEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirHistoryEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirLoadPageEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirLoadPageEndpointConfiguration.java
index be81e4e6573..55fb3d6790f 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirLoadPageEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirLoadPageEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirMetaEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirMetaEndpointConfiguration.java
index a73fcea7d14..7e41aa64bb1 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirMetaEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirMetaEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirOperationEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirOperationEndpointConfiguration.java
index 0abc26a8466..8cceb865e25 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirOperationEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirOperationEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirPatchEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirPatchEndpointConfiguration.java
index fb1d183586b..33ee511e026 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirPatchEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirPatchEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirReadEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirReadEndpointConfiguration.java
index 2ae6ebe3825..23ac6eb5f90 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirReadEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirReadEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirSearchEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirSearchEndpointConfiguration.java
index 1598af2851e..d813456ecc3 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirSearchEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirSearchEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirTransactionEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirTransactionEndpointConfiguration.java
index 238cd29a93d..c6f11eab8ac 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirTransactionEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirTransactionEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirUpdateEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirUpdateEndpointConfiguration.java
index a59735f73cc..35176d172d8 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirUpdateEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirUpdateEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirValidateEndpointConfiguration.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirValidateEndpointConfiguration.java
index f77b718e069..7c45f006f6c 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirValidateEndpointConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirValidateEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
index 98aba841ee7..d805d65911c 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiName.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiName.java
index fb6c9cc87d0..866b969104b 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiName.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCapabilitiesApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCapabilitiesApiMethod.java
index 48a8f0bb93e..316d31029a7 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCapabilitiesApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCapabilitiesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCreateApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCreateApiMethod.java
index 1d91233555f..1700d673c01 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCreateApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirCreateApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirDeleteApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirDeleteApiMethod.java
index dff4ef39be9..66e31cb5f3e 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirDeleteApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirDeleteApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirHistoryApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirHistoryApiMethod.java
index cd8f1dfc660..35753897d3f 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirHistoryApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirHistoryApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirLoadPageApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirLoadPageApiMethod.java
index 3999793169a..e36401f1f76 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirLoadPageApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirLoadPageApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirMetaApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirMetaApiMethod.java
index 03e71d62f22..ad84476873c 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirMetaApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirMetaApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirOperationApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirOperationApiMethod.java
index 10800f2150a..5dbd9ee499a 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirOperationApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirOperationApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirPatchApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirPatchApiMethod.java
index fe48918efdf..e23c60f09c4 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirPatchApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirPatchApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirReadApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirReadApiMethod.java
index 3c0792786a5..45e2c17b2c4 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirReadApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirReadApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirSearchApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirSearchApiMethod.java
index f9a5a05ed10..8442c6e7863 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirSearchApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirSearchApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirTransactionApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirTransactionApiMethod.java
index c408ff1896e..2b5511a1f96 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirTransactionApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirTransactionApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirUpdateApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirUpdateApiMethod.java
index e738f3b5669..f8aee784f6f 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirUpdateApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirUpdateApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirValidateApiMethod.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirValidateApiMethod.java
index 03a45da2d13..f4bfe587581 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirValidateApiMethod.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirValidateApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
index 2f24e7d6e03..770dab0196f 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
index 32bc620c29a..9c2136cf7c6 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
index 973f5af15e0..8774fec8c58 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
index 585d1f85d2c..934835d30d9 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
index b2e8fdb4a96..6f4d2f6ca61 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
index 12b690720af..a97a4ef5404 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
index 333c5f2d3a6..5d441914f01 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
index fd5c7813b59..c4389fe04a8 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarAclApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarAclApiMethod.java
index de28b57ef8d..a54ef551f00 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarAclApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarAclApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarListApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarListApiMethod.java
index 040aea2c253..67bd2320422 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarListApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarListApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarsApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarsApiMethod.java
index 7ae2e3871c7..431c0be8fab 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarsApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarCalendarsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarChannelsApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarChannelsApiMethod.java
index bfc8e0347bb..4a0a571b542 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarChannelsApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarChannelsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarColorsApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarColorsApiMethod.java
index 08e1887903d..e66c01b0916 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarColorsApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarColorsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarEventsApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarEventsApiMethod.java
index a45015bd7a2..4bb2bec5b24 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarEventsApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarEventsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarFreebusyApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarFreebusyApiMethod.java
index 9f803d75e0b..004354b90d2 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarFreebusyApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarFreebusyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarSettingsApiMethod.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarSettingsApiMethod.java
index 8efb2ddb27f..5330a9a6333 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarSettingsApiMethod.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/CalendarSettingsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
index 1b933ef36ba..fe3346bbbed 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiName.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiName.java
index a2aed465545..a38c18744d4 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiName.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
index d53255e0d1a..8c1819a0e58 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
index 6ea3c177fea..6c0866d484b 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
index ad9125be6c4..732f67c39ef 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
index 61fab3c2bb3..e2fd2f2f2a6 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
index 7dd2383be0c..51f8d04bae5 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
index 10c60cdb74d..b2e1cdaabad 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveDrivesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveDrivesEndpointConfiguration.java
index 96e811c4746..7da236adccb 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveDrivesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveDrivesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
index 5e5740f9c21..45bcf7f0290 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
index 33d27cc98f9..5c5356c2993 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
index 5b00ff137a2..fd99f2a1f33 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
index 94d76474a76..1003d84d75b 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
index 7c1ffb81d70..885f8cdba64 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
index 862bec258b4..2a530f32216 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveTeamdrivesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveTeamdrivesEndpointConfiguration.java
index dd1020286f4..abeaec39b0f 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveTeamdrivesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveTeamdrivesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAboutApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAboutApiMethod.java
index dbc6158a189..be974aba19a 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAboutApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAboutApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAppsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAppsApiMethod.java
index 70c5a93509b..eef0bde4b06 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAppsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveAppsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChangesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChangesApiMethod.java
index 791d8c36ddc..aa1a9cb1b3a 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChangesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChangesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChannelsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChannelsApiMethod.java
index bc06a4fdb56..c44652b98d4 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChannelsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChannelsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChildrenApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChildrenApiMethod.java
index 289f1bb4216..aaf36e31dce 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChildrenApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveChildrenApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveCommentsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveCommentsApiMethod.java
index 260b688b078..5f4d83a71ba 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveCommentsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveCommentsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveDrivesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveDrivesApiMethod.java
index 8a69f6a7ba3..ba1a6c29293 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveDrivesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveDrivesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
index 7e5db6e3363..c03b9ced524 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveParentsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveParentsApiMethod.java
index 73a4abf0ab7..af4421df8ff 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveParentsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveParentsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePermissionsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePermissionsApiMethod.java
index a11130d8714..2c304abac2d 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePermissionsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePermissionsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePropertiesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePropertiesApiMethod.java
index 5915c7fba51..157a14db760 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePropertiesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DrivePropertiesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRepliesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRepliesApiMethod.java
index ea19e57fe2e..6ddeb366060 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRepliesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRepliesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRevisionsApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRevisionsApiMethod.java
index 7c7871d4a8b..fc5e5d2902e 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRevisionsApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRevisionsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveTeamdrivesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveTeamdrivesApiMethod.java
index b0386e58158..74f7ae12a23 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveTeamdrivesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveTeamdrivesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
index 92384728563..3e3a2b8bada 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java
index 3c0ab3441d5..15f80d5b767 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
index 469140bd305..b3cbf950034 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
index a89ad77c3c7..4f27b501565 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
index 1df5be58e98..a503790cf9a 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
index f175d159065..f3a4a4c5d8f 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
index 95440ecc954..1134f2a33c3 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
index cd1cd41ccde..294129c24e3 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
index 7d8e8f9f58a..14452e512d6 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersApiMethod.java
index 417342c7ccc..44713e2e789 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersDraftsApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersDraftsApiMethod.java
index 603243db055..9c59b637590 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersDraftsApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersDraftsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersHistoryApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersHistoryApiMethod.java
index 1f2dfbce021..e98700f28ba 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersHistoryApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersHistoryApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersLabelsApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersLabelsApiMethod.java
index 7424ab1ef86..0138627d09e 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersLabelsApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersLabelsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesApiMethod.java
index d197d3ce3b4..ac3466bc20b 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesAttachmentsApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesAttachmentsApiMethod.java
index c9bf78c0d9e..f0beb6d1f4d 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesAttachmentsApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersMessagesAttachmentsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersThreadsApiMethod.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersThreadsApiMethod.java
index 1b31f3b1fbe..5d1c86d434c 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersThreadsApiMethod.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GmailUsersThreadsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
index 6022b900185..44abcc90ab3 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiName.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiName.java
index 915f956de27..0139878a729 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiName.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
index eb51075579a..5680eebc120 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
index a469845663c..ae6a0e74279 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
index 2b1ba051b7c..68b588d423c 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiName.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiName.java
index 8006a7c2937..80c9d9eabaf 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiName.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsApiMethod.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsApiMethod.java
index a6c9b3e1018..30e72c3f848 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsApiMethod.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsValuesApiMethod.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsValuesApiMethod.java
index 41e7a2c5d8f..3877d7b8270 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsValuesApiMethod.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/SheetsSpreadsheetsValuesApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-grpc/src/test/proto/pingpong.proto b/components/camel-grpc/src/test/proto/pingpong.proto
index 4dd0bc3e987..570b334754a 100644
--- a/components/camel-grpc/src/test/proto/pingpong.proto
+++ b/components/camel-grpc/src/test/proto/pingpong.proto
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/components/camel-hyperledger-aries/docker-compose.yml b/components/camel-hyperledger-aries/docker-compose.yml
index 6508be4df3f..d92d6c33a2a 100644
--- a/components/camel-hyperledger-aries/docker-compose.yml
+++ b/components/camel-hyperledger-aries/docker-compose.yml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
version: '3'
diff --git a/components/camel-irc/src/test/unrealircd/ircd.motd b/components/camel-irc/src/test/unrealircd/ircd.motd
index 83229e77e16..71b199df1c4 100644
--- a/components/camel-irc/src/test/unrealircd/ircd.motd
+++ b/components/camel-irc/src/test/unrealircd/ircd.motd
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -5,7 +6,7 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index b/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
index 39a554c18a3..203bf54eecd 100644
--- a/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
+++ b/components/camel-jaxb/src/test/resources/org/apache/camel/example/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Address
Order
PurchaseOrder
diff --git a/components/camel-ldap/src/test/resources/org/apache/camel/component/ldap/LdapRouteTest.ldif b/components/camel-ldap/src/test/resources/org/apache/camel/component/ldap/LdapRouteTest.ldif
index ab7cff49199..3ed0b5c7bb1 100644
--- a/components/camel-ldap/src/test/resources/org/apache/camel/component/ldap/LdapRouteTest.ldif
+++ b/components/camel-ldap/src/test/resources/org/apache/camel/component/ldap/LdapRouteTest.ldif
@@ -1,25 +1,19 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,ou=system
objectClass: top
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicate.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicate.ldif
index bb6ca6f8c70..21de57c733f 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicate.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicate.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: uid=test3,ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicateSetup.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicateSetup.ldif
index 5dfb3f92b32..785499d896e 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicateSetup.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddDuplicateSetup.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddOne.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddOne.ldif
index 33b3629d485..a0c8baf3223 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddOne.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/AddOne.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOne.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOne.ldif
index 5c6cf25ad67..cc4d4c9dfbc 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOne.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOne.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: uid=test2,ou=test,dc=example,dc=org
changetype: delete
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOneSetup.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOneSetup.ldif
index 47b80828206..e2bc684dc8a 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOneSetup.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/DeleteOneSetup.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDn.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDn.ldif
index f401b0f5487..e421584ee74 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDn.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDn.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: uid=test7,ou=test,dc=example,dc=org
changetype: moddn
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDnSetup.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDnSetup.ldif
index c47f505dcc5..898c42aa3a0 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDnSetup.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModDnSetup.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdn.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdn.ldif
index 874df3faaa5..2ba429ceb23 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdn.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdn.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: uid=test5,ou=test,dc=example,dc=org
changetype: modrdn
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdnSetup.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdnSetup.ldif
index 73fecc26109..16709cb2f72 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdnSetup.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModRdnSetup.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/Modify.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/Modify.ldif
index f4e1e25e478..249835c3cef 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/Modify.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/Modify.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: uid=test4,ou=test,dc=example,dc=org
changetype: modify
diff --git a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModifySetup.ldif b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModifySetup.ldif
index 0d1b0bba590..7d7c4530eef 100644
--- a/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModifySetup.ldif
+++ b/components/camel-ldif/src/test/resources/org/apache/camel/component/ldif/ModifySetup.ldif
@@ -1,26 +1,20 @@
version: 1
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# EXAMPLE.COM is reserved for testing according to this RFC:
-#
-# http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
dn: ou=test,dc=example,dc=org
changetype: add
diff --git a/components/camel-mustache/src/test/resources/another.mustache b/components/camel-mustache/src/test/resources/another.mustache
index 059e1590078..5ff9586fdc0 100644
--- a/components/camel-mustache/src/test/resources/another.mustache
+++ b/components/camel-mustache/src/test/resources/another.mustache
@@ -1,3 +1,19 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Yet another Mustache with body:
'{{body}}'
and some header:
diff --git a/components/camel-mustache/src/test/resources/child.mustache b/components/camel-mustache/src/test/resources/child.mustache
index 16895044658..4da4986681e 100644
--- a/components/camel-mustache/src/test/resources/child.mustache
+++ b/components/camel-mustache/src/test/resources/child.mustache
@@ -1,3 +1,19 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
{{<parent}}
{{$content1}}Child 1{{/content1}}
{{$content2}}Child 2{{/content2}}
diff --git a/components/camel-mustache/src/test/resources/included.mustache b/components/camel-mustache/src/test/resources/included.mustache
index c709afed932..990fd68e8cc 100644
--- a/components/camel-mustache/src/test/resources/included.mustache
+++ b/components/camel-mustache/src/test/resources/included.mustache
@@ -1 +1,17 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Included
\ No newline at end of file
diff --git a/components/camel-mustache/src/test/resources/includer.mustache b/components/camel-mustache/src/test/resources/includer.mustache
index def64ebb701..f7cf04996a3 100644
--- a/components/camel-mustache/src/test/resources/includer.mustache
+++ b/components/camel-mustache/src/test/resources/includer.mustache
@@ -1,3 +1,19 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Start
{{> included}}
End
\ No newline at end of file
diff --git a/components/camel-mustache/src/test/resources/letter.mustache b/components/camel-mustache/src/test/resources/letter.mustache
index 42206c37424..699de27c267 100644
--- a/components/camel-mustache/src/test/resources/letter.mustache
+++ b/components/camel-mustache/src/test/resources/letter.mustache
@@ -1,3 +1,19 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Dear {{headers.lastName}}, {{headers.firstName}}
Thanks for the order of {{headers.item}}.
diff --git a/components/camel-mustache/src/test/resources/parent.mustache b/components/camel-mustache/src/test/resources/parent.mustache
index acd6f71d019..f00dd96b288 100644
--- a/components/camel-mustache/src/test/resources/parent.mustache
+++ b/components/camel-mustache/src/test/resources/parent.mustache
@@ -1,3 +1,19 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Start
Content 1: {{$content1}}Parent 1{{/content1}}
Middle
diff --git a/components/camel-mustache/src/test/resources/simple.mustache b/components/camel-mustache/src/test/resources/simple.mustache
index 6d9b3479e79..e73df06ab5d 100644
--- a/components/camel-mustache/src/test/resources/simple.mustache
+++ b/components/camel-mustache/src/test/resources/simple.mustache
@@ -1 +1,17 @@
+{{!
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}}
Message with body '{{body}}' and some header '{{headers.someHeader}}'
\ No newline at end of file
diff --git a/components/camel-mvel/src/test/resources/template.mvel b/components/camel-mvel/src/test/resources/template.mvel
index 368dda67172..3c705e1b9f6 100644
--- a/components/camel-mvel/src/test/resources/template.mvel
+++ b/components/camel-mvel/src/test/resources/template.mvel
@@ -1 +1,17 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
{ "text": "@{"The result is " + body * 2}" }
\ No newline at end of file
diff --git a/components/camel-mvel/src/test/resources/template2.mvel b/components/camel-mvel/src/test/resources/template2.mvel
index 2e86ad553d0..1f4669ce500 100644
--- a/components/camel-mvel/src/test/resources/template2.mvel
+++ b/components/camel-mvel/src/test/resources/template2.mvel
@@ -1 +1,17 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
{ "text": "@{"The result is " + body * 4}" }
\ No newline at end of file
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2AppEndpointConfiguration.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2AppEndpointConfiguration.java
index d4f3cc27269..b0053be5618 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2AppEndpointConfiguration.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2AppEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
index 246d49ce427..3b67ba9ff29 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiName.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiName.java
index fe595ed49fc..368207c68c8 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiName.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2AppApiMethod.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2AppApiMethod.java
index b94a42d550a..ee9fbe5310b 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2AppApiMethod.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2AppApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4AppEndpointConfiguration.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4AppEndpointConfiguration.java
index 7839a1512e8..b8e691c7167 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4AppEndpointConfiguration.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4AppEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
index 831ae8351b2..5a486ce449d 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiName.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiName.java
index 87bccef33da..d807610b146 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiName.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4AppApiMethod.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4AppApiMethod.java
index eedff0e1459..099d4d8fad7 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4AppApiMethod.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4AppApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-protobuf/src/test/proto/addressbook.proto b/components/camel-protobuf/src/test/proto/addressbook.proto
index e5412a3f0e2..3aad8446cb2 100644
--- a/components/camel-protobuf/src/test/proto/addressbook.proto
+++ b/components/camel-protobuf/src/test/proto/addressbook.proto
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
syntax = "proto2";
package org.apache.camel.dataformat.protobuf.generated;
diff --git a/components/camel-rest-openapi/src/test/resources/alt-openapi.yaml b/components/camel-rest-openapi/src/test/resources/alt-openapi.yaml
index 58a5dad461b..6f7be79946c 100644
--- a/components/camel-rest-openapi/src/test/resources/alt-openapi.yaml
+++ b/components/camel-rest-openapi/src/test/resources/alt-openapi.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: 3.0.2
info:
title: Swagger Petstore - OpenAPI 3.0
diff --git a/components/camel-rest-openapi/src/test/resources/alt-petstore.yaml b/components/camel-rest-openapi/src/test/resources/alt-petstore.yaml
index c7844acba33..29275709223 100644
--- a/components/camel-rest-openapi/src/test/resources/alt-petstore.yaml
+++ b/components/camel-rest-openapi/src/test/resources/alt-petstore.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
swagger: "2.0"
info:
description: 'This is a sample server Petstore server. You can find out more about OpenApi at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.'
diff --git a/components/camel-rest-openapi/src/test/resources/openapi-v3.yaml b/components/camel-rest-openapi/src/test/resources/openapi-v3.yaml
index 5c13af3176a..66001119761 100644
--- a/components/camel-rest-openapi/src/test/resources/openapi-v3.yaml
+++ b/components/camel-rest-openapi/src/test/resources/openapi-v3.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: 3.0.2
info:
title: Swagger Petstore - OpenAPI 3.0
diff --git a/components/camel-rest-openapi/src/test/resources/openapi.yaml b/components/camel-rest-openapi/src/test/resources/openapi.yaml
index 989b9b91457..cd43c61ba22 100644
--- a/components/camel-rest-openapi/src/test/resources/openapi.yaml
+++ b/components/camel-rest-openapi/src/test/resources/openapi.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
swagger: "2.0"
info:
description: 'This is a sample server Petstore server. You can find out more about OpenApi at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.'
diff --git a/components/camel-rest-openapi/src/test/resources/petstore-3.1.yaml b/components/camel-rest-openapi/src/test/resources/petstore-3.1.yaml
index d51548958bb..e6fe02b2afd 100644
--- a/components/camel-rest-openapi/src/test/resources/petstore-3.1.yaml
+++ b/components/camel-rest-openapi/src/test/resources/petstore-3.1.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: "3.1.0"
info:
version: 1.0.0
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_numeric.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_numeric.robot
index 53cef91fd6d..41f9f2c68e8 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_numeric.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_numeric.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
+
*** Settings ***
Library String
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_string.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_string.robot
index f3728e370db..935cb5859f2 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_string.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/assert_string_robot_with_camel_exchange_value_as_string.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
+
*** Settings ***
Library String
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/send_no_camel_exchnage_only_camel_configs.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/send_no_camel_exchnage_only_camel_configs.robot
index 5d6af59e9e1..8c25a7133fb 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/send_no_camel_exchnage_only_camel_configs.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/send_no_camel_exchnage_only_camel_configs.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,7 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+#
+
*** Test Cases ***
Send No Camel Exchange Only Camel Configs
Should Be True "john" == "john"
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_body.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_body.robot
index cf4a4a099a2..b7dc0e2d298 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_body.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_body.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
*** Test Cases ***
Set Variable Camel Body Test Case
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot
index 671d1a4c934..86c47fe34d0 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_exchange.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
*** Test Cases ***
Set Variable Camel Exchange Test Case
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_header.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_header.robot
index 050f948c7c6..b095a80c702 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_header.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_header.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
*** Test Cases ***
Set Variable Camel Header Test Case
diff --git a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_property.robot b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_property.robot
index f1641c1a534..12ac3524ecf 100644
--- a/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_property.robot
+++ b/components/camel-robotframework/src/test/resources/org/apache/camel/component/robotframework/set_variable_camel_property.robot
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
*** Test Cases ***
Set Variable Camel Property Test Case
diff --git a/components/camel-rocketmq/pom.xml b/components/camel-rocketmq/pom.xml
index 23c76230808..66b2302d308 100644
--- a/components/camel-rocketmq/pom.xml
+++ b/components/camel-rocketmq/pom.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
index 5c33b0b03bc..a3304a991bc 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-picklist.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
index 1954a78ead5..ea2cb42154a 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-pojo.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
index c5e0dfdcffc..09b7ae6aa59 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-pojo.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin.
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
index 47d76d5336e..ec400cffa15 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-query-records.vm
/*
* Salesforce Query DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
index 26cf83fb265..aba70ce9b4b 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-query-records.vm
/*
* Salesforce Query DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
index 5c33b0b03bc..a3304a991bc 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-picklist.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
index 1954a78ead5..ea2cb42154a 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-pojo.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
index c5e0dfdcffc..09b7ae6aa59 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-pojo.vm
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin.
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
index e7801f245cb..db87240f695 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-query-records.vm
/*
* Salesforce Query DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
index 43910a6570d..5ae7d9a619b 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## sobject-query-records.vm
/*
* Salesforce Query DTO generated by camel-salesforce-maven-plugin
diff --git a/components/camel-sap-netweaver/src/test/resources/flight-info.vm b/components/camel-sap-netweaver/src/test/resources/flight-info.vm
index 4c8c767b3f2..1a1c0b4cdf5 100644
--- a/components/camel-sap-netweaver/src/test/resources/flight-info.vm
+++ b/components/camel-sap-netweaver/src/test/resources/flight-info.vm
@@ -1,19 +1,19 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
<html>
<body>
Flight information:
diff --git a/components/camel-schematron/src/test/resources/custom-resolver/title-rules.sch b/components/camel-schematron/src/test/resources/custom-resolver/title-rules.sch
index adc65258c04..8499b42ba26 100644
--- a/components/camel-schematron/src/test/resources/custom-resolver/title-rules.sch
+++ b/components/camel-schematron/src/test/resources/custom-resolver/title-rules.sch
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-->
<sch:rule context="title" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
<sch:assert test="string-length(.) >= 2">A title should be at least two characters</sch:assert>
diff --git a/components/camel-schematron/src/test/resources/sch/schematron-1.sch b/components/camel-schematron/src/test/resources/sch/schematron-1.sch
index bc31fc7fcdb..752c2cb3f24 100644
--- a/components/camel-schematron/src/test/resources/sch/schematron-1.sch
+++ b/components/camel-schematron/src/test/resources/sch/schematron-1.sch
@@ -1,19 +1,21 @@
<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron"
queryBinding="xslt2">
diff --git a/components/camel-schematron/src/test/resources/sch/schematron-2.sch b/components/camel-schematron/src/test/resources/sch/schematron-2.sch
index ed6a1e3de8c..e3f4aac3025 100644
--- a/components/camel-schematron/src/test/resources/sch/schematron-2.sch
+++ b/components/camel-schematron/src/test/resources/sch/schematron-2.sch
@@ -1,19 +1,21 @@
<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron"
queryBinding="xslt2">
diff --git a/components/camel-schematron/src/test/resources/sch/schematron-3.sch b/components/camel-schematron/src/test/resources/sch/schematron-3.sch
index 99147689bd5..4c35e4dd2cf 100644
--- a/components/camel-schematron/src/test/resources/sch/schematron-3.sch
+++ b/components/camel-schematron/src/test/resources/sch/schematron-3.sch
@@ -1,19 +1,21 @@
<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron"
queryBinding="xslt2">
diff --git a/components/camel-shiro/src/test/resources/securityconfig.ini b/components/camel-shiro/src/test/resources/securityconfig.ini
index d98f2640ab5..6bf337b8b6b 100644
--- a/components/camel-shiro/src/test/resources/securityconfig.ini
+++ b/components/camel-shiro/src/test/resources/securityconfig.ini
@@ -1,20 +1,18 @@
#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
[users]
diff --git a/components/camel-snakeyaml/src/test/resources/data-dos.yaml b/components/camel-snakeyaml/src/test/resources/data-dos.yaml
index 6747dd210b0..bcd37d0344d 100644
--- a/components/camel-snakeyaml/src/test/resources/data-dos.yaml
+++ b/components/camel-snakeyaml/src/test/resources/data-dos.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
a: &a ["lol","lol","lol","lol","lol","lol","lol","lol","lol"]
b: &b [*a,*a,*a,*a,*a,*a,*a,*a,*a]
c: &c [*b,*b,*b,*b,*b,*b,*b,*b,*b]
diff --git a/components/camel-snakeyaml/src/test/resources/data.yaml b/components/camel-snakeyaml/src/test/resources/data.yaml
index 83c60e51017..d6c1e8477a6 100644
--- a/components/camel-snakeyaml/src/test/resources/data.yaml
+++ b/components/camel-snakeyaml/src/test/resources/data.yaml
@@ -1,2 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
name: "Colm"
location: "Dublin"
diff --git a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
index 397338930db..fd630092cf0 100644
--- a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
+++ b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
index 553bc722d72..a55f31d29d5 100644
--- a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
+++ b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
index fde11a18ee1..5759b5bdd61 100644
--- a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
+++ b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/TestService.wsdl b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/TestService.wsdl
index 96162330a7e..6b3557a6ce8 100644
--- a/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/TestService.wsdl
+++ b/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/TestService.wsdl
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions name="TestServiceService" targetNamespace="http://www.example.com/duplicateerror" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.com/duplicateerror" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
<xs:schema xmlns:tns="http://www.example.com/duplicateerror" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.example.com/duplicateerror" version="1.0">
diff --git a/components/camel-spring-security/src/main/resources/META-INF/spring.handlers b/components/camel-spring-security/src/main/resources/META-INF/spring.handlers
index 6282a5d7b47..7675be580e4 100644
--- a/components/camel-spring-security/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-spring-security/src/main/resources/META-INF/spring.handlers
@@ -1,21 +1,17 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/spring-security=org.apache.camel.component.spring.security.config.NamespaceHandler
diff --git a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 1d93d03a706..24baba87ccb 100644
--- a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -1,19 +1,19 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/spring-security/camel-spring-security.xsd=schema/camel-spring-security.xsd
diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/jaxb/jaxb.index b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/jaxb/jaxb.index
index b4d34fba53c..ffb80d5d78e 100644
--- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/jaxb/jaxb.index
+++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/jaxb/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,13 +6,13 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
QuoteRequest
QuoteResponse
\ No newline at end of file
diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/soap-header-transform.xslt b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/soap-header-transform.xslt
index 06ad8cb6fa5..8f155119b38 100644
--- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/soap-header-transform.xslt
+++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/soap-header-transform.xslt
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:h="http://www.webserviceX.NET/">
<xsl:strip-space elements="*"/>
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
diff --git a/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers b/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
index 27eaa3b5c79..c14ed4f9cfb 100644
--- a/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
+++ b/components/camel-spring-xml/src/main/resources/META-INF/spring.handlers
@@ -1,19 +1,19 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/spring=org.apache.camel.spring.xml.handler.CamelNamespaceHandler
http\://camel.apache.org/schema/spring/v${camel.schema.version}=org.apache.camel.spring.xml.handler.CamelNamespaceHandler
diff --git a/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas b/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
index b4847d122c1..ece1f477cc8 100644
--- a/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring-xml/src/main/resources/META-INF/spring.schemas
@@ -1,19 +1,19 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
http\://camel.apache.org/schema/spring=camel-spring.xsd
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
index 1b054db2dbc..ebaaf492e8d 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj
@@ -6,7 +6,7 @@
// (the "License"); you may not use this file except in compliance with
// the License. You may obtain a copy of the License at
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +14,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-// Using some token definitions from: http://kiwwito.com/build-a-lexical-analyzer-with-javacc/
+// Using some token definitions from: http://kiwwito.com/build-a-lexical-analyzer-with-javacc/
options {
STATIC = false;
FORCE_LA_CHECK = true;
diff --git a/components/camel-sql/src/test/resources/sql/idempotentWithOrphanLockRemoval.sql b/components/camel-sql/src/test/resources/sql/idempotentWithOrphanLockRemoval.sql
index ce108eba95c..541d3f3d878 100644
--- a/components/camel-sql/src/test/resources/sql/idempotentWithOrphanLockRemoval.sql
+++ b/components/camel-sql/src/test/resources/sql/idempotentWithOrphanLockRemoval.sql
@@ -1,3 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
-- Add DDL to create tables, views, indexes, etc needed by tests. These should match the expected database structure as it will appear in production.
SET DATABASE SQL SYNTAX PGS TRUE; -- tells HSQLDB that this schema uses MYSQL syntax
SET PROPERTY "sql.enforce_strict_size" FALSE;
diff --git a/components/camel-stax/src/test/resources/org/apache/camel/component/stax/model/jaxb.index b/components/camel-stax/src/test/resources/org/apache/camel/component/stax/model/jaxb.index
index b2fa3f9f037..f89f1c62dab 100644
--- a/components/camel-stax/src/test/resources/org/apache/camel/component/stax/model/jaxb.index
+++ b/components/camel-stax/src/test/resources/org/apache/camel/component/stax/model/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Orders
Order
Records
diff --git a/components/camel-stomp/src/test/resources/jsse/createCertificate.sh b/components/camel-stomp/src/test/resources/jsse/createCertificate.sh
index 82a3d72c183..f05d5603495 100755
--- a/components/camel-stomp/src/test/resources/jsse/createCertificate.sh
+++ b/components/camel-stomp/src/test/resources/jsse/createCertificate.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
set -e
keytool -genkey -keystore server-side-keystore.jks -storepass password -keypass password -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AccountEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AccountEndpointConfiguration.java
index db18790bcc6..a9acd171601 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AccountEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AccountEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressDependentPhoneNumberEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressDependentPhoneNumberEndpointConfiguration.java
index a4dd10ddaa5..f90dd56d6ba 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressDependentPhoneNumberEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressDependentPhoneNumberEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressEndpointConfiguration.java
index f0d139a4fb0..c48b0ee4a9e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AddressEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ApplicationEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ApplicationEndpointConfiguration.java
index b89b12745b5..fd900025b29 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ApplicationEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ApplicationEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryEndpointConfiguration.java
index a77b72fad89..b94e94a87c0 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryLocalEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryLocalEndpointConfiguration.java
index 2a32227733b..0d9c48cc42e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryLocalEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryLocalEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryMobileEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryMobileEndpointConfiguration.java
index 575a63b0533..0d3ed9c3cdf 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryMobileEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryMobileEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryTollFreeEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryTollFreeEndpointConfiguration.java
index 42fa750a6e9..92465f7cbdc 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryTollFreeEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/AvailablePhoneNumberCountryTollFreeEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallEndpointConfiguration.java
index fecd4f32ad8..1857a5dc2f4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackEndpointConfiguration.java
index b2258bfccaa..7de51b62f3e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackSummaryEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackSummaryEndpointConfiguration.java
index d26dbfaac90..a0aa2046104 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackSummaryEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallFeedbackSummaryEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallNotificationEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallNotificationEndpointConfiguration.java
index 81155c2d26f..f3e405e77f0 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallNotificationEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallNotificationEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallRecordingEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallRecordingEndpointConfiguration.java
index f66f9886339..f1ebf727390 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallRecordingEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/CallRecordingEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceEndpointConfiguration.java
index 8c8340d3c9c..cde7bfe148d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceParticipantEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceParticipantEndpointConfiguration.java
index fc85ef0b4cd..9b15dfb62cf 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceParticipantEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConferenceParticipantEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConnectAppEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConnectAppEndpointConfiguration.java
index a33d90128cb..d07868b2d64 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConnectAppEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ConnectAppEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberEndpointConfiguration.java
index d8a06b0963e..c661941e733 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberLocalEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberLocalEndpointConfiguration.java
index e1b15dd81f5..464b79f8a15 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberLocalEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberLocalEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberMobileEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberMobileEndpointConfiguration.java
index 6a4091cad2e..14fb61688dd 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberMobileEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberMobileEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberTollFreeEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberTollFreeEndpointConfiguration.java
index 26311fdf043..8aff7b51ee9 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberTollFreeEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/IncomingPhoneNumberTollFreeEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/KeyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/KeyEndpointConfiguration.java
index b596548a962..fc5d75d5dae 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/KeyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/KeyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageEndpointConfiguration.java
index 3fd4b5a5d93..3dcef5152b2 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageFeedbackEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageFeedbackEndpointConfiguration.java
index 44c1a0f36ce..f8dc6e6a9db 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageFeedbackEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageFeedbackEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageMediaEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageMediaEndpointConfiguration.java
index ddef11782e4..356d7bab382 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageMediaEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/MessageMediaEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewKeyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewKeyEndpointConfiguration.java
index c91cde51358..4438b6d3dd2 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewKeyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewKeyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewSigningKeyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewSigningKeyEndpointConfiguration.java
index 7606e7a4518..3c6f0c0d550 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewSigningKeyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NewSigningKeyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NotificationEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NotificationEndpointConfiguration.java
index 33f2b184ae2..b57441b09b1 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NotificationEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/NotificationEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/OutgoingCallerIdEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/OutgoingCallerIdEndpointConfiguration.java
index e5ed6e254da..427fd240bd9 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/OutgoingCallerIdEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/OutgoingCallerIdEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueEndpointConfiguration.java
index 349f6ec2477..6bc09bed968 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueMemberEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueMemberEndpointConfiguration.java
index 1f29af76f4a..4f24a4894fd 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueMemberEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/QueueMemberEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultEndpointConfiguration.java
index b4e6db55289..cc7beef9cca 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultPayloadEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultPayloadEndpointConfiguration.java
index e5edaf0cb93..dccfabf740e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultPayloadEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingAddOnResultPayloadEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingEndpointConfiguration.java
index b3b4620ca98..f960338cfce 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingTranscriptionEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingTranscriptionEndpointConfiguration.java
index 011a63368e2..cdae20f9847 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingTranscriptionEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/RecordingTranscriptionEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ShortCodeEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ShortCodeEndpointConfiguration.java
index 26903602c53..28cd8a1b403 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ShortCodeEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ShortCodeEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SigningKeyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SigningKeyEndpointConfiguration.java
index 0b93eb45bec..8ea7525440d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SigningKeyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SigningKeyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialEndpointConfiguration.java
index eb5b12b4d79..59a9fed65dc 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialListEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialListEndpointConfiguration.java
index 06dc7698ca9..44de24521f4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialListEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipCredentialListEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainCredentialListMappingEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainCredentialListMappingEndpointConfiguration.java
index 42bc89b0d18..8c11c7b24f2 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainCredentialListMappingEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainCredentialListMappingEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainEndpointConfiguration.java
index 8d4cc930383..e435ae02bd6 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainIpAccessControlListMappingEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainIpAccessControlListMappingEndpointConfiguration.java
index 2841abcca53..04e954fde57 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainIpAccessControlListMappingEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipDomainIpAccessControlListMappingEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListEndpointConfiguration.java
index 8e72cee7062..ac4c2a4951d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListIpAddressEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListIpAddressEndpointConfiguration.java
index ede3a3365dc..1182e34fcc4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListIpAddressEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/SipIpAccessControlListIpAddressEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TokenEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TokenEndpointConfiguration.java
index a7df7783f4f..47a5e21f416 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TokenEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TokenEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TranscriptionEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TranscriptionEndpointConfiguration.java
index bf2da667c17..6fe50eba193 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TranscriptionEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TranscriptionEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordAllTimeEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordAllTimeEndpointConfiguration.java
index 986d7968d4a..fc836050e95 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordAllTimeEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordAllTimeEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordDailyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordDailyEndpointConfiguration.java
index 84d3f37cf4f..855ff11c16b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordDailyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordDailyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordEndpointConfiguration.java
index 6efa071f276..4e9392bac66 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordLastMonthEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordLastMonthEndpointConfiguration.java
index 9a8ec1cbe26..ddd7986a796 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordLastMonthEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordLastMonthEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordMonthlyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordMonthlyEndpointConfiguration.java
index fca2e71ca38..914de1683f3 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordMonthlyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordMonthlyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordThisMonthEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordThisMonthEndpointConfiguration.java
index 5623ac18515..e2a7405cdc4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordThisMonthEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordThisMonthEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordTodayEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordTodayEndpointConfiguration.java
index 09158ad4dcc..f131c3468f8 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordTodayEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordTodayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYearlyEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYearlyEndpointConfiguration.java
index ee95c8ad8d7..e49f860e4b3 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYearlyEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYearlyEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYesterdayEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYesterdayEndpointConfiguration.java
index 51700f8a35b..d4cbe72e747 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYesterdayEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageRecordYesterdayEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageTriggerEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageTriggerEndpointConfiguration.java
index 03fffb03dc2..bd6246cc45e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageTriggerEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/UsageTriggerEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ValidationRequestEndpointConfiguration.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ValidationRequestEndpointConfiguration.java
index 749070c7698..bcae9600b6b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ValidationRequestEndpointConfiguration.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/ValidationRequestEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AccountApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AccountApiMethod.java
index ba04864b97e..a1cb6c8a128 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AccountApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AccountApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressApiMethod.java
index c8d9c932cda..78c1cc17ca8 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressDependentPhoneNumberApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressDependentPhoneNumberApiMethod.java
index e3f2628a00f..26dd3f7bdb6 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressDependentPhoneNumberApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AddressDependentPhoneNumberApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ApplicationApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ApplicationApiMethod.java
index 5be193a0e20..6f7274cf916 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ApplicationApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ApplicationApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryApiMethod.java
index f62992d9f6a..32086f460f2 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryLocalApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryLocalApiMethod.java
index db162551f72..079ec01573b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryLocalApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryLocalApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryMobileApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryMobileApiMethod.java
index 3f6bd221de9..b45fb2f1b75 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryMobileApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryMobileApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryTollFreeApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryTollFreeApiMethod.java
index d01a3edfb22..810d2aadb08 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryTollFreeApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/AvailablePhoneNumberCountryTollFreeApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallApiMethod.java
index 6eb853fd44a..f48271b03c1 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackApiMethod.java
index 1f880e2bddc..834764c944f 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackSummaryApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackSummaryApiMethod.java
index 65e96d520b1..9e69117a51f 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackSummaryApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallFeedbackSummaryApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallNotificationApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallNotificationApiMethod.java
index c4e6bea31ea..9c7040baf1e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallNotificationApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallNotificationApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallRecordingApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallRecordingApiMethod.java
index 1de8b570941..d95c3644e1a 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallRecordingApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/CallRecordingApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceApiMethod.java
index b437414fd51..63eac990898 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceParticipantApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceParticipantApiMethod.java
index ad16be501da..7d31fbc4d2b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceParticipantApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConferenceParticipantApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConnectAppApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConnectAppApiMethod.java
index b1286b87069..dab2d8290ac 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConnectAppApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ConnectAppApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberApiMethod.java
index d3122a95754..662fe1066a4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberLocalApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberLocalApiMethod.java
index 311bde22213..519d8aa92a9 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberLocalApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberLocalApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberMobileApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberMobileApiMethod.java
index 6d6173813ad..e015804b329 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberMobileApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberMobileApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberTollFreeApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberTollFreeApiMethod.java
index 9c2694d8c1f..9d48b5428e6 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberTollFreeApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/IncomingPhoneNumberTollFreeApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/KeyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/KeyApiMethod.java
index dde7ab7d0a6..774e859fd8d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/KeyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/KeyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageApiMethod.java
index a94f73a1718..b2459dc61e0 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageFeedbackApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageFeedbackApiMethod.java
index 66f2e2b404b..c55add7f9c1 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageFeedbackApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageFeedbackApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageMediaApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageMediaApiMethod.java
index 689d286acc2..46ce34af48f 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageMediaApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/MessageMediaApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewKeyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewKeyApiMethod.java
index 6d9ecf7adf5..b1ba47b1212 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewKeyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewKeyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewSigningKeyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewSigningKeyApiMethod.java
index 5e8de9b3b8a..041c93e0005 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewSigningKeyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NewSigningKeyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NotificationApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NotificationApiMethod.java
index e40d0d5983c..b15fe73c1f8 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NotificationApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/NotificationApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/OutgoingCallerIdApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/OutgoingCallerIdApiMethod.java
index be0a5baca82..06e9d006a85 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/OutgoingCallerIdApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/OutgoingCallerIdApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueApiMethod.java
index e1be6a92259..be31cf968f0 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueMemberApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueMemberApiMethod.java
index f7546ea767f..75294b0f0f8 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueMemberApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/QueueMemberApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultApiMethod.java
index 0b9a65b18cb..e42a43edc3d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultPayloadApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultPayloadApiMethod.java
index 5cda7ec99bd..313706c8d18 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultPayloadApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingAddOnResultPayloadApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingApiMethod.java
index 762567a284e..6f6435a75cf 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingTranscriptionApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingTranscriptionApiMethod.java
index 0b8014ad5c9..576dbd274e7 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingTranscriptionApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/RecordingTranscriptionApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ShortCodeApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ShortCodeApiMethod.java
index 3d1d3fa2eca..33e23d4b45d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ShortCodeApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ShortCodeApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SigningKeyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SigningKeyApiMethod.java
index 200c43ef7ba..dbf6552d3f0 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SigningKeyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SigningKeyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialApiMethod.java
index 6a9a8258fd7..dd2fc32b3f3 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialListApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialListApiMethod.java
index ca9954c8649..a9899885c35 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialListApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipCredentialListApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainApiMethod.java
index cdefd633ce3..baece699c92 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainCredentialListMappingApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainCredentialListMappingApiMethod.java
index e1a053041ba..d607aff512e 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainCredentialListMappingApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainCredentialListMappingApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainIpAccessControlListMappingApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainIpAccessControlListMappingApiMethod.java
index 80fe1719e14..b73811e588a 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainIpAccessControlListMappingApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipDomainIpAccessControlListMappingApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListApiMethod.java
index c6a4758e081..8ba0f844efe 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListIpAddressApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListIpAddressApiMethod.java
index 292c7588afb..2dea39cd39d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListIpAddressApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/SipIpAccessControlListIpAddressApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TokenApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TokenApiMethod.java
index 7b474203228..f3d6c06a547 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TokenApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TokenApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TranscriptionApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TranscriptionApiMethod.java
index 65e20d83873..4e879bb9015 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TranscriptionApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TranscriptionApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
index df547070f65..69aee43c63b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiName.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiName.java
index a00cab2d9b1..3215d0d47b5 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiName.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordAllTimeApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordAllTimeApiMethod.java
index a654af767c4..fa334a257e4 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordAllTimeApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordAllTimeApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordApiMethod.java
index 60723338a93..2d207d5902d 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordDailyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordDailyApiMethod.java
index 80365db3ddf..3f5bca4630c 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordDailyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordDailyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordLastMonthApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordLastMonthApiMethod.java
index 9f92ef5d497..905b020db21 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordLastMonthApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordLastMonthApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordMonthlyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordMonthlyApiMethod.java
index a19607e4da0..aff941db034 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordMonthlyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordMonthlyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordThisMonthApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordThisMonthApiMethod.java
index f13bf130bb1..ea99f6b9b3b 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordThisMonthApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordThisMonthApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordTodayApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordTodayApiMethod.java
index 13288f2c6ba..d5888e9a2c6 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordTodayApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordTodayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYearlyApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYearlyApiMethod.java
index f065bfdadb6..2a8e608a623 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYearlyApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYearlyApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYesterdayApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYesterdayApiMethod.java
index 76b08151a6a..fb455b5ee43 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYesterdayApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageRecordYesterdayApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageTriggerApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageTriggerApiMethod.java
index f7ad80f67e9..d9a2d41de75 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageTriggerApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/UsageTriggerApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ValidationRequestApiMethod.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ValidationRequestApiMethod.java
index 61db82caf0b..86b60414cb2 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ValidationRequestApiMethod.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/ValidationRequestApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/AppleTemplate.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/AppleTemplate.vm
index 2c9ef0fa8f1..05efd0d4f92 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/AppleTemplate.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/AppleTemplate.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
$in.setHeader("fruit", "apple")I am an $body
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/BodyAsDomainObject.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/BodyAsDomainObject.vm
index 65ca2b0b0ec..23262ec4489 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/BodyAsDomainObject.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/BodyAsDomainObject.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,13 +6,13 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Hi $body.givenName how are you? Its a nice day.
Give my regards to the family $body.familyName.
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/Concurrent.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/Concurrent.vm
index 03767e42653..6b1c6a6a95f 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/Concurrent.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/Concurrent.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Bye $body
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/OrangeTemplate.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/OrangeTemplate.vm
index 17bc84ef333..ad341d27a2e 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/OrangeTemplate.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/OrangeTemplate.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
$in.setHeader("fruit", "orange")I am an $body
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/escape.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/escape.vm
index 7fa87205d14..bd970e9d163 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/escape.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/escape.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Dear ${headers.name}. You ordered item ${exchange.properties.item} on $headers.esc.xml(${body}).
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/example.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/example.vm
index 13bb870c5ff..9aba5c0917a 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/example.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/example.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Dear ${headers.name}. You ordered item ${exchange.properties.item} on ${body}.
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm
index 0eeda014236..23e5e7a8875 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/header.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Dear ${headers.lastName}, ${headers.firstName}
\ No newline at end of file
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter.vm
index d2a0f0c0596..639158a9013 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
#parse("org/apache/camel/component/velocity/header.vm")
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter2.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter2.vm
index 7f5dae89085..a120948a736 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter2.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter2.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Dear ${headers.lastName}, ${headers.firstName}
Thanks for the order of ${headers.item}.
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithParser.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithParser.vm
index a59c22c0f7d..19565032d3c 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithParser.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithParser.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
#parse("/org/apache/camel/component/velocity/header.vm")
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm
index 84338123cc6..2b2359b897c 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letterWithoutHeader.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
${body}
Thanks for the order of ${headers.item}.
diff --git a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/someValuesNotInExchange.vm b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/someValuesNotInExchange.vm
index 9d4eb02eb10..181ef64582b 100644
--- a/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/someValuesNotInExchange.vm
+++ b/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/someValuesNotInExchange.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,13 +6,13 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Hello ${headers.name}
You have id: $!{headers.id} if an id was assigned to you.
\ No newline at end of file
diff --git a/components/camel-xj/src/main/resources/org/apache/camel/component/xj/identity.xsl b/components/camel-xj/src/main/resources/org/apache/camel/component/xj/identity.xsl
index 62b2384977c..f8535a771d9 100644
--- a/components/camel-xj/src/main/resources/org/apache/camel/component/xj/identity.xsl
+++ b/components/camel-xj/src/main/resources/org/apache/camel/component/xj/identity.xsl
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="#all">
<xsl:template match="@*|node()">
<xsl:copy>
diff --git a/components/camel-xj/src/test/resources/hellojson2xml.xsl b/components/camel-xj/src/test/resources/hellojson2xml.xsl
index a647f950b20..29458d6c711 100644
--- a/components/camel-xj/src/test/resources/hellojson2xml.xsl
+++ b/components/camel-xj/src/test/resources/hellojson2xml.xsl
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/components/camel-xj/src/test/resources/helloxml2json.xsl b/components/camel-xj/src/test/resources/helloxml2json.xsl
index e2c1e4b9c82..0e5961390fc 100644
--- a/components/camel-xj/src/test/resources/helloxml2json.xsl
+++ b/components/camel-xj/src/test/resources/helloxml2json.xsl
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt
index 3bd9fdc05b4..1793b2b62bb 100644
--- a/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt
+++ b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/components/camel-zeebe/src/test/resources/data/test1_definition.bpmn b/components/camel-zeebe/src/test/resources/data/test1_definition.bpmn
index 75b66d23bf3..8f2ad4b7e05 100644
--- a/components/camel-zeebe/src/test/resources/data/test1_definition.bpmn
+++ b/components/camel-zeebe/src/test/resources/data/test1_definition.bpmn
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0ba1kkd" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.6.0" modeler:executionPlatform="Camunda C [...]
<bpmn:process id="Process_0e3ldfm" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" name="Start">
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java
index 781148e2343..7a0aeb2f976 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointConfiguration.java
@@ -1,4 +1,3 @@
-
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
index 53e4adadb7e..072078e3cfd 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java
index dee70a7dd76..29f7bcd1b10 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiMethod.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiName.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiName.java
index 6fecc1f0931..a3b5b6a3f17 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiName.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiName.java
@@ -1,4 +1,3 @@
-
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
*/
diff --git a/components/fix-eip-xrefs.sh b/components/fix-eip-xrefs.sh
index bd139fda59d..5db504a1b88 100755
--- a/components/fix-eip-xrefs.sh
+++ b/components/fix-eip-xrefs.sh
@@ -1,4 +1,21 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#version: latest component: components file: undefined path modules/languages/pages/bean-language.adoc lineno: undefined message: Unresolved page ID manual::message
#sed -i -e 's/xref:manual::message/xref:{eip-vc}:eips:manual::message/g' `find . -name "bean-language.adoc"`
diff --git a/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml b/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
index 77d63dc8ea2..aa2c5dd7f10 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/split-choice.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute
from:
diff --git a/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml b/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
index 5051e915aaf..2cf6110feaa 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/transform.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute
from:
diff --git a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
index a44b738d986..9726526f793 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
+++ b/core/camel-core/src/test/resources/org/apache/camel/util/uri-as-parameters.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute
from:
diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
index 85969008130..1b1b80022aa 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -144,6 +144,7 @@ The camel.main supports 118 options, which are listed below.
| *camel.main.uuidGenerator* | UUID generator to use. default (32 bytes), short (16 bytes), classic (32 bytes or longer), simple (long incrementing counter), off (turned off for exchanges - only intended for performance profiling) | default | String
|===
+
=== Camel Thread Pool configurations
The camel.threadpool supports 8 options, which are listed below.
@@ -160,6 +161,7 @@ The camel.threadpool supports 8 options, which are listed below.
| *camel.threadpool.timeUnit* | Sets the default time unit used for keep alive time | | TimeUnit
|===
+
=== Camel Health Check configurations
The camel.health supports 8 options, which are listed below.
@@ -176,6 +178,7 @@ The camel.health supports 8 options, which are listed below.
| *camel.health.routesEnabled* | Whether routes health check is enabled | true | Boolean
|===
+
=== Camel Rest-DSL configurations
The camel.rest supports 27 options, which are listed below.
@@ -211,6 +214,7 @@ The camel.rest supports 27 options, which are listed below.
| *camel.rest.xmlDataFormat* | Sets a custom xml data format to be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance. | | String
|===
+
=== Camel AWS Vault configurations
The camel.vault.aws supports 9 options, which are listed below.
@@ -228,6 +232,7 @@ The camel.vault.aws supports 9 options, which are listed below.
| *camel.vault.aws.secrets* | Specify the secret names (or pattern) to check for updates. Multiple secrets can be separated by comma. | | String
|===
+
=== Camel GCP Vault configurations
The camel.vault.gcp supports 7 options, which are listed below.
@@ -243,6 +248,7 @@ The camel.vault.gcp supports 7 options, which are listed below.
| *camel.vault.gcp.useDefault{zwsp}Instance* | Define if we want to use the GCP Client Default Instance or not | false | boolean
|===
+
=== Camel Azure Key Vault configurations
The camel.vault.azure supports 11 options, which are listed below.
@@ -262,6 +268,7 @@ The camel.vault.azure supports 11 options, which are listed below.
| *camel.vault.azure.vaultName* | The vault Name in Azure Key Vault | | String
|===
+
=== Fault Tolerance EIP Circuit Breaker configurations
The camel.faulttolerance supports 13 options, which are listed below.
@@ -283,6 +290,7 @@ The camel.faulttolerance supports 13 options, which are listed below.
| *camel.faulttolerance.timeout{zwsp}ScheduledExecutorService* | References to a custom thread pool to use when timeout is enabled | | String
|===
+
=== Resilience4j EIP Circuit Breaker configurations
The camel.resilience4j supports 20 options, which are listed below.
@@ -311,6 +319,7 @@ The camel.resilience4j supports 20 options, which are listed below.
| *camel.resilience4j.writable{zwsp}StackTraceEnabled* | Enables writable stack traces. When set to false, Exception.getStackTrace returns a zero length array. This may be used to reduce log spam when the circuit breaker is open as the cause of the exceptions is already known (the circuit breaker is short-circuiting calls). | false | Boolean
|===
+
=== Camel Saga EIP (Long Running Actions) configurations
The camel.lra supports 4 options, which are listed below.
diff --git a/core/camel-yaml-io/src/test/resources/route0.yaml b/core/camel-yaml-io/src/test/resources/route0.yaml
index e0b04c64f2b..1c526b23782 100644
--- a/core/camel-yaml-io/src/test/resources/route0.yaml
+++ b/core/camel-yaml-io/src/test/resources/route0.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute0
from:
diff --git a/core/camel-yaml-io/src/test/resources/route0b.yaml b/core/camel-yaml-io/src/test/resources/route0b.yaml
index 8bedbf86912..71c991b7457 100644
--- a/core/camel-yaml-io/src/test/resources/route0b.yaml
+++ b/core/camel-yaml-io/src/test/resources/route0b.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute0
from:
diff --git a/core/camel-yaml-io/src/test/resources/route1.yaml b/core/camel-yaml-io/src/test/resources/route1.yaml
index 3094d245c41..751b15bf3c3 100644
--- a/core/camel-yaml-io/src/test/resources/route1.yaml
+++ b/core/camel-yaml-io/src/test/resources/route1.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute1
from:
diff --git a/core/camel-yaml-io/src/test/resources/route2.yaml b/core/camel-yaml-io/src/test/resources/route2.yaml
index 4aa45e9a760..f8df2f22ba3 100644
--- a/core/camel-yaml-io/src/test/resources/route2.yaml
+++ b/core/camel-yaml-io/src/test/resources/route2.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute2
from:
diff --git a/core/camel-yaml-io/src/test/resources/route3.yaml b/core/camel-yaml-io/src/test/resources/route3.yaml
index 270f99b3360..2badf8a5e94 100644
--- a/core/camel-yaml-io/src/test/resources/route3.yaml
+++ b/core/camel-yaml-io/src/test/resources/route3.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute3
from:
diff --git a/core/camel-yaml-io/src/test/resources/route4.yaml b/core/camel-yaml-io/src/test/resources/route4.yaml
index 340bf477e6c..bad39879ab5 100644
--- a/core/camel-yaml-io/src/test/resources/route4.yaml
+++ b/core/camel-yaml-io/src/test/resources/route4.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute4
from:
diff --git a/core/camel-yaml-io/src/test/resources/route5.yaml b/core/camel-yaml-io/src/test/resources/route5.yaml
index 442ff2907e4..659907a4e3c 100644
--- a/core/camel-yaml-io/src/test/resources/route5.yaml
+++ b/core/camel-yaml-io/src/test/resources/route5.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute5
from:
diff --git a/core/camel-yaml-io/src/test/resources/route6.yaml b/core/camel-yaml-io/src/test/resources/route6.yaml
index 4e7d61fe0e5..81bc512dec9 100644
--- a/core/camel-yaml-io/src/test/resources/route6.yaml
+++ b/core/camel-yaml-io/src/test/resources/route6.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute6
from:
diff --git a/core/camel-yaml-io/src/test/resources/route7.yaml b/core/camel-yaml-io/src/test/resources/route7.yaml
index 51b87a2e8f6..9fdb6ad48cf 100644
--- a/core/camel-yaml-io/src/test/resources/route7.yaml
+++ b/core/camel-yaml-io/src/test/resources/route7.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute7
from:
diff --git a/core/camel-yaml-io/src/test/resources/route8.yaml b/core/camel-yaml-io/src/test/resources/route8.yaml
index a78cf12fb91..f154f3d226b 100644
--- a/core/camel-yaml-io/src/test/resources/route8.yaml
+++ b/core/camel-yaml-io/src/test/resources/route8.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute0
from:
diff --git a/core/camel-yaml-io/src/test/resources/route8b.yaml b/core/camel-yaml-io/src/test/resources/route8b.yaml
index 5fed92320d1..17ea378ea49 100644
--- a/core/camel-yaml-io/src/test/resources/route8b.yaml
+++ b/core/camel-yaml-io/src/test/resources/route8b.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute0
from:
diff --git a/core/camel-yaml-io/src/test/resources/route9.yaml b/core/camel-yaml-io/src/test/resources/route9.yaml
index 1f02c067d7a..34c35f77364 100644
--- a/core/camel-yaml-io/src/test/resources/route9.yaml
+++ b/core/camel-yaml-io/src/test/resources/route9.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- route:
id: myRoute9
from:
diff --git a/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackage.java b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackage.java
index ab377ced756..5e70aef83ae 100644
--- a/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackage.java
+++ b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackage.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package my.routes;
import org.apache.camel.builder.RouteBuilder;
diff --git a/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackageAndLineComment.java b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackageAndLineComment.java
index 800131dac7e..77093a73634 100644
--- a/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackageAndLineComment.java
+++ b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyRoutesWithPackageAndLineComment.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
// camel-k: language=java
package my.routes;
diff --git a/dsl/camel-jbang/camel-jbang-container/Dockerfile b/dsl/camel-jbang/camel-jbang-container/Dockerfile
index 90fff01a949..1064a31a37e 100644
--- a/dsl/camel-jbang/camel-jbang-container/Dockerfile
+++ b/dsl/camel-jbang/camel-jbang-container/Dockerfile
@@ -1,17 +1,19 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
FROM docker.io/jbangdev/jbang-action
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
index 63d045efa84..e029336becb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
index 716956599ad..5f997df3053 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
index b932d86f820..597874df57a 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
#
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
index 691cfe390d5..97eb97bd826 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
diff --git a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-component-configuration.js b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-component-configuration.js
index ca3e03ff61b..c6174d94f64 100644
--- a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-component-configuration.js
+++ b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-component-configuration.js
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
const SedaType = Java.type("org.apache.camel.component.seda.SedaComponent");
diff --git a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-processors.js b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-processors.js
index a4fe408c292..64941bb3c20 100644
--- a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-processors.js
+++ b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-processors.js
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
const Processor = Java.type("org.apache.camel.Processor");
const p = Java.extend(Processor);
const f = new p(function(e) { e.getMessage().setBody('function') });
diff --git a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-configuration.js b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-configuration.js
index c739f9c19e8..d4a00ec2f37 100644
--- a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-configuration.js
+++ b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-configuration.js
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
const c = restConfiguration()
c.setComponent('undertow')
diff --git a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-dsl.js b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-dsl.js
index c9ea0c640e7..7918418699b 100644
--- a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-dsl.js
+++ b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-rest-dsl.js
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
rest('/')
.produces("text/plain")
diff --git a/dsl/camel-kamelet-main/src/test/resources/my-camel-k.yaml b/dsl/camel-kamelet-main/src/test/resources/my-camel-k.yaml
index ade286b220f..57c523d8264 100644
--- a/dsl/camel-kamelet-main/src/test/resources/my-camel-k.yaml
+++ b/dsl/camel-kamelet-main/src/test/resources/my-camel-k.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
apiVersion: camel.apache.org/v1
kind: Integration
diff --git a/dsl/camel-kamelet-main/src/test/resources/my-modeline.yaml b/dsl/camel-kamelet-main/src/test/resources/my-modeline.yaml
index b253d06c164..d31fad5355a 100644
--- a/dsl/camel-kamelet-main/src/test/resources/my-modeline.yaml
+++ b/dsl/camel-kamelet-main/src/test/resources/my-modeline.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
# camel-k: property=say=Hello property=period=1000
diff --git a/dsl/camel-kamelet-main/src/test/resources/my-route.yaml b/dsl/camel-kamelet-main/src/test/resources/my-route.yaml
index 03909be7b38..068d775c74a 100644
--- a/dsl/camel-kamelet-main/src/test/resources/my-route.yaml
+++ b/dsl/camel-kamelet-main/src/test/resources/my-route.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
- from:
uri: "timer:tick"
diff --git a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
index 8f8fd433ed7..5cd51ddfb73 100644
--- a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
+++ b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/support/MyBean.kt b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/support/MyBean.kt
index 474845842b8..0c963fd6fc3 100644
--- a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/support/MyBean.kt
+++ b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/support/MyBean.kt
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MainTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MainTest.groovy
index e7d9ede9aed..094b6f262c0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MainTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MainTest.groovy
@@ -3,7 +3,7 @@
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License") you may not use this file except in compliance with
+ * (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
index b4ead24fba1..81ea00bfe24 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
index 07db1a50bb7..0b4e94675d5 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
index fa5f49df88f..53e62d3560d 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
index dd4880267af..6a0e6b7627f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml
index 08dd0217d75..29cae2e5551 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
index f65e9af772a..627bb64237a 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---------------------------------------------------------------------------
+#
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-allowable-values-dsl.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-allowable-values-dsl.yaml
index 92edc0388bc..789c47babe9 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-allowable-values-dsl.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-allowable-values-dsl.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- rest:
path: /v3
get:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
index c6fd731c069..47af55ef25d 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
- rest:
path: "/api/v3"
put:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/routes.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/routes.yaml
index 6218fd380f5..3050bdcb9ac 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/routes.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/routes.yaml
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
- from:
uri: "direct:start"
steps:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route-comment.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route-comment.yaml
index d7a65f0107c..7986a58229d 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route-comment.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route-comment.yaml
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
- route:
id: "foo"
from:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route.yaml
index 642c558b3a6..717d4eea1a1 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/my-route.yaml
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
- route:
id: "foo"
from:
diff --git a/parent/pom.xml b/parent/pom.xml
index 026fbae3190..8b94f260863 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -8,7 +8,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile b/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
index 1922c500c53..20086a88e80 100644
--- a/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
+++ b/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
@@ -1,17 +1,20 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
ARG FROMIMAGE
FROM $FROMIMAGE as artemis-base
LABEL maintainer="orpiske@apache.org"
diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
index dc23344caba..31f3ac6f0c4 100644
--- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
@@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
diff --git a/test-infra/camel-test-infra-core/pom.xml b/test-infra/camel-test-infra-core/pom.xml
index 442ac84fd81..b636224897c 100644
--- a/test-infra/camel-test-infra-core/pom.xml
+++ b/test-infra/camel-test-infra-core/pom.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/test-infra/camel-test-infra-dispatch-router/src/test/resources/org/apache/camel/test/infra/dispatch/router/services/Dockerfile b/test-infra/camel-test-infra-dispatch-router/src/test/resources/org/apache/camel/test/infra/dispatch/router/services/Dockerfile
index 339ae7e0cf8..8a620f67ca1 100644
--- a/test-infra/camel-test-infra-dispatch-router/src/test/resources/org/apache/camel/test/infra/dispatch/router/services/Dockerfile
+++ b/test-infra/camel-test-infra-dispatch-router/src/test/resources/org/apache/camel/test/infra/dispatch/router/services/Dockerfile
@@ -1,17 +1,20 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
ARG FROMIMAGE
FROM $FROMIMAGE
LABEL maintainer="orpiske@apache.org"
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/header.vm b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/header.vm
index 0eeda014236..23e5e7a8875 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/header.vm
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/header.vm
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
Dear ${headers.lastName}, ${headers.firstName}
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/jaxb.index b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/jaxb.index
index 465c86a9d20..0c8bdd478d9 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/jaxb.index
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,12 +6,12 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
PurchaseOrder
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/restlet/example/jaxb.index b/tests/camel-itest/src/test/resources/org/apache/camel/itest/restlet/example/jaxb.index
index 281d65918d6..f2cf35388cc 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/restlet/example/jaxb.index
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/restlet/example/jaxb.index
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
CheckDomainAvailabilityRestResponse
CheckDomainAvailabilityResult
CheckDomainRequest
diff --git a/tests/camel-itest/src/test/resources/securityconfig.ini b/tests/camel-itest/src/test/resources/securityconfig.ini
index e72072ec7ab..c1a2a29637f 100644
--- a/tests/camel-itest/src/test/resources/securityconfig.ini
+++ b/tests/camel-itest/src/test/resources/securityconfig.ini
@@ -1,20 +1,18 @@
#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
[users]
diff --git a/tests/camel-itest/src/test/resources/wsdl/CustomerService-1.0.0.wsdl b/tests/camel-itest/src/test/resources/wsdl/CustomerService-1.0.0.wsdl
index 1f21834ac37..34e8c9281cc 100644
--- a/tests/camel-itest/src/test/resources/wsdl/CustomerService-1.0.0.wsdl
+++ b/tests/camel-itest/src/test/resources/wsdl/CustomerService-1.0.0.wsdl
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<wsdl:definitions name="CustomerServiceV1"
targetNamespace="http://camel.apache.org/itest/customerrelations"
diff --git a/tests/camel-itest/src/test/resources/wsdl/CustomerService_noSoapAction.wsdl b/tests/camel-itest/src/test/resources/wsdl/CustomerService_noSoapAction.wsdl
index 95f0cff40b8..d64b5dbfcac 100644
--- a/tests/camel-itest/src/test/resources/wsdl/CustomerService_noSoapAction.wsdl
+++ b/tests/camel-itest/src/test/resources/wsdl/CustomerService_noSoapAction.wsdl
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -7,13 +8,14 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
-->
<wsdl:definitions name="CustomerServiceV1"
targetNamespace="http://camel.apache.org/itest/customerrelations"
diff --git a/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl b/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl
index b902eb9da85..d2f54560b19 100644
--- a/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl
+++ b/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-collection.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-collection.vm
index fb621549707..e4eb9a50ff0 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-collection.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-collection.vm
@@ -1,20 +1,4 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -22,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## api-collection.vm
/*
* Camel ApiCollection generated by camel-api-component-maven-plugin
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
index d59f83b8286..37a8b87975b 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
@@ -1,20 +1,4 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -22,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## api-endpoint-config.vm
/*
* Camel EndpointConfiguration generated by camel-api-component-maven-plugin
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-method-enum.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-method-enum.vm
index 4165fb58761..1e3c29d2dd6 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-method-enum.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-method-enum.vm
@@ -1,20 +1,4 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -22,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## api-method-enum.vm
/*
* Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
index 68b4e5c43b2..d3121ac2fb1 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-name-enum.vm
@@ -1,20 +1,4 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -22,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## api-name-enum.vm
/*
* Camel ApiName Enumeration generated by camel-api-component-maven-plugin
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm
index 32fce9e45eb..48ea132e16d 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm
@@ -1,20 +1,4 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -22,14 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## api-route-test.vm
/*
* Camel Api Route test generated by camel-api-component-maven-plugin
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/enriched-camel-spring.xsd b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/enriched-camel-spring.xsd
index 4217c6a4489..7f0cef6e378 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/enriched-camel-spring.xsd
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/resources/enriched-camel-spring.xsd
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://camel.apache.org/schema/spring" elementFormDefault="qualified" targetNamespace="http://camel.apache.org/schema/spring" version="1.0">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<xs:element name="aggregate" type="tns:aggregateDefinition">
<xs:annotation>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/annotation-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/annotation-options.mvel
index 96fdf53753b..2d7c29a0eaa 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/annotation-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/annotation-options.mvel
@@ -1,3 +1,19 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
@if{!options.isEmpty()}
[width="100%",cols="10%,10%,10%,10%,60%",options="header",]
|===
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-header.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-header.mvel
index 8fc58913660..d7032cc064a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-header.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-header.mvel
@@ -1,3 +1,19 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
= @{title}
@{description}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 220e84d4c55..cb6becfae54 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -1,2 +1,18 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
include::partial$component-configure-options.adoc[]
include::partial$component-endpoint-options.adoc[]
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
index 6a2c796bb18..0700c67bdda 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
@@ -1 +1,17 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
include::partial$dataformat-options.adoc[]
\ No newline at end of file
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
index 4a7cc05952f..050e0daeb16 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
@@ -1 +1,17 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
include::partial$eip-options.adoc[]
\ No newline at end of file
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/language-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/language-options.mvel
index 67c3942a42c..7b46968e0cd 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/language-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/language-options.mvel
@@ -1 +1,17 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
include::partial$language-options.adoc[]
\ No newline at end of file
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/main-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/main-options.mvel
index 799dd3590de..c7491e55c48 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/main-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/main-options.mvel
@@ -1,3 +1,19 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
=== @{group.description}
The @{group.name} supports @{options.size()} options, which are listed below.
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-examples.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-examples.mvel
index fd2c7a0ed03..0fda0b04143 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-examples.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-examples.mvel
@@ -1,3 +1,19 @@
+@comment{
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+}
@if{!examples.isEmpty()}
Number of Examples: @{examples.size} (@{numberOfDeprecated} deprecated)
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/src/spec/openapi.yaml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/src/spec/openapi.yaml
index d13d9b0d9ea..a3d6222e473 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/src/spec/openapi.yaml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/src/spec/openapi.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: "3.0.0"
info:
version: 1.0.0
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/src/spec/openapi.yaml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/src/spec/openapi.yaml
index acdeb1fd93d..af70174e379 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/src/spec/openapi.yaml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/src/spec/openapi.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: "3.0.0"
info:
version: 1.0.0
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/org/apache/camel/generator/openapi/petstore-v3.yaml b/tooling/openapi-rest-dsl-generator/src/test/resources/org/apache/camel/generator/openapi/petstore-v3.yaml
index a87eeba6d27..efead5c13b5 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/org/apache/camel/generator/openapi/petstore-v3.yaml
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/org/apache/camel/generator/openapi/petstore-v3.yaml
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
openapi: 3.0.2
servers:
- url: /v3
[camel] 12/18: CAMEL-19461 - Rename test resources to match license-maven-plugin configuration
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80e7e2ff54bd085918d65aab18275e4e856da104
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 20 11:40:57 2023 +0200
CAMEL-19461 - Rename test resources to match license-maven-plugin
configuration
---
.../storage/blob/integration/BlobOperationsIT.java | 24 +-
.../{upload_test_file => upload_test_file.txt} | 0
.../subfolderexample/subfile_example.file | 1 -
.../component/grok/GrokFileUnmarshalTest.java | 2 +-
.../grok/data/{access_log => access_log.txt} | 0
.../test/resources/{image_file => image_file.txt} | 0
.../test/resources/test_configuration.properties | 6 +-
.../test/resources/{video_file => video_file.txt} | 0
.../camel/component/scp/ScpSimpleProduceTest.java | 6 +-
.../{camel-key.priv => camel-key.priv.pem} | 0
.../org/apache/camel/jsonpath/JsonStreamTest.java | 4 +-
.../json_stream/{fourChar => fourChar.txt} | 0
.../resources/json_stream/{oneChar => oneChar.txt} | 0
.../ConfigMapMountPropertiesFunctionTest.java | 4 +-
.../ConfigMapPropertiesFunctionLocalModeTest.java | 4 +-
.../ConfigMapPropertiesFunctionRouteTest.java | 2 +-
.../ConfigMapPropertiesFunctionTest.java | 4 +-
.../SecretMountPropertiesFunctionTest.java | 4 +-
.../src/test/resources/myconfig/{bar => bar.txt} | 0
.../src/test/resources/myconfig/{foo => foo.txt} | 0
.../test/resources/mysecret/{mypass => mypass.txt} | 0
.../test/resources/mysecret/{myuser => myuser.txt} | 0
.../camel/component/lumberjack/LumberjackUtil.java | 2 +-
.../io/LumberjackChannelInitializerTest.java | 4 +-
.../lumberjack/io/{window10 => window10.bin} | Bin
.../lumberjack/io/{window15 => window15.bin} | Bin
.../mail/NestedMimeMessageConsumeTest.java | 2 +-
.../camel/component/mail/RawMailMessageTest.java | 2 +-
.../src/test/resources/META-INF/javamail.providers | 16 ++
...TestCaseHurz.elm => SignedMailTestCaseHurz.txt} | 0
.../{nested-multipart.elm => nested-multipart.txt} | 0
.../component/mustache/MustacheComponentTest.java | 2 +-
.../camel/language/mvel/MvelComponentTest.java | 4 +-
.../camel/component/printer/PrinterPrintTest.java | 2 +-
.../test/resources/{asf-logo.JPG => asf-logo.jpg} | Bin
.../src/main/docs/quickfix-component.adoc | 8 +-
.../component/quickfixj/QuickfixjEngineTest.java | 2 +-
.../quickfixj/examples/AuthenticationExample.java | 6 +-
.../quickfixj/examples/DynamicRoutingExample.java | 12 +-
.../quickfixj/examples/RequestReplyExample.java | 6 +-
.../quickfixj/examples/RestartRouteExample.java | 4 +-
.../quickfixj/examples/SimpleMessagingExample.java | 8 +-
.../examples/trading/TradeExecutorExample.java | 12 +-
.../examples/{gateway.cfg => gateway.qf.cfg} | 7 +-
.../examples/{inprocess.cfg => inprocess.qf.cfg} | 7 +-
.../camel-salesforce-component/README.md | 4 +-
.../component/salesforce/LoginConfigHelper.java | 2 +-
.../src/it/customized-types/pom.xml | 2 +-
.../src/it/simple-it/pom.xml | 2 +-
...ple => test-salesforce-login.sample.properties} | 3 +-
.../src/main/docs/xmlSecurity-dataformat.adoc | 6 +-
.../xmlsecurity/EncryptionAlgorithmTest.java | 12 +-
.../xmlsecurity/XMLEncryption11Test.java | 18 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 36 +--
.../SpringXmlSecurityDataFormatTest-context.xml | 4 +-
...curityDataFormatWithKeyPasswordTest-context.xml | 4 +-
...ey-pass.ks => recipient-with-key-pass.keystore} | Bin
.../resources/{recipient.ks => recipient.keystore} | Bin
.../resources/{sender.ts => sender.truststore} | Bin
.../apache/camel/component/xmpp/XmppTestUtil.java | 2 +-
.../{bogus_mina_tls.cert => bogus_mina_tls.cer} | Bin
dsl/camel-js-dsl/src/test/resources/module.js | 17 ++
dsl/camel-js-dsl/src/test/resources/module.mjs | 1 -
.../test/resources/routes/routes-with-modules.js | 18 +-
etc/eclipse/Camel.importorder | 27 ---
etc/eclipse/CamelCodeFormatter.xml | 264 ---------------------
etc/eclipse/org.eclipse.jdt.core.prefs | 261 --------------------
etc/svn-auto-props | 83 -------
68 files changed, 171 insertions(+), 762 deletions(-)
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
index 6fe837e8f86..b3f1dfccc25 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
@@ -158,12 +158,12 @@ class BlobOperationsIT extends Base {
@Test
void testUploadBlockBlob() throws Exception {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
// first: test as file provided
final File fileToUpload
- = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file")).getFile());
+ = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file.txt")).getFile());
final Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody(fileToUpload);
@@ -206,11 +206,11 @@ class BlobOperationsIT extends Base {
@Test
void testUploadBlockBlobAsCachedStream() throws Exception {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
final File fileToUpload
- = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file")).getFile());
+ = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file.txt")).getFile());
final Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody(new FileInputStreamCache(fileToUpload));
@@ -233,11 +233,11 @@ class BlobOperationsIT extends Base {
@Test
void testUploadBlockBlobAsStreamWithBlobSizeHeader() throws Exception {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
final File fileToUpload
- = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file")).getFile());
+ = new File(Objects.requireNonNull(getClass().getClassLoader().getResource("upload_test_file.txt")).getFile());
final Exchange exchange = new DefaultExchange(context);
exchange.getIn().setBody(new FileInputStream(fileToUpload));
exchange.getIn().setHeader(BlobConstants.BLOB_UPLOAD_SIZE, fileToUpload.length());
@@ -264,7 +264,7 @@ class BlobOperationsIT extends Base {
@Test
void testCommitAndStageBlockBlob() throws Exception {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
final List<BlobBlock> blocks = new LinkedList<>();
@@ -304,7 +304,7 @@ class BlobOperationsIT extends Base {
@Test
void testCreateAndUpdateAppendBlob() throws IOException {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
final String data = "Hello world from my awesome tests!";
@@ -332,7 +332,7 @@ class BlobOperationsIT extends Base {
@Test
void testCreateAndUploadPageBlob() throws IOException {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
byte[] dataBytes = new byte[512]; // we set range for the page from 0-511
@@ -363,7 +363,7 @@ class BlobOperationsIT extends Base {
@Test
void testResizePageBlob() throws IOException {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
byte[] dataBytes = new byte[1024]; // we set range for the page from 0-511
@@ -398,7 +398,7 @@ class BlobOperationsIT extends Base {
@Test
void testClearPages() throws IOException {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
byte[] dataBytes = new byte[512]; // we set range for the page from 0-511
@@ -426,7 +426,7 @@ class BlobOperationsIT extends Base {
@Test
void testGetPageBlobRanges() throws IOException {
- final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file");
+ final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("upload_test_file.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
byte[] dataBytes = new byte[512]; // we set range for the page from 0-511
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/resources/upload_test_file b/components/camel-azure/camel-azure-storage-blob/src/test/resources/upload_test_file.txt
similarity index 100%
rename from components/camel-azure/camel-azure-storage-blob/src/test/resources/upload_test_file
rename to components/camel-azure/camel-azure-storage-blob/src/test/resources/upload_test_file.txt
diff --git a/components/camel-chunk/src/test/resources/folderexample/subfolderexample/subfile_example.file b/components/camel-chunk/src/test/resources/folderexample/subfolderexample/subfile_example.file
deleted file mode 100644
index fbc5edbff52..00000000000
--- a/components/camel-chunk/src/test/resources/folderexample/subfolderexample/subfile_example.file
+++ /dev/null
@@ -1 +0,0 @@
-Earth to {$headers.name}. Come in, {$headers.name}.
\ No newline at end of file
diff --git a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java
index 91679fb6cc1..e09f115ea0f 100644
--- a/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java
+++ b/components/camel-grok/src/test/java/org/apache/camel/component/grok/GrokFileUnmarshalTest.java
@@ -32,7 +32,7 @@ public class GrokFileUnmarshalTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("file:src/test/resources/org/apache/camel/component/grok/data?fileName=access_log&noop=true")
+ from("file:src/test/resources/org/apache/camel/component/grok/data?fileName=access_log.txt&noop=true")
.unmarshal().grok("%{COMMONAPACHELOG}")
.to("mock:apachelog");
}
diff --git a/components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/access_log b/components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/access_log.txt
similarity index 100%
rename from components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/access_log
rename to components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/access_log.txt
diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/image_file b/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/image_file.txt
similarity index 100%
rename from components/camel-huawei/camel-huaweicloud-frs/src/test/resources/image_file
rename to components/camel-huawei/camel-huaweicloud-frs/src/test/resources/image_file.txt
diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/test_configuration.properties b/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/test_configuration.properties
index 05b7c08b227..fda6237ff3c 100644
--- a/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/test_configuration.properties
+++ b/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/test_configuration.properties
@@ -22,10 +22,10 @@ region=cn-north-4
endpoint=test_endpoint
imageBase64=FSZPNS01T09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0//wAARCA57PwAycDAS
imageUrl=http://image1_url
-imageFilePath=src/test/resources/image_file
+imageFilePath=src/test/resources/image_file.txt
anotherImageBase64=FSZPNS01T09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0//wAARCA57PwAycDAS
anotherImageUrl=http://image2_url
-anotherImageFilePath=src/test/resources/image_file
+anotherImageFilePath=src/test/resources/image_file.txt
videoBase64=FSZPNS01T09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0//wAARCA57PwAycDAS
videoUrl=http://image1_url
-videoFilePath=src/test/resources/video_file
\ No newline at end of file
+videoFilePath=src/test/resources/video_file.txt
\ No newline at end of file
diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/video_file b/components/camel-huawei/camel-huaweicloud-frs/src/test/resources/video_file.txt
similarity index 100%
rename from components/camel-huawei/camel-huaweicloud-frs/src/test/resources/video_file
rename to components/camel-huawei/camel-huaweicloud-frs/src/test/resources/video_file.txt
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
index 921773ccbaf..9be6da06b68 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
@@ -112,7 +112,7 @@ public class ScpSimpleProduceTest extends ScpServerTestSupport {
String uri
= getScpUri()
- + "?username=admin&privateKeyFile=src/test/resources/camel-key.priv&privateKeyFilePassphrase=password&knownHostsFile="
+ + "?username=admin&privateKeyFile=src/test/resources/camel-key.priv.pem&privateKeyFilePassphrase=password&knownHostsFile="
+ getKnownHostsFile();
template.sendBodyAndHeader(uri, "Hallo Welt", Exchange.FILE_NAME, "welt.txt");
@@ -128,7 +128,7 @@ public class ScpSimpleProduceTest extends ScpServerTestSupport {
String uri
= getScpUri()
- + "?username=admin&privateKeyFile=classpath:camel-key.priv&privateKeyFilePassphrase=password&knownHostsFile="
+ + "?username=admin&privateKeyFile=classpath:camel-key.priv.pem&privateKeyFilePassphrase=password&knownHostsFile="
+ getKnownHostsFile();
template.sendBodyAndHeader(uri, "Hallo Welt", Exchange.FILE_NAME, "welt.txt");
@@ -151,7 +151,7 @@ public class ScpSimpleProduceTest extends ScpServerTestSupport {
@BindToRegistry("privKey")
public byte[] loadPrivateKey() throws Exception {
- byte[] privKey = Files.readAllBytes(new File("src/test/resources/camel-key.priv").toPath());
+ byte[] privKey = Files.readAllBytes(new File("src/test/resources/camel-key.priv.pem").toPath());
return privKey;
}
}
diff --git a/components/camel-jsch/src/test/resources/camel-key.priv b/components/camel-jsch/src/test/resources/camel-key.priv.pem
similarity index 100%
rename from components/camel-jsch/src/test/resources/camel-key.priv
rename to components/camel-jsch/src/test/resources/camel-key.priv.pem
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
index 5f3dc278d57..da16e515125 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
@@ -91,12 +91,12 @@ public class JsonStreamTest {
@Test
public void oneChar() throws Exception {
- test("json_stream/oneChar", "UTF-8", "1");
+ test("json_stream/oneChar.txt", "UTF-8", "1");
}
@Test
public void fourChar() throws Exception {
- test("json_stream/fourChar", "UTF-8", "1234");
+ test("json_stream/fourChar.txt", "UTF-8", "1234");
}
private void test(String file, String encoding) throws Exception {
diff --git a/components/camel-jsonpath/src/test/resources/json_stream/fourChar b/components/camel-jsonpath/src/test/resources/json_stream/fourChar.txt
similarity index 100%
rename from components/camel-jsonpath/src/test/resources/json_stream/fourChar
rename to components/camel-jsonpath/src/test/resources/json_stream/fourChar.txt
diff --git a/components/camel-jsonpath/src/test/resources/json_stream/oneChar b/components/camel-jsonpath/src/test/resources/json_stream/oneChar.txt
similarity index 100%
rename from components/camel-jsonpath/src/test/resources/json_stream/oneChar
rename to components/camel-jsonpath/src/test/resources/json_stream/oneChar.txt
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
index 5f74a2f6340..335f1f7e69f 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapMountPropertiesFunctionTest.java
@@ -35,7 +35,7 @@ public class ConfigMapMountPropertiesFunctionTest extends KubernetesTestSupport
cmf.setCamelContext(context);
cmf.start();
- String out = cmf.apply("myconfig/foo");
+ String out = cmf.apply("myconfig/foo.txt");
Assertions.assertEquals("456", out);
out = cmf.apply("myconfig/unknown");
@@ -44,7 +44,7 @@ public class ConfigMapMountPropertiesFunctionTest extends KubernetesTestSupport
out = cmf.apply("myconfig/unknown:444");
Assertions.assertEquals("444", out);
- out = cmf.apply("myconfig/bar");
+ out = cmf.apply("myconfig/bar.txt");
Assertions.assertEquals("Jacks Bar", out);
}
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionLocalModeTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionLocalModeTest.java
index a82daa95e3e..51b715f9d86 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionLocalModeTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionLocalModeTest.java
@@ -32,7 +32,7 @@ public class ConfigMapPropertiesFunctionLocalModeTest extends KubernetesTestSupp
@Override
public void configure() throws Exception {
from("direct:start")
- .transform().simple("Hello ${body} we are at {{configmap:myconfig/bar}}");
+ .transform().simple("Hello ${body} we are at {{configmap:myconfig/bar.txt}}");
}
};
}
@@ -41,7 +41,7 @@ public class ConfigMapPropertiesFunctionLocalModeTest extends KubernetesTestSupp
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
context.getPropertiesComponent().addInitialProperty(ConfigMapPropertiesFunction.LOCAL_MODE, "true");
- context.getPropertiesComponent().addInitialProperty("myconfig/bar", "The Local Bar");
+ context.getPropertiesComponent().addInitialProperty("myconfig/bar.txt", "The Local Bar");
return context;
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
index 055c38994e3..ed49a865c2a 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionRouteTest.java
@@ -52,7 +52,7 @@ public class ConfigMapPropertiesFunctionRouteTest extends KubernetesTestSupport
@Override
public void configure() throws Exception {
from("direct:start")
- .transform().simple("Hello ${body} we are at {{configmap:myconfig/bar}}");
+ .transform().simple("Hello ${body} we are at {{configmap:myconfig/bar.txt}}");
}
};
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
index 9571e6926ca..1ae5067b6c1 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
@@ -58,7 +58,7 @@ public class ConfigMapPropertiesFunctionTest extends KubernetesTestSupport {
cmf.setCamelContext(context);
cmf.start();
- String out = cmf.apply("myconfig/foo");
+ String out = cmf.apply("myconfig/foo.txt");
Assertions.assertEquals("123", out);
out = cmf.apply("myconfig/unknown");
@@ -67,7 +67,7 @@ public class ConfigMapPropertiesFunctionTest extends KubernetesTestSupport {
out = cmf.apply("myconfig/unknown:444");
Assertions.assertEquals("444", out);
- out = cmf.apply("myconfig/bar");
+ out = cmf.apply("myconfig/bar.txt");
Assertions.assertEquals("Moes Bar", out);
} finally {
client.resource(cm).delete();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
index a60fbe77874..8aa1b6132b7 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretMountPropertiesFunctionTest.java
@@ -35,7 +35,7 @@ public class SecretMountPropertiesFunctionTest extends KubernetesTestSupport {
cmf.setCamelContext(context);
cmf.start();
- String out = cmf.apply("mysecret/myuser");
+ String out = cmf.apply("mysecret/myuser.txt");
Assertions.assertEquals("donald", out);
out = cmf.apply("mysecret/unknown");
@@ -44,7 +44,7 @@ public class SecretMountPropertiesFunctionTest extends KubernetesTestSupport {
out = cmf.apply("mysecret/unknown:444");
Assertions.assertEquals("444", out);
- out = cmf.apply("mysecret/mypass");
+ out = cmf.apply("mysecret/mypass.txt");
Assertions.assertEquals("seCre!t", out);
}
}
diff --git a/components/camel-kubernetes/src/test/resources/myconfig/bar b/components/camel-kubernetes/src/test/resources/myconfig/bar.txt
similarity index 100%
rename from components/camel-kubernetes/src/test/resources/myconfig/bar
rename to components/camel-kubernetes/src/test/resources/myconfig/bar.txt
diff --git a/components/camel-kubernetes/src/test/resources/myconfig/foo b/components/camel-kubernetes/src/test/resources/myconfig/foo.txt
similarity index 100%
rename from components/camel-kubernetes/src/test/resources/myconfig/foo
rename to components/camel-kubernetes/src/test/resources/myconfig/foo.txt
diff --git a/components/camel-kubernetes/src/test/resources/mysecret/mypass b/components/camel-kubernetes/src/test/resources/mysecret/mypass.txt
similarity index 100%
rename from components/camel-kubernetes/src/test/resources/mysecret/mypass
rename to components/camel-kubernetes/src/test/resources/mysecret/mypass.txt
diff --git a/components/camel-kubernetes/src/test/resources/mysecret/myuser b/components/camel-kubernetes/src/test/resources/mysecret/myuser.txt
similarity index 100%
rename from components/camel-kubernetes/src/test/resources/mysecret/myuser
rename to components/camel-kubernetes/src/test/resources/mysecret/myuser.txt
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index 1c184c04336..b8363d5d159 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -86,7 +86,7 @@ final class LumberjackUtil {
.connect("127.0.0.1", port).sync().channel(); //
// send 5 frame windows, without pausing
- windows.stream().forEach(window -> channel.writeAndFlush(readSample(String.format("io/window%s", window))));
+ windows.stream().forEach(window -> channel.writeAndFlush(readSample(String.format("io/window%s.bin", window))));
TimeUnit.MILLISECONDS.sleep(500);
channel.close();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
index c4305b913f3..d506e90b09b 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
@@ -46,8 +46,8 @@ public class LumberjackChannelInitializerTest {
// When writing the stream byte per byte in order to ensure that we support splits everywhere
// It contains 2 windows with compressed messages
- writeResourceBytePerByte(channel, "window10");
- writeResourceBytePerByte(channel, "window15");
+ writeResourceBytePerByte(channel, "window10.bin");
+ writeResourceBytePerByte(channel, "window15.bin");
// EmbeddedChannel is no "real" Channel implementation and mainly use-able for testing and embedded ChannelHandlers
// since now we are executing scheduled writeAndFlush for parallel messages within a single session
diff --git a/components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window10 b/components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window10.bin
similarity index 100%
rename from components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window10
rename to components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window10.bin
diff --git a/components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window15 b/components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window15.bin
similarity index 100%
rename from components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window15
rename to components/camel-lumberjack/src/test/resources/org/apache/camel/component/lumberjack/io/window15.bin
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
index 215bcdc3eb4..e80a1347f5f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
@@ -84,7 +84,7 @@ public class NestedMimeMessageConsumeTest extends CamelTestSupport {
folder.open(Folder.READ_WRITE);
folder.expunge();
- InputStream is = getClass().getResourceAsStream("/nested-multipart.elm");
+ InputStream is = getClass().getResourceAsStream("/nested-multipart.txt");
Message hurzMsg = new MimeMessage(sender.getSession(), is);
Message[] messages = new Message[] { hurzMsg };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index cfb34e2b06f..51cac5e2dc3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -158,7 +158,7 @@ public class RawMailMessageTest extends CamelTestSupport {
folder.open(Folder.READ_WRITE);
folder.expunge();
- InputStream is = getClass().getResourceAsStream("/SignedMailTestCaseHurz.elm");
+ InputStream is = getClass().getResourceAsStream("/SignedMailTestCaseHurz.txt");
Message hurzMsg = new MimeMessage(sender.getSession(), is);
Message[] messages = new Message[] { hurzMsg };
diff --git a/components/camel-mail/src/test/resources/META-INF/javamail.providers b/components/camel-mail/src/test/resources/META-INF/javamail.providers
index b8b694871fe..2f604a21ec6 100644
--- a/components/camel-mail/src/test/resources/META-INF/javamail.providers
+++ b/components/camel-mail/src/test/resources/META-INF/javamail.providers
@@ -1,3 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
# See http://java.sun.com/products/javamail/javadocs/javax/mail/Session.html
protocol=smtp; type=transport; class=org.apache.camel.component.mail.mock.MyMockTransport; vendor=java.net mock-javamail project;
diff --git a/components/camel-mail/src/test/resources/SignedMailTestCaseHurz.elm b/components/camel-mail/src/test/resources/SignedMailTestCaseHurz.txt
similarity index 100%
rename from components/camel-mail/src/test/resources/SignedMailTestCaseHurz.elm
rename to components/camel-mail/src/test/resources/SignedMailTestCaseHurz.txt
diff --git a/components/camel-mail/src/test/resources/nested-multipart.elm b/components/camel-mail/src/test/resources/nested-multipart.txt
similarity index 100%
rename from components/camel-mail/src/test/resources/nested-multipart.elm
rename to components/camel-mail/src/test/resources/nested-multipart.txt
diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java
index 39264111ff0..3df86ee4dd7 100644
--- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java
+++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java
@@ -45,7 +45,7 @@ public class MustacheComponentTest extends CamelTestSupport {
public void testMustache() throws Exception {
// Prepare
endSimpleMock.expectedMessageCount(1);
- endSimpleMock.expectedBodiesReceived("Message with body 'The Body' and some header 'Some Header'");
+ endSimpleMock.expectedBodiesReceived("\nMessage with body 'The Body' and some header 'Some Header'");
// Act
startSimpleProducerTemplate.sendBodyAndHeader("The Body", "someHeader", "Some Header");
// Verify
diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
index e9c6d872ab6..41a6449ae52 100644
--- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
+++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
@@ -38,7 +38,7 @@ public class MvelComponentTest extends CamelTestSupport {
}
});
- assertEquals("{ \"text\": \"The result is 14\" }", exchange.getMessage().getBody());
+ assertEquals("\n{ \"text\": \"The result is 14\" }", exchange.getMessage().getBody());
}
@Test
@@ -66,7 +66,7 @@ public class MvelComponentTest extends CamelTestSupport {
}
});
- assertEquals("{ \"text\": \"The result is 28\" }", exchange.getMessage().getBody());
+ assertEquals("\n{ \"text\": \"The result is 28\" }", exchange.getMessage().getBody());
}
@Override
diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index 0d01a3d0a16..46f89324528 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -130,7 +130,7 @@ public class PrinterPrintTest extends CamelTestSupport {
template.send("direct:start", new Processor() {
public void process(Exchange exchange) throws Exception {
// Read from an input stream
- InputStream is = IOHelper.buffered(new FileInputStream("src/test/resources/asf-logo.JPG"));
+ InputStream is = IOHelper.buffered(new FileInputStream("src/test/resources/asf-logo.jpg"));
byte buffer[] = new byte[is.available()];
int n = is.available();
diff --git a/components/camel-printer/src/test/resources/asf-logo.JPG b/components/camel-printer/src/test/resources/asf-logo.jpg
similarity index 100%
rename from components/camel-printer/src/test/resources/asf-logo.JPG
rename to components/camel-printer/src/test/resources/asf-logo.jpg
diff --git a/components/camel-quickfix/src/main/docs/quickfix-component.adoc b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
index 5cfc8ec77ce..f2828a966ba 100644
--- a/components/camel-quickfix/src/main/docs/quickfix-component.adoc
+++ b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
@@ -249,7 +249,7 @@ to the requestor session.
[source,java]
----
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER&exchangePattern=InOut")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER&exchangePattern=InOut")
.filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.ORDER_STATUS_REQUEST))
.bean(new MarketOrderStatusService());
----
@@ -428,7 +428,7 @@ passes application messages to the trade executor component.
[source,java]
----
-from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").
+from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)).
to("trade-executor:market");
----
@@ -439,7 +439,7 @@ since no session ID is specified in the endpoint URI.
[source,java]
----
-from("trade-executor:market").to("quickfix:examples/inprocess.cfg");
+from("trade-executor:market").to("quickfix:examples/inprocess.qf.cfg");
----
The trader session consumes execution report messages from the market
@@ -447,7 +447,7 @@ and processes them.
[source,java]
----
-from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET").
+from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET").
filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EXECUTION_REPORT)).
bean(new MyTradeExecutionProcessor());
----
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
index e3c0db207db..f9700046cb8 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
@@ -413,7 +413,7 @@ public class QuickfixjEngineTest {
quickfixjEngine = new QuickfixjEngine(
camelContext,
- "quickfix:test", "examples/inprocess.cfg");
+ "quickfix:test", "examples/inprocess.qf.cfg");
doLogonEventsTest(acceptorSessionID, initiatorSessionID, quickfixjEngine);
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java
index 0ba181a813d..34890c19047 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/AuthenticationExample.java
@@ -57,19 +57,19 @@ public class AuthenticationExample {
public void configure() {
// Modify the outgoing logon message to add a password
// The modified message will be sent from the FIX engine when the message exchange completes
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET").filter(PredicateBuilder.and(
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET").filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AdminMessageSent),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.LOGON)))
.bean(new CredentialInjector("PASSWORD"));
// Release latch when the trader received a logout message
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogoff))
.bean(new CountDownLatchDecrementer("logout", logoutLatch));
// Reject all logons on market side
// Demonstrates how to validate logons
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").filter(PredicateBuilder.and(
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER").filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AdminMessageReceived),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.LOGON))).bean(new LogonAuthenticator());
}
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
index 9cf7224c680..2a3e72eecf3 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
@@ -56,24 +56,24 @@ public class DynamicRoutingExample {
public void configure() throws Exception {
// Release latch when session logon events are received
// We expect four logon events (four sessions)
- from("quickfix:examples/gateway.cfg")
+ from("quickfix:examples/gateway.qf.cfg")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon))
.bean(new CountDownLatchDecrementer("logon", logonLatch));
// Dynamic router -- Uses FIX DeliverTo tags
- from("quickfix:examples/gateway.cfg")
+ from("quickfix:examples/gateway.qf.cfg")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY)
.isEqualTo(QuickfixjEventCategory.AppMessageReceived))
- .recipientList(method(new FixMessageRouter("quickfix:examples/gateway.cfg")));
+ .recipientList(method(new FixMessageRouter("quickfix:examples/gateway.qf.cfg")));
// Logger app messages as JSON
- from("quickfix:examples/gateway.cfg").filter(PredicateBuilder.or(
+ from("quickfix:examples/gateway.qf.cfg").filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageSent)))
.bean(new QuickfixjMessageJsonPrinter());
// If the trader@2 session receives an email then release the latch
- from("quickfix:examples/gateway.cfg?sessionID=FIX.4.2:TRADER@2->GATEWAY").filter(PredicateBuilder.and(
+ from("quickfix:examples/gateway.qf.cfg?sessionID=FIX.4.2:TRADER@2->GATEWAY").filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EMAIL)))
.bean(new CountDownLatchDecrementer("message", receivedMessageLatch));
@@ -91,7 +91,7 @@ public class DynamicRoutingExample {
throw new IllegalStateException("Logon did not complete");
}
- String gatewayUri = "quickfix:examples/gateway.cfg?sessionID=FIX.4.2:TRADER@1->GATEWAY";
+ String gatewayUri = "quickfix:examples/gateway.qf.cfg?sessionID=FIX.4.2:TRADER@1->GATEWAY";
Endpoint gatewayEndpoint = context.getEndpoint(gatewayUri);
Producer producer = gatewayEndpoint.createProducer();
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
index ce14244b64a..2ce971549af 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
@@ -72,13 +72,13 @@ public class RequestReplyExample {
@Override
public void configure() throws Exception {
// Synchronize the logon so we don't start sending status requests too early
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon))
.bean(new CountDownLatchDecrementer("logon", logonLatch));
// Incoming status requests are passed to the order status service and afterwards we print out that
// order status being delivered using the json printer.
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER&exchangePattern=InOut")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER&exchangePattern=InOut")
.filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.ORDER_STATUS_REQUEST))
.to("log://OrderStatusRequestLog?showAll=true&multiline=true")
.bean(new MarketOrderStatusService())
@@ -172,7 +172,7 @@ public class RequestReplyExample {
public static class FixSessionRouter {
public String route(@Header("sessionID") String sessionID) {
- return String.format("quickfix:examples/inprocess.cfg?sessionID=%s", sessionID);
+ return String.format("quickfix:examples/inprocess.qf.cfg?sessionID=%s", sessionID);
}
}
}
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RestartRouteExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RestartRouteExample.java
index 84ca802e02f..2ec169910ba 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RestartRouteExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RestartRouteExample.java
@@ -50,7 +50,7 @@ public class RestartRouteExample {
RouteBuilder routes = new RouteBuilder() {
@Override
public void configure() {
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").routeId("foo")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER").routeId("foo")
.filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EMAIL))
.bean(new CountDownLatchDecrementer("message", receivedMessageLatch));
}
@@ -61,7 +61,7 @@ public class RestartRouteExample {
LOG.info("Starting Camel context");
context.start();
- String marketUri = "quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
+ String marketUri = "quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET";
Producer producer = context.getEndpoint(marketUri).createProducer();
Email email = TestSupport.createEmailMessage("Example");
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
index 003f85c6f0a..45f2a766021 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/SimpleMessagingExample.java
@@ -57,18 +57,18 @@ public class SimpleMessagingExample {
public void configure() throws Exception {
// Release latch when session logon events are received
// We expect two events, one for the trader session and one for the market session
- from("quickfix:examples/inprocess.cfg")
+ from("quickfix:examples/inprocess.qf.cfg")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon))
.bean(new CountDownLatchDecrementer("logon", logonLatch));
// For all received messages, print the JSON-formatted message to stdout
- from("quickfix:examples/inprocess.cfg").filter(PredicateBuilder.or(
+ from("quickfix:examples/inprocess.qf.cfg").filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AdminMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)))
.bean(new QuickfixjMessageJsonPrinter());
// If the market session receives an email then release the latch
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER")
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER")
.filter(header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EMAIL))
.bean(new CountDownLatchDecrementer("message", receivedMessageLatch));
}
@@ -83,7 +83,7 @@ public class SimpleMessagingExample {
throw new IllegalStateException("Logon did not succeed");
}
- String marketUri = "quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
+ String marketUri = "quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET";
Producer producer = context.getEndpoint(marketUri).createProducer();
Email email = TestSupport.createEmailMessage("Example");
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
index ee7373f333e..03f682d0546 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorExample.java
@@ -62,24 +62,24 @@ public class TradeExecutorExample {
@Override
public void configure() throws Exception {
// Release latch when session logon events are received
- from("quickfix:examples/inprocess.cfg")
+ from("quickfix:examples/inprocess.qf.cfg")
.filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.SessionLogon))
.bean(new CountDownLatchDecrementer("logon", logonLatch));
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:MARKET->TRADER").filter(
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:MARKET->TRADER").filter(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived))
.to("trade-executor:market");
- from("trade-executor:market").to("quickfix:examples/inprocess.cfg");
+ from("trade-executor:market").to("quickfix:examples/inprocess.qf.cfg");
// Logger app messages as JSON
- from("quickfix:examples/inprocess.cfg").filter(PredicateBuilder.or(
+ from("quickfix:examples/inprocess.qf.cfg").filter(PredicateBuilder.or(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageSent)))
.bean(new QuickfixjMessageJsonPrinter());
// Release latch when trader receives execution report
- from("quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET").filter(PredicateBuilder.and(
+ from("quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET").filter(PredicateBuilder.and(
header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived),
header(QuickfixjEndpoint.MESSAGE_TYPE_KEY).isEqualTo(MsgType.EXECUTION_REPORT)))
.bean(new CountDownLatchDecrementer("execution report", executionReportLatch));
@@ -97,7 +97,7 @@ public class TradeExecutorExample {
throw new IllegalStateException("Logon did not complete");
}
- String gatewayUri = "quickfix:examples/inprocess.cfg?sessionID=FIX.4.2:TRADER->MARKET";
+ String gatewayUri = "quickfix:examples/inprocess.qf.cfg?sessionID=FIX.4.2:TRADER->MARKET";
Endpoint gatewayEndpoint = context.getEndpoint(gatewayUri);
Producer producer = gatewayEndpoint.createProducer();
diff --git a/components/camel-quickfix/src/test/resources/examples/gateway.cfg b/components/camel-quickfix/src/test/resources/examples/gateway.qf.cfg
similarity index 92%
rename from components/camel-quickfix/src/test/resources/examples/gateway.cfg
rename to components/camel-quickfix/src/test/resources/examples/gateway.qf.cfg
index 9008a030037..3adaf37cbad 100644
--- a/components/camel-quickfix/src/test/resources/examples/gateway.cfg
+++ b/components/camel-quickfix/src/test/resources/examples/gateway.qf.cfg
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,15 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
-
+## ---------------------------------------------------------------------------
#
# Creates an initiators and acceptors that communicate within a
# VM (no external socket connections).
diff --git a/components/camel-quickfix/src/test/resources/examples/inprocess.cfg b/components/camel-quickfix/src/test/resources/examples/inprocess.qf.cfg
similarity index 90%
rename from components/camel-quickfix/src/test/resources/examples/inprocess.cfg
rename to components/camel-quickfix/src/test/resources/examples/inprocess.qf.cfg
index cbf29326c13..67296362777 100644
--- a/components/camel-quickfix/src/test/resources/examples/inprocess.cfg
+++ b/components/camel-quickfix/src/test/resources/examples/inprocess.qf.cfg
@@ -1,4 +1,4 @@
-## ------------------------------------------------------------------------
+## ---------------------------------------------------------------------------
## Licensed to the Apache Software Foundation (ASF) under one or more
## contributor license agreements. See the NOTICE file distributed with
## this work for additional information regarding copyright ownership.
@@ -6,15 +6,14 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-## ------------------------------------------------------------------------
-
+## ---------------------------------------------------------------------------
#
# Creates an initiator and acceptor that communicate within a
# VM (no external socket connections).
diff --git a/components/camel-salesforce/camel-salesforce-component/README.md b/components/camel-salesforce/camel-salesforce-component/README.md
index ace7f81d765..ce9809bfca6 100644
--- a/components/camel-salesforce/camel-salesforce-component/README.md
+++ b/components/camel-salesforce/camel-salesforce-component/README.md
@@ -15,7 +15,7 @@ In order to run the integration tests you need a Salesforce Developer account. Y
As of 2.19 we maintain any Salesforce setup needed to run the integration tests in the `it/resources/salesforce` directory, the files there are generated by the _Salesforce Migration Tool_ that you can freely download from [Force.com Migration Tool](https://developer.salesforce.com/page/Force.com_Migration_Tool). This is an Apache Ant extension, by which you get additional Ant tasks to retrieve and to upload configuration, classes, schema changes and such. Download it and place the `ant- [...]
-We have integrated _Salesforce Migration Tool_ into the Maven _integration-test_ lifecycle phase and it should run and update your Salesforce instance to a state capable of running integration tests. Start by creating `test-salesforce-login.properties` in the parent Maven module (`camel-salesforce`), you can use `test-salesforce-login.properties.sample` as reference.
+We have integrated _Salesforce Migration Tool_ into the Maven _integration-test_ lifecycle phase and it should run and update your Salesforce instance to a state capable of running integration tests. Start by creating `test-salesforce-login.properties` in the parent Maven module (`camel-salesforce`), you can use `test-salesforce-login.sample.properties` as reference.
**Note:** Remember that if you do not relax IP restrictions, by default you'll need to append the security token on the password you place in the `test-salesforce-login.properties` file.
@@ -24,7 +24,7 @@ Before running the tests for the first time run the migration by invoking Maven
$ mvn -Pintegration resources:copy-resources@copy-test-salesforce-login-properties \
resources:copy-resources@set-connected-app-client-id antrun:run@setup-salesforce-instance
-This will create a _Connected App_ with predefined Consumer Key (the one mentioned in the comment one in `test-salesforce-login.properties.sample`) and _Consumer Secret_ (`clientSecret`) with the name of `CamelSalesforceIntegrationTests`.
+This will create a _Connected App_ with predefined Consumer Key (the one mentioned in the comment one in `test-salesforce-login.sample.properties`) and _Consumer Secret_ (`clientSecret`) with the name of `CamelSalesforceIntegrationTests`.
Note that this deployment is run every time you run the integration tests by issuing from the `camel-salesforce-component` Maven module directory:
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
index f81127fe722..97f0332e740 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
@@ -96,7 +96,7 @@ public final class LoginConfigHelper {
System.out.println("With authentication information to access a Salesforce instance.");
System.out.println("You can use:");
System.out.println();
- System.out.println("camel/components/camel-salesforce/test-salesforce-login.properties.sample");
+ System.out.println("camel/components/camel-salesforce/test-salesforce-login.sample.properties");
System.out.println();
System.out.println("as reference. A free Salesforce developer account can be obtained at:");
System.out.println();
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/customized-types/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/customized-types/pom.xml
index 48ab5521fc0..2dd0bd42ed5 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/customized-types/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/customized-types/pom.xml
@@ -45,7 +45,7 @@
<goals><goal>read-project-properties</goal></goals>
<configuration>
<files>
- <file>../../../../test-salesforce-login.properties.sample</file>
+ <file>../../../../test-salesforce-login.sample.properties</file>
</files>
</configuration>
</execution>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
index cf8a2e7db79..68746d54f35 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml
@@ -45,7 +45,7 @@
<goals><goal>read-project-properties</goal></goals>
<configuration>
<files>
- <file>../../../../test-salesforce-login.properties.sample</file>
+ <file>../../../../test-salesforce-login.sample.properties</file>
</files>
</configuration>
</execution>
diff --git a/components/camel-salesforce/test-salesforce-login.properties.sample b/components/camel-salesforce/test-salesforce-login.sample.properties
similarity index 98%
rename from components/camel-salesforce/test-salesforce-login.properties.sample
rename to components/camel-salesforce/test-salesforce-login.sample.properties
index 2b79643984f..2b26ac7edd1 100644
--- a/components/camel-salesforce/test-salesforce-login.properties.sample
+++ b/components/camel-salesforce/test-salesforce-login.sample.properties
@@ -6,7 +6,7 @@
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-
# In order to run the integration tests you need a Salesforce Developer
# account. You can get a Salesforce Developer account by visiting
# https://developer.salesforce.com and sign up for one.
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc b/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
index e4693a8695b..4ddc0d73c9e 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlSecurity-dataformat.adoc
@@ -130,7 +130,7 @@ namespaces.put("cust", "http://cheese.xmlsecurity.camel.apache.org/");
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
-tsParameters.setResource("sender.ts");
+tsParameters.setResource("sender.truststore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -171,7 +171,7 @@ Spring XML Sender
[source,xml]
--------------------------------------------------------------------------------------------------
<!-- trust store configuration -->
-<camel:keyStoreParameters id="trustStoreParams" resource="./sender.ts" password="password"/>
+<camel:keyStoreParameters id="trustStoreParams" resource="./sender.truststore" password="password"/>
<camelContext id="springXmlSecurityDataFormatTestCamelContext"
xmlns="http://camel.apache.org/schema/spring"
@@ -196,7 +196,7 @@ Spring XML Recipient
----------------------------------------------------------------------------------------------
<!-- key store configuration -->
-<camel:keyStoreParameters id="keyStoreParams" resource="./recipient.ks" password="password" />
+<camel:keyStoreParameters id="keyStoreParams" resource="./recipient.keystore" password="password" />
<camelContext id="springXmlSecurityDataFormatTestCamelContext"
xmlns="http://camel.apache.org/schema/spring"
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
index e646877175a..0719f477a98 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
@@ -358,7 +358,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
sendingDataFormat.setKeyOrTrustStoreParameters(tsParameters);
final XMLSecurityDataFormat receivingDataFormat = new XMLSecurityDataFormat();
@@ -368,7 +368,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
receivingDataFormat.setKeyOrTrustStoreParameters(ksParameters);
context.addRoutes(new RouteBuilder() {
@@ -393,7 +393,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
sendingDataFormat.setKeyOrTrustStoreParameters(tsParameters);
final XMLSecurityDataFormat receivingDataFormat = new XMLSecurityDataFormat();
@@ -403,7 +403,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
receivingDataFormat.setKeyOrTrustStoreParameters(ksParameters);
context.addRoutes(new RouteBuilder() {
@@ -428,7 +428,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
sendingDataFormat.setKeyOrTrustStoreParameters(tsParameters);
final XMLSecurityDataFormat receivingDataFormat = new XMLSecurityDataFormat();
@@ -438,7 +438,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
receivingDataFormat.setKeyOrTrustStoreParameters(ksParameters);
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
index 227bf3e9cfd..1241eb39317 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java
@@ -72,7 +72,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
public void testFullPayloadAsymmetricKeyEncryptionGCM() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyCipherAlgorithm(XMLCipher.RSA_OAEP);
@@ -93,7 +93,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
public void testFullPayloadAsymmetricKeyEncryptionSHA256() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyCipherAlgorithm(XMLCipher.RSA_OAEP);
@@ -115,7 +115,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
public void testFullPayloadAsymmetricKeyEncryptionMGF256() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyCipherAlgorithm(XMLCipher.RSA_OAEP_11);
@@ -141,11 +141,11 @@ public class XMLEncryption11Test extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -164,11 +164,11 @@ public class XMLEncryption11Test extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -189,7 +189,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyCipherAlgorithm(XMLCipher.RSA_OAEP_11);
@@ -200,7 +200,7 @@ public class XMLEncryption11Test extends CamelTestSupport {
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
index 5022afcd85d..cf2522dc5d8 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
@@ -155,7 +155,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void testFullPayloadAsymmetricKeyEncryption() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyCipherAlgorithm(XMLCipher.RSA_v1dot5);
@@ -176,7 +176,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void testPartialPayloadAsymmetricKeyEncryptionWithContextTruststoreProperties() throws Exception {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -194,7 +194,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void testAsymmetricEncryptionAddKeyValue() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyOrTrustStoreParameters(tsParameters);
@@ -217,7 +217,7 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void testAsymmetricEncryptionNoKeyValue() throws Exception {
KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final XMLSecurityDataFormat xmlEncDataFormat = new XMLSecurityDataFormat();
xmlEncDataFormat.setKeyOrTrustStoreParameters(tsParameters);
@@ -339,11 +339,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -362,11 +362,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient-with-key-pass.ks");
+ ksParameters.setResource("recipient-with-key-pass.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -388,11 +388,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -413,11 +413,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
public void testPartialPayloadAsymmetricKeyDecryptionCustomNS() throws Exception {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
final Map<String, String> namespaces = new HashMap<>();
namespaces.put("cust", "http://cheese.xmlsecurity.camel.apache.org/");
@@ -442,11 +442,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
// RSA v1.5 is not allowed unless explicitly configured
context.addRoutes(new RouteBuilder() {
@@ -472,11 +472,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
// RSA v1.5 is not allowed unless explicitly configured
context.addRoutes(new RouteBuilder() {
@@ -505,11 +505,11 @@ public class XMLSecurityDataFormatTest extends CamelTestSupport {
final KeyStoreParameters tsParameters = new KeyStoreParameters();
tsParameters.setPassword("password");
- tsParameters.setResource("sender.ts");
+ tsParameters.setResource("sender.truststore");
final KeyStoreParameters ksParameters = new KeyStoreParameters();
ksParameters.setPassword("password");
- ksParameters.setResource("recipient.ks");
+ ksParameters.setResource("recipient.keystore");
// RSA v1.5 is not allowed unless explicitly configured
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
index 1e4ae22d286..d4b828d1eae 100644
--- a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
+++ b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatTest-context.xml
@@ -26,10 +26,10 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" >
<!-- key store configuration -->
- <camel:keyStoreParameters id="keyStoreParams" resource="./recipient.ks" password="password" />
+ <camel:keyStoreParameters id="keyStoreParams" resource="./recipient.keystore" password="password" />
<!-- trust store configuration -->
- <camel:keyStoreParameters id="trustStoreParams" resource="./sender.ts" password="password"/>
+ <camel:keyStoreParameters id="trustStoreParams" resource="./sender.truststore" password="password"/>
<!-- This route demonstrates the XML spring configuration of partial-payload encryption and decryption for
an XML document with namespaces. The domain namespace prefix (cheese) is declared in the camel context
diff --git a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
index b56cb09fc16..60e3880ec87 100644
--- a/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
+++ b/components/camel-xmlsecurity/src/test/resources/org/apache/camel/dataformat/xmlsecurity/SpringXmlSecurityDataFormatWithKeyPasswordTest-context.xml
@@ -26,10 +26,10 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" >
<!-- key store configuration -->
- <camel:keyStoreParameters id="keyStoreParams" resource="./recipient-with-key-pass.ks" password="password" />
+ <camel:keyStoreParameters id="keyStoreParams" resource="./recipient-with-key-pass.keystore" password="password" />
<!-- trust store configuration -->
- <camel:keyStoreParameters id="trustStoreParams" resource="./sender.ts" password="password"/>
+ <camel:keyStoreParameters id="trustStoreParams" resource="./sender.truststore" password="password"/>
<!-- This route demonstrates the XML spring configuration of partial-payload encryption and decryption for
an XML document with namespaces. The domain namespace prefix (cheese) is declared in the camel context
diff --git a/components/camel-xmlsecurity/src/test/resources/recipient-with-key-pass.ks b/components/camel-xmlsecurity/src/test/resources/recipient-with-key-pass.keystore
similarity index 100%
rename from components/camel-xmlsecurity/src/test/resources/recipient-with-key-pass.ks
rename to components/camel-xmlsecurity/src/test/resources/recipient-with-key-pass.keystore
diff --git a/components/camel-xmlsecurity/src/test/resources/recipient.ks b/components/camel-xmlsecurity/src/test/resources/recipient.keystore
similarity index 100%
rename from components/camel-xmlsecurity/src/test/resources/recipient.ks
rename to components/camel-xmlsecurity/src/test/resources/recipient.keystore
diff --git a/components/camel-xmlsecurity/src/test/resources/sender.ts b/components/camel-xmlsecurity/src/test/resources/sender.truststore
similarity index 100%
rename from components/camel-xmlsecurity/src/test/resources/sender.ts
rename to components/camel-xmlsecurity/src/test/resources/sender.truststore
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java
index cede7e8685c..c540951ede2 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java
@@ -38,7 +38,7 @@ public final class XmppTestUtil {
public static void bindSSLContextTo(Registry registry, String hostAddress, int port) throws Exception {
KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(ObjectHelper.loadResourceAsStream("bogus_mina_tls.cert"), "boguspw".toCharArray());
+ keyStore.load(ObjectHelper.loadResourceAsStream("bogus_mina_tls.cer"), "boguspw".toCharArray());
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(keyStore);
SSLContext sslContext = SSLContext.getInstance("TLS");
diff --git a/components/camel-xmpp/src/test/resources/bogus_mina_tls.cert b/components/camel-xmpp/src/test/resources/bogus_mina_tls.cer
similarity index 100%
rename from components/camel-xmpp/src/test/resources/bogus_mina_tls.cert
rename to components/camel-xmpp/src/test/resources/bogus_mina_tls.cer
diff --git a/dsl/camel-js-dsl/src/test/resources/module.js b/dsl/camel-js-dsl/src/test/resources/module.js
new file mode 100644
index 00000000000..215be944e4e
--- /dev/null
+++ b/dsl/camel-js-dsl/src/test/resources/module.js
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export const greeting = "Hello World!";
\ No newline at end of file
diff --git a/dsl/camel-js-dsl/src/test/resources/module.mjs b/dsl/camel-js-dsl/src/test/resources/module.mjs
deleted file mode 100644
index 9e325124f60..00000000000
--- a/dsl/camel-js-dsl/src/test/resources/module.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export const greeting = "Hello World!";
\ No newline at end of file
diff --git a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-modules.js b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-modules.js
index fc759ebed6e..48e97a45827 100644
--- a/dsl/camel-js-dsl/src/test/resources/routes/routes-with-modules.js
+++ b/dsl/camel-js-dsl/src/test/resources/routes/routes-with-modules.js
@@ -1,4 +1,20 @@
-import { greeting } from "src/test/resources/module.mjs";
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { greeting } from "src/test/resources/module.js";
from('timer:tick')
.to('log:info')
\ No newline at end of file
diff --git a/etc/eclipse/Camel.importorder b/etc/eclipse/Camel.importorder
deleted file mode 100644
index aebb8bc920c..00000000000
--- a/etc/eclipse/Camel.importorder
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-#Organize Import Order
-#Thu Aug 11 12:37:29 EDT 2005
-4=junit
-3=org.xml
-2=org.w3c
-1=javax
-0=java
diff --git a/etc/eclipse/CamelCodeFormatter.xml b/etc/eclipse/CamelCodeFormatter.xml
deleted file mode 100644
index 74c359633f3..00000000000
--- a/etc/eclipse/CamelCodeFormatter.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<profiles version="8">
-<profile name="Camel Java Conventions" version="8">
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="32"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="180"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-</profile>
-</profiles>
diff --git a/etc/eclipse/org.eclipse.jdt.core.prefs b/etc/eclipse/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e60e595c39..00000000000
--- a/etc/eclipse/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,261 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=18
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=32
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=110
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-
diff --git a/etc/svn-auto-props b/etc/svn-auto-props
deleted file mode 100644
index 96c7540c16a..00000000000
--- a/etc/svn-auto-props
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-### Section for configuring miscelleneous Subversion options.
-[miscellany]
-### Set enable-auto-props to 'yes' to enable automatic properties
-### for 'svn add' and 'svn import', it defaults to 'no'.
-### Automatic properties are defined in the section 'auto-props'.
-enable-auto-props = yes
-
-### Section for configuring automatic properties.
-### The format of the entries is:
-### file-name-pattern = propname[=value][;propname[=value]...]
-### The file-name-pattern can contain wildcards (such as '*' and
-### '?'). All entries which match will be applied to the file.
-### Note that auto-props functionality must be enabled, which
-### is typically done by setting the 'enable-auto-props' option.
-[auto-props]
-*.java = svn:eol-style=native;svn:keywords=Rev Date
-*.xml = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.xsl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.xsd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.xjb = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.wsdl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.properties = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Rev Date
-.checkstyle = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-.pmd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-.ruleset = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.c = svn:eol-style=native;svn:keywords=Rev Date
-*.cpp = svn:eol-style=native;svn:keywords=Rev Date
-*.h = svn:eol-style=native;svn:keywords=Rev Date
-*.dsp = svn:eol-style=CRLF
-*.dsw = svn:eol-style=CRLF
-*.sh = svn:eol-style=native;svn:executable
-*.bat = svn:eol-style=native
-*.pl = svn:eol-style=native
-*.py = svn:eol-style=native
-*.cmd = svn:eol-style=native
-*.txt = svn:eol-style=native;svn:mime-type=text/plain
-*.cat = svn:eol-style=native;svn:mime-type=text/plain
-*.htm* = svn:eol-style=native;svn:mime-type=text/html;svn:keywords=Rev Date
-ChangeLog = svn:eol-style=native;svn:mime-type=text/plain
-README* = svn:eol-style=native;svn:mime-type=text/plain
-LICENSE* = svn:eol-style=native;svn:mime-type=text/plain
-NOTICE* = svn:eol-style=native;svn:mime-type=text/plain
-TODO* = svn:eol-style=native;svn:mime-type=text/plain
-KEYS* = svn:eol-style=native;svn:mime-type=text/plain
-INSTALL* = svn:eol-style=native;svn:mime-type=text/plain
-WHATSNEW* = svn:eol-style=native;svn:mime-type=text/plain
-NEWS* = svn:eol-style=native;svn:mime-type=text/plain
-COPYING = svn:eol-style=native;svn:mime-type=text/plain
-*.png = svn:mime-type=image/png
-*.jpg = svn:mime-type=image/jpeg
-*.gif = svn:mime-type=image/gif
-Makefile = svn:eol-style=native
-*.css = svn:eol-style=native
-*.js = svn:eol-style=native
-*.jsx = svn:eol-style=native
-#Tuscany/SCA work should also have:
-*.wsdd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.scdl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.componentType = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date
-*.fragment = svn:eol-style=native
-sca.subsystem = svn:eol-style=native;svn:mime-type=text/xml
-
-
[camel] 08/18: Do not run Maven plugin integration tests with -DskipTests
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7afe20a4c7247c69903913bf0c455f006d3de3f1
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Jun 18 01:08:10 2023 +0200
Do not run Maven plugin integration tests with -DskipTests
---
pom.xml | 2 +
.../camel/maven/packaging/ComponentDslMojo.java | 2 +-
.../camel/maven/packaging/EndpointDslMojo.java | 2 +-
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 30 +
.../src/it/spring-boot-starter-support/pom.xml | 65 --
.../src/spec/openapi.json | 1093 --------------------
.../it/spring-boot-starter-support/verify.groovy | 22 -
7 files changed, 34 insertions(+), 1182 deletions(-)
diff --git a/pom.xml b/pom.xml
index b2d6b9eba61..17ef5a0199d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,8 @@
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
<camel.javadoc.offline>false</camel.javadoc.offline>
+
+ <invoker.skip>${skipTests}</invoker.skip>
</properties>
<!-- Comment out the snapshot repositories as we don't need them now -->
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 1a01d7a3c8e..440791c6321 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -98,7 +98,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
* The catalog directory where the component json files are
*/
@Parameter(property = "camel.pmp.json-directory",
- defaultValue = "${project.build.directory}/../../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
+ defaultValue = "${project.basedir}/../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
protected File jsonDir;
private transient String licenseHeader;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 5121f6c1c22..8232d050f95 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -119,7 +119,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
/**
* The catalog directory where the component json files are
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
+ @Parameter(defaultValue = "${project.basedir}/../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
protected File jsonDir;
private transient String licenseHeader;
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index 61b7ee1bc17..2216a41edb0 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -91,6 +91,36 @@
<version>${jakarta-annotation-api-version}</version>
<scope>test</scope>
</dependency>
+
+ <!-- Used in integration tests -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-openapi-java</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
deleted file mode 100644
index d23114488ca..00000000000
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.camel.maven.generator.openapi.it</groupId>
- <artifactId>spring-boot-starter-support</artifactId>
- <version>1-SNAPSHOT</version>
-
- <description>A simple IT verifying the spring boot starter support use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>17</maven.compiler.release>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <id>spring-boot-starter-support</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <configOptions>
- <dateLibrary>java8</dateLibrary>
- </configOptions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-netty-http-starter</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/src/spec/openapi.json b/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/src/spec/openapi.json
deleted file mode 100644
index 3ccbf1bd9a6..00000000000
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/src/spec/openapi.json
+++ /dev/null
@@ -1,1093 +0,0 @@
-{
- "openapi": "3.0.2",
- "info": {
- "title": "Swagger Petstore",
- "version": "1.0.0",
- "description": "This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.",
- "termsOfService": "http://swagger.io/terms/",
- "contact": {
- "email": "apiteam@swagger.io"
- },
- "license": {
- "name": "Apache 2.0",
- "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
- }
- },
- "servers": [
- {
- "url": "http://petstore.swagger.io/api/v3"
- }
- ],
- "paths": {
- "/pet": {
- "put": {
- "requestBody": {
- "description": "Pet object that needs to be added to the store",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- },
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- },
- "required": true
- },
- "tags": [
- "pet"
- ],
- "responses": {
- "400": {
- "description": "Invalid ID supplied"
- },
- "404": {
- "description": "Pet not found"
- },
- "405": {
- "description": "Validation exception"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "updatePet",
- "summary": "Update an existing pet",
- "description": ""
- },
- "post": {
- "requestBody": {
- "description": "Pet object that needs to be added to the store",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- },
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- },
- "required": true
- },
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "verbose",
- "description": "Verbose data",
- "schema": {
- "default": false,
- "type": "boolean"
- },
- "in": "query"
- }
- ],
- "responses": {
- "405": {
- "description": "Invalid input"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "addPet",
- "summary": "Add a new pet to the store",
- "description": ""
- }
- },
- "/pet/findByStatus": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "style": "form",
- "explode": true,
- "name": "status",
- "description": "Status values that need to be considered for filter",
- "schema": {
- "type": "array",
- "items": {
- "default": "available",
- "enum": [
- "available",
- "pending",
- "sold"
- ],
- "type": "string"
- }
- },
- "in": "query",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- },
- "application/json": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid status value"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "findPetsByStatus",
- "summary": "Finds Pets by status",
- "description": "Multiple status values can be provided with comma separated strings"
- }
- },
- "/pet/findByTags": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "style": "form",
- "explode": true,
- "name": "tags",
- "description": "Tags to filter by",
- "schema": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "in": "query",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- },
- "application/json": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid tag value"
- }
- },
- "deprecated": true,
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "findPetsByTags",
- "summary": "Finds Pets by tags",
- "description": "Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing."
- }
- },
- "/pet/{petId}": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "petId",
- "description": "ID of pet to return",
- "schema": {
- "format": "int64",
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- },
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/Pet"
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid ID supplied"
- },
- "404": {
- "description": "Pet not found"
- }
- },
- "security": [
- {
- "api_key": []
- }
- ],
- "operationId": "getPetById",
- "summary": "Find pet by ID",
- "description": "Returns a single pet"
- },
- "post": {
- "requestBody": {
- "content": {
- "application/x-www-form-urlencoded": {
- "schema": {
- "type": "object",
- "properties": {
- "name": {
- "description": "Updated name of the pet",
- "type": "string"
- },
- "status": {
- "description": "Updated status of the pet",
- "type": "string"
- }
- }
- }
- }
- },
- "required": true
- },
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "petId",
- "description": "ID of pet that needs to be updated",
- "schema": {
- "format": "int64",
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "405": {
- "description": "Invalid input"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "updatePetWithForm",
- "summary": "Updates a pet in the store with form data",
- "description": ""
- },
- "delete": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "api_key",
- "schema": {
- "type": "string"
- },
- "in": "header",
- "required": false
- },
- {
- "name": "petId",
- "description": "Pet id to delete",
- "schema": {
- "format": "int64",
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid ID supplied"
- },
- "404": {
- "description": "Pet not found"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "deletePet",
- "summary": "Deletes a pet",
- "description": ""
- }
- },
- "/pet/{petId}/uploadImage": {
- "post": {
- "requestBody": {
- "content": {
- "multipart/form-data": {
- "schema": {
- "type": "object",
- "properties": {
- "additionalMetadata": {
- "description": "Additional data to pass to server",
- "type": "string"
- },
- "file": {
- "format": "binary",
- "description": "file to upload",
- "type": "string"
- }
- }
- }
- }
- },
- "required": true
- },
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "petId",
- "description": "ID of pet to update",
- "schema": {
- "format": "int64",
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ApiResponse"
- }
- }
- },
- "description": "successful operation"
- }
- },
- "security": [
- {
- "petstore_auth": [
- "write:pets",
- "read:pets"
- ]
- }
- ],
- "operationId": "uploadFile",
- "summary": "uploads an image",
- "description": ""
- }
- },
- "/store/inventory": {
- "get": {
- "tags": [
- "store"
- ],
- "responses": {
- "200": {
- "content": {
- "application/json": {
- "schema": {
- "type": "object",
- "additionalProperties": {
- "format": "int32",
- "type": "integer"
- }
- }
- }
- },
- "description": "successful operation"
- }
- },
- "security": [
- {
- "api_key": []
- }
- ],
- "operationId": "getInventory",
- "summary": "Returns pet inventories by status",
- "description": "Returns a map of status codes to quantities"
- }
- },
- "/store/order": {
- "post": {
- "requestBody": {
- "description": "order placed for purchasing the pet",
- "content": {
- "*/*": {
- "schema": {
- "$ref": "#/components/schemas/Order"
- }
- }
- },
- "required": true
- },
- "tags": [
- "store"
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/Order"
- }
- },
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/Order"
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid Order"
- }
- },
- "operationId": "placeOrder",
- "summary": "Place an order for a pet",
- "description": ""
- }
- },
- "/store/order/{orderId}": {
- "get": {
- "tags": [
- "store"
- ],
- "parameters": [
- {
- "name": "orderId",
- "description": "ID of pet that needs to be fetched",
- "schema": {
- "format": "int64",
- "maximum": 10,
- "minimum": 1,
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/Order"
- }
- },
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/Order"
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid ID supplied"
- },
- "404": {
- "description": "Order not found"
- }
- },
- "operationId": "getOrderById",
- "summary": "Find purchase order by ID",
- "description": "For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions"
- },
- "delete": {
- "tags": [
- "store"
- ],
- "parameters": [
- {
- "name": "orderId",
- "description": "ID of the order that needs to be deleted",
- "schema": {
- "format": "int64",
- "minimum": 1,
- "type": "integer"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid ID supplied"
- },
- "404": {
- "description": "Order not found"
- }
- },
- "operationId": "deleteOrder",
- "summary": "Delete purchase order by ID",
- "description": "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors"
- }
- },
- "/user": {
- "post": {
- "requestBody": {
- "description": "Created user object",
- "content": {
- "*/*": {
- "schema": {
- "$ref": "#/components/schemas/User"
- }
- }
- },
- "required": true
- },
- "tags": [
- "user"
- ],
- "responses": {
- "default": {
- "description": "successful operation"
- }
- },
- "operationId": "createUser",
- "summary": "Create user",
- "description": "This can only be done by the logged in user."
- }
- },
- "/user/createWithArray": {
- "post": {
- "requestBody": {
- "description": "List of user object",
- "content": {
- "*/*": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/User"
- }
- }
- }
- },
- "required": true
- },
- "tags": [
- "user"
- ],
- "responses": {
- "default": {
- "description": "successful operation"
- }
- },
- "operationId": "createUsersWithArrayInput",
- "summary": "Creates list of users with given input array",
- "description": ""
- }
- },
- "/user/createWithList": {
- "post": {
- "requestBody": {
- "description": "List of user object",
- "content": {
- "*/*": {
- "schema": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/User"
- }
- }
- }
- },
- "required": true
- },
- "tags": [
- "user"
- ],
- "responses": {
- "default": {
- "description": "successful operation"
- }
- },
- "operationId": "createUsersWithListInput",
- "summary": "Creates list of users with given input array",
- "description": ""
- }
- },
- "/user/login": {
- "get": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "description": "The user name for login",
- "schema": {
- "type": "string"
- },
- "in": "query",
- "required": true
- },
- {
- "name": "password",
- "description": "The password for login in clear text",
- "schema": {
- "type": "string"
- },
- "in": "query",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "headers": {
- "X-Rate-Limit": {
- "schema": {
- "format": "int32",
- "type": "integer"
- },
- "description": "calls per hour allowed by the user"
- },
- "X-Expires-After": {
- "schema": {
- "format": "date-time",
- "type": "string"
- },
- "description": "date in UTC when token expires"
- }
- },
- "content": {
- "application/xml": {
- "schema": {
- "type": "string"
- }
- },
- "application/json": {
- "schema": {
- "type": "string"
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid username/password supplied"
- }
- },
- "operationId": "loginUser",
- "summary": "Logs user into the system",
- "description": ""
- }
- },
- "/user/logout": {
- "get": {
- "tags": [
- "user"
- ],
- "responses": {
- "default": {
- "description": "successful operation"
- }
- },
- "operationId": "logoutUser",
- "summary": "Logs out current logged in user session",
- "description": ""
- }
- },
- "/user/{username}": {
- "get": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "description": "The name that needs to be fetched. Use user1 for testing. ",
- "schema": {
- "type": "string"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "content": {
- "application/xml": {
- "schema": {
- "$ref": "#/components/schemas/User"
- }
- },
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/User"
- }
- }
- },
- "description": "successful operation"
- },
- "400": {
- "description": "Invalid username supplied"
- },
- "404": {
- "description": "User not found"
- }
- },
- "operationId": "getUserByName",
- "summary": "Get user by user name",
- "description": ""
- },
- "put": {
- "requestBody": {
- "description": "Updated user object",
- "content": {
- "*/*": {
- "schema": {
- "$ref": "#/components/schemas/User"
- }
- }
- },
- "required": true
- },
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "description": "name that need to be updated",
- "schema": {
- "type": "string"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid user supplied"
- },
- "404": {
- "description": "User not found"
- }
- },
- "operationId": "updateUser",
- "summary": "Updated user",
- "description": "This can only be done by the logged in user."
- },
- "delete": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "description": "The name that needs to be deleted",
- "schema": {
- "type": "string"
- },
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid username supplied"
- },
- "404": {
- "description": "User not found"
- }
- },
- "operationId": "deleteUser",
- "summary": "Delete user",
- "description": "This can only be done by the logged in user."
- }
- }
- },
- "components": {
- "schemas": {
- "Order": {
- "type": "object",
- "properties": {
- "id": {
- "format": "int64",
- "type": "integer"
- },
- "petId": {
- "format": "int64",
- "type": "integer"
- },
- "quantity": {
- "format": "int32",
- "type": "integer"
- },
- "shipDate": {
- "format": "date-time",
- "type": "string"
- },
- "status": {
- "description": "Order Status",
- "enum": [
- "placed",
- "approved",
- "delivered"
- ],
- "type": "string"
- },
- "complete": {
- "default": false,
- "type": "boolean"
- }
- },
- "xml": {
- "name": "Order"
- }
- },
- "Category": {
- "type": "object",
- "properties": {
- "id": {
- "format": "int64",
- "type": "integer"
- },
- "name": {
- "type": "string"
- }
- },
- "xml": {
- "name": "Category"
- }
- },
- "User": {
- "type": "object",
- "properties": {
- "id": {
- "format": "int64",
- "type": "integer"
- },
- "username": {
- "type": "string"
- },
- "firstName": {
- "type": "string"
- },
- "lastName": {
- "type": "string"
- },
- "email": {
- "type": "string"
- },
- "password": {
- "type": "string"
- },
- "phone": {
- "type": "string"
- },
- "userStatus": {
- "format": "int32",
- "description": "User Status",
- "type": "integer"
- }
- },
- "xml": {
- "name": "User"
- }
- },
- "Tag": {
- "type": "object",
- "properties": {
- "id": {
- "format": "int64",
- "type": "integer"
- },
- "name": {
- "type": "string"
- }
- },
- "xml": {
- "name": "Tag"
- }
- },
- "Pet": {
- "required": [
- "name",
- "photoUrls"
- ],
- "type": "object",
- "properties": {
- "id": {
- "format": "int64",
- "type": "integer"
- },
- "category": {
- "$ref": "#/components/schemas/Category"
- },
- "name": {
- "type": "string",
- "example": "doggie"
- },
- "photoUrls": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "xml": {
- "name": "photoUrl",
- "wrapped": true
- }
- },
- "tags": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Tag"
- },
- "xml": {
- "name": "tag",
- "wrapped": true
- }
- },
- "status": {
- "description": "pet status in the store",
- "enum": [
- "available",
- "pending",
- "sold"
- ],
- "type": "string"
- }
- },
- "xml": {
- "name": "Pet"
- }
- },
- "ApiResponse": {
- "type": "object",
- "properties": {
- "code": {
- "format": "int32",
- "type": "integer"
- },
- "type": {
- "type": "string"
- },
- "message": {
- "type": "string"
- }
- }
- }
- },
- "securitySchemes": {
- "petstore_auth": {
- "flows": {
- "implicit": {
- "authorizationUrl": "http://petstore.swagger.io/oauth/dialog",
- "scopes": {
- "write:pets": "modify pets in your account",
- "read:pets": "read your pets"
- }
- }
- },
- "type": "oauth2"
- },
- "api_key": {
- "type": "apiKey",
- "name": "api_key",
- "in": "header"
- }
- }
- },
- "tags": [
- {
- "name": "pet",
- "description": "Everything about your Pets",
- "externalDocs": {
- "description": "Find out more",
- "url": "http://swagger.io"
- }
- },
- {
- "name": "store",
- "description": "Access to Petstore orders"
- },
- {
- "name": "user",
- "description": "Operations about user",
- "externalDocs": {
- "description": "Find out more about our store",
- "url": "http://swagger.io"
- }
- }
- ],
- "externalDocs": {
- "description": "Find out more about Swagger",
- "url": "http://swagger.io"
- }
-}
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/verify.groovy b/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/verify.groovy
deleted file mode 100644
index ff7241efd32..00000000000
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/verify.groovy
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-def File restdsl = new File(basedir, "target/generated-sources/restdsl-openapi/io/swagger/petstore/SwaggerPetstore.java")
-
-def String data = restdsl.text
-
-assert data.contains('restConfiguration().component("netty-http");')
[camel] 02/18: CAMEL-19461 - Remove Checkstyle
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2923416b6fb940780fcf04d372c59580a5992c86
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 11:24:30 2023 +0200
CAMEL-19461 - Remove Checkstyle
---
archetypes/pom.xml | 6 -
buildingtools/pom.xml | 102 ------
.../resources/camel-checkstyle-suppressions.xml | 78 ----
.../src/main/resources/camel-checkstyle.xml | 394 ---------------------
.../src/main/resources/camel-eclipse-checkstyle | 27 --
buildingtools/src/main/resources/header-java.txt | 16 -
.../src/main/resources/header-properties.txt | 16 -
buildingtools/src/main/resources/header-xml.txt | 18 -
camel-dependencies/pom.xml | 3 -
.../apache/camel/catalog/DefaultCamelCatalog.java | 2 -
.../java/org/apache/camel/maven/GenerateMojo.java | 3 -
.../org/apache/camel/maven/RouteCoverageMojo.java | 2 -
.../java/org/apache/camel/maven/ValidateMojo.java | 2 -
.../java/org/apache/camel/avro/generated/Key.java | 1 -
.../camel/avro/generated/KeyValueProtocol.java | 1 -
.../org/apache/camel/avro/generated/Value.java | 1 -
.../camel/dataformat/avro/example/Value.java | 1 -
.../camel/component/aws/xray/json/JsonParser.java | 2 -
.../camel/language/csimple/joor/Constants.java | 2 -
.../configuration/ConfigurationValidation.java | 2 -
...DBAggregateRecoverWithRedeliveryPolicyTest.java | 2 -
.../mail/AdditionalMailPropertiesTest.java | 1 -
.../camel/component/mail/AuthenticatorTest.java | 2 -
.../camel/component/mail/FromFileSendMailTest.java | 1 -
.../mail/MailAttachmentDuplicateNamesTest.java | 1 -
.../component/mail/MailAttachmentNamesTest.java | 3 -
.../mail/MailAttachmentRedeliveryTest.java | 1 -
.../camel/component/mail/MailAttachmentTest.java | 1 -
.../mail/MailAttachmentsUmlautIssueTest.java | 1 -
.../component/mail/MailBatchConsumerTest.java | 1 -
.../component/mail/MailCollectionHeaderTest.java | 1 -
.../component/mail/MailCommitOnCompletionTest.java | 1 -
.../mail/MailComponentRecipientSetTest.java | 5 -
.../mail/MailConsumerAuthenticatorTest.java | 1 -
.../mail/MailConsumerIdleMessageTest.java | 1 -
.../mail/MailConsumerUnsupportedCharsetTest.java | 1 -
.../mail/MailContentTypeResolverTest.java | 1 -
.../camel/component/mail/MailContentTypeTest.java | 1 -
.../camel/component/mail/MailConvertersTest.java | 1 -
.../camel/component/mail/MailCopyToTest.java | 1 -
.../component/mail/MailCustomContentTypeTest.java | 1 -
.../component/mail/MailCustomMailSenderTest.java | 1 -
.../mail/MailDefaultDelayForMailConsumeTest.java | 1 -
.../camel/component/mail/MailDisconnectTest.java | 1 -
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 1 -
.../camel/component/mail/MailFetchSizeTest.java | 1 -
.../component/mail/MailFetchSizeZeroTest.java | 1 -
...aderOverrulePreConfigurationRecipientsTest.java | 2 -
.../component/mail/MailHtmlAttachmentTest.java | 1 -
.../MailIdempotentRepositoryDuplicateTest.java | 1 -
.../mail/MailIdempotentRepositoryTest.java | 1 -
.../component/mail/MailMaxMessagesPerPollTest.java | 1 -
.../component/mail/MailMimeDecodeHeadersTest.java | 2 -
.../camel/component/mail/MailMoveToTest.java | 2 -
.../component/mail/MailMultipleRecipientsTest.java | 4 -
.../MailMultipleRecipientsUsingHeadersTest.java | 2 -
.../mail/MailNameAndEmailInRecipientTest.java | 2 -
.../component/mail/MailPollEnrichNoMailTest.java | 1 -
.../camel/component/mail/MailPollEnrichTest.java | 1 -
.../component/mail/MailPostProcessActionTest.java | 1 -
.../mail/MailProcessOnlyUnseenMessagesTest.java | 1 -
.../component/mail/MailProducerConcurrentTest.java | 2 -
.../camel/component/mail/MailProducerTest.java | 3 -
.../mail/MailProducerUnsupportedCharsetTest.java | 1 -
.../mail/MailRecipientsPipeIssueTest.java | 3 -
.../camel/component/mail/MailRecipientsTest.java | 6 -
.../camel/component/mail/MailReplyToTest.java | 1 -
.../apache/camel/component/mail/MailRouteTest.java | 3 -
.../camel/component/mail/MailSearchTermTest.java | 1 -
.../mail/MailSearchTermUriConfigBeanTest.java | 1 -
.../MailSearchTermUriConfigLast24HoursTest.java | 1 -
.../mail/MailSearchTermUriConfigTest.java | 1 -
.../mail/MailShutdownCompleteAllTasksTest.java | 1 -
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 1 -
.../camel/component/mail/MailSortTermTest.java | 1 -
.../component/mail/MailSortTermThreeTest.java | 1 -
.../mail/MailSortTermThreeUriConfigTest.java | 1 -
.../camel/component/mail/MailSortTermTwoTest.java | 1 -
.../mail/MailSortTermTwoUriConfigTest.java | 1 -
.../component/mail/MailSortTermUriConfigTest.java | 1 -
.../component/mail/MailSplitAttachmentsTest.java | 1 -
.../camel/component/mail/MailSubjectTest.java | 1 -
.../mail/MailToMultipleEndpointsTest.java | 6 -
.../component/mail/MailUsernameWithAtSignTest.java | 1 -
.../component/mail/MailUsingCustomSessionTest.java | 1 -
.../camel/component/mail/MailUsingHeadersTest.java | 1 -
.../component/mail/MailUsingOwnComponentTest.java | 2 -
.../component/mail/MimeMessageConsumeTest.java | 2 -
.../mail/MimeMultipartAlternativeTest.java | 1 -
...imeMultipartAlternativeWithContentTypeTest.java | 1 -
...MultipartAlternativeWithLongerFilenameTest.java | 1 -
.../mail/MultipleDestinationConsumeTest.java | 2 -
.../mail/NestedMimeMessageConsumeTest.java | 2 -
.../camel/component/mail/RawMailMessageTest.java | 5 -
.../mail/SpringMailSplitAttachmentsTest.java | 1 -
.../integration/MongoDbBigDecimalConverterIT.java | 2 -
.../mongodb/integration/MongoDbConversionsIT.java | 2 -
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 1 -
.../component/salesforce/SalesforceEndpoint.java | 2 -
.../salesforce/api/dto/AbstractSObjectBase.java | 2 -
.../component/salesforce/api/dto/RecentItem.java | 2 -
.../component/salesforce/api/dto/RestError.java | 2 -
.../component/salesforce/api/dto/SearchResult.java | 2 -
.../api/dto/analytics/reports/Report.java | 2 -
.../component/salesforce/api/dto/bulk/Error.java | 2 -
.../salesforce/api/dto/bulk/ResultError.java | 2 -
.../salesforce/internal/dto/LoginError.java | 2 -
.../salesforce/internal/dto/PushTopic.java | 2 -
.../api/dto/composite/SObjectCompositeTest.java | 2 -
.../salesforce/dto/generated/Account.java | 2 -
.../dto/generated/Account_IndustryEnum.java | 2 -
.../component/salesforce/dto/generated/Asset.java | 2 -
.../salesforce/dto/generated/Contact.java | 2 -
.../salesforce/dto/generated/Document.java | 2 -
.../salesforce/dto/generated/Line_Item__c.java | 2 -
.../salesforce/dto/generated/MSPTest.java | 2 -
.../salesforce/dto/generated/Merchandise__c.java | 2 -
.../dto/generated/QueryRecordsLine_Item__c.java | 2 -
.../salesforce/dto/generated/StringMSPTest.java | 2 -
.../component/salesforce/dto/generated/Task.java | 2 -
.../xml/handler/ErrorHandlerDefinitionParser.java | 2 -
.../camel/component/stax/StaxStreamXMLReader.java | 2 -
.../apache/camel/test/junit5/CamelTestSupport.java | 2 -
.../apache/camel/component/weka/WekaProducer.java | 1 -
.../java/org/apache/camel/ExchangePropertyKey.java | 2 -
.../camel/catalog/impl/AbstractCamelCatalog.java | 2 -
.../org/apache/camel/catalog/impl/URISupport.java | 2 -
.../language/simple/SimplePredicateParser.java | 4 -
.../language/simple/types/BinaryOperatorType.java | 2 -
.../org/apache/camel/reifier/ProcessorReifier.java | 2 -
.../reifier/dataformat/DataFormatReifier.java | 2 -
.../core/xml/AbstractCamelContextFactoryBean.java | 2 -
.../apache/camel/language/simple/Constants.java | 2 -
.../org/apache/camel/util/ObjectHelperTest.java | 2 -
.../support/AsyncProcessorConverterHelper.java | 2 -
.../camel/support/builder/ExpressionBuilder.java | 1 -
.../camel/support/builder/PredicateBuilder.java | 1 -
.../java/org/apache/camel/util/ObjectHelper.java | 2 -
.../apache/camel/xml/io/util/XmlStreamReader.java | 2 -
.../xml/io/util/XmlStreamReaderException.java | 2 -
.../java/org/apache/camel/xml/in/ModelParser.java | 4 -
.../java/org/apache/camel/xml/out/ModelWriter.java | 4 -
.../java/org/apache/camel/xml/io/MXParser.java | 2 -
.../org/apache/camel/xml/io/XmlPullParser.java | 2 -
.../camel/xml/io/XmlPullParserException.java | 2 -
.../org/apache/camel/yaml/out/ModelWriter.java | 4 -
.../builder/endpoint/EndpointBuilderFactory.java | 4 +-
.../camel/builder/endpoint/EndpointBuilders.java | 4 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../dsl/jbang/core/commands/CamelCommand.java | 2 -
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 -
dsl/camel-jbang/camel-jbang-main/pom.xml | 9 -
parent/pom.xml | 63 ----
.../java/org/apache/camel/util/json/Jsoner.java | 4 -
.../java/org/apache/camel/util/json/Yylex.java | 2 -
.../src/test/resources/AddressGateway.java | 4 +-
.../src/test/resources/CustomGateway.java | 4 +-
.../src/test/resources/CustomerGateway.java | 4 +-
.../src/test/resources/DisputeGateway.java | 2 -
.../camel/maven/packaging/EndpointDslMojo.java | 7 +-
.../packaging/EndpointSchemaGeneratorMojo.java | 3 -
.../maven/packaging/ModelWriterGeneratorMojo.java | 5 +-
.../packaging/ModelXmlParserGeneratorMojo.java | 6 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 2 -
.../packaging/generics/OwbTypeVariableImpl.java | 1 -
.../apache/camel/maven/packaging/JavadocTest.java | 2 -
166 files changed, 13 insertions(+), 1022 deletions(-)
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 9b009a1b02e..8da18c9375b 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -139,12 +139,6 @@
<projectnatures>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</projectnatures>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
- <location>/camel-eclipse-checkstyle</location>
- </file>
- </additionalConfig>
</configuration>
</plugin>
</plugins>
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 841ba74d973..838146b3044 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -36,12 +36,6 @@
</properties>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -49,102 +43,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin><!--
- This updates header-*.txt with the content of
- header.txt and the appropriate formatting for
- the specific style.
- So edit header.txt (if you must) and header-*
- files in src/main/resources will be updated.
- -->
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>${mycila-license-version}</version>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>format</goal>
- </goals>
- <configuration>
- <header>src/main/resources/header.txt</header>
- <includes>
- <include>**/header-java.txt</include>
- <include>**/header-properties.txt</include>
- <include>**/header-xml.txt</include>
- </includes>
- <mapping>
- <header-java.txt>SLASHSTAR_STYLE</header-java.txt>
- <header-properties.txt>CAMEL_PROPERTIES_STYLE</header-properties.txt>
- <header-xml.txt>XML_STYLE</header-xml.txt>
- </mapping>
- <headerDefinitions>
- <!-- custom style for properties files -->
- <headerDefinition>src/main/resources/license-properties-headerdefinition.xml
- </headerDefinition>
- </headerDefinitions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin><!--
- This loads the content of header-*.txt into
- header-* Maven properties to be included for
- resource filtering below.
- -->
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <scripts>
- <script><![CDATA[
- import groovy.xml.XmlUtil
- project.properties['header-java'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-java.txt').text.replace('\r', '').replace('\n', '\\n'))
- project.properties['header-properties'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-properties.txt').text.replace('\r', '').replace('\n', '\\n'))
- project.properties['header-xml'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-xml.txt').text.replace('\r', '').replaceAll('(.*)\n', '^\\\\Q$1\\\\E\\$\\\\n'))
- ]]></script>
- </scripts>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
- <plugin><!--
- This is needed so that the camel-checkstyle.xml is
- filltered so that the header values are updated
- with header-* Maven properties.
- The Maven Checkstyle plugin does not provide a way
- to reference more than one header file, so we need
- to put the headers as concrete values in the
- checkstyle rules.
- -->
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <delimiters>
- <delimiter>${*}</delimiter>
- </delimiters>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml b/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
deleted file mode 100644
index 08794c10e51..00000000000
--- a/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-<suppressions>
- <suppress checks=".*"
- files=".+[\\\/]generated[\\\/].+\.java"
- />
- <suppress checks=".*"
- files=".+[\\\/]generated[\\\/].+\.properties"
- />
- <suppress checks=".*"
- files=".*/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/.*"
- />
- <suppress checks=".*"
- files=".*/camel-componentdsl/src/main/java/org/apache/camel/builder/component/dsl/.*"
- />
- <suppress checks=".*"
- files=".*/platforms/spring-boot/components-starter/camel-.+-starter/src/main/java/org/apache/camel/.*"
- />
- <suppress checks=".*"
- files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
- />
- <suppress checks=".*"
- files=".+[\\\/]target[\\\/].+\.java"
- />
- <suppress checks=".*"
- files=".+[\\\/]contrib[\\\/].+\.java"
- />
- <suppress checks="LineLength"
- files=".*/features.xml"
- />
- <suppress checks="LineLength"
- files=".*/main/resources/.*camel-context.xml"
- />
- <suppress checks="LineLength"
- files=".*/test/resources/.*.xml"
- />
- <suppress checks="LineLength"
- files=".*/test/resources/.*.properties"
- />
- <suppress checks="LineLength"
- files=".*/resources/application.properties"
- />
- <suppress checks="LineLength"
- files=".*/resources/example.properties"
- />
- <suppress checks="LineLength"
- files=".*/resources/.*request.xml"
- />
- <suppress checks=".*"
- files=".*/camel-catalog/src/generated/.*"
- />
- <suppress checks=".*"
- files=".*/camel-xml-io-dsl/src/generated/.*"
- />
- <suppress checks=".*"
- files=".*/camel-xml-jaxb-dsl/src/generated/.*"
- />
-</suppressions>
diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
deleted file mode 100644
index 1928ee6e6bd..00000000000
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-Checks to make sure the code meets the Camel coding guidelines which
-
-It also enforces a bunch of other "BestPractices like method
-lengths, if/try depths, etc...
--->
-
-<module name="Checker">
- <property name="fileExtensions" value="java,groovy,scala,xml,properties"/>
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <!--
- <module name="NewlineAtEndOfFile"/>
- -->
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
- <module name="SuppressWarningsFilter"/>
- <!--<module name="StrictDuplicateCode"/>-->
-
- <!-- Header checks -->
- <!--
- The values for `header-*` are inserted at build time by Maven
- from the corresponding `header-*.txt` files. We need to do
- this instead of using `headerFile` property as Maven
- Checkstyle plugin has support for one `headerLocation`
- property. This also might help IDEs not to search for header
- files.
- -->
- <module name="Header">
- <!-- the `header-java` is replaced during build -->
- <property name="header" value="${header-java}"/>
- <property name="fileExtensions" value="java,groovy,scala"/>
- </module>
-
- <module name="Header">
- <!-- the `header-properties` is replaced during build -->
- <property name="header" value="${header-properties}"/>
- <property name="fileExtensions" value="properties"/>
- </module>
-
- <module name="RegexpHeader">
- <!-- the `header-xml` is replaced during build -->
- <property name="header" value="^<\?xml.*>\n${header-xml}"/>
- <property name="fileExtensions" value="xml,xsd"/>
- </module>
-
- <module name="RegexpMultiline">
- <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
- <property name="ignoreCase" value="true"/>
- </module>
-
- <module name="FileLength">
- <property name="max" value="10000"/>
- </module>
-
- <module name="FileTabCharacter">
- <property name="fileExtensions" value="java"/>
- </module>
-
- <!--
- <module name="RegexpSingleline">
- <property name="format" value="\s+$"/>
- <property name="minimum" value="0"/>
- <property name="maximum" value="0"/>
- </module>
- -->
-
- <module name="LineLength">
- <property name="max" value="250"/>
- </module>
-
- <module name="SuppressWithPlainTextCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
- </module>
- <module name="SuppressWithPlainTextCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
- <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
-
- <module name="TreeWalker">
- <module name="SuppressWarningsHolder"/>
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <!--
- <module name="PackageHtml"/>
- <module name="JavadocMethod"/>
- <module name="JavadocType"/>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle"/>
- -->
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport">
- <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
- <property name="allowStaticMemberImports" value="true"/>
- </module>
- <!--
- <module name="ConstantName"/>
- -->
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
- <module name="UnusedImports"/>
- -->
- <module name="ImportOrder">
- <property name="groups" value="java,jakarta,javax,org.w3c,org.xml,junit"/>
- <property name="ordered" value="true"/>
- <property name="option" value="bottom"/>
- <property name="separated" value="true"/>
- <property name="separatedStaticGroups" value="true"/>
- </module>
- <!--
- <module name="ImportControl">
- <property name="file" value="etc/import-control.xml"/>
- </module>
- -->
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="AnonInnerLength">
- <property name="max" value="200"/>
- </module>
- <module name="ExecutableStatementCount">
- <property name="max" value="180"/>
- </module>
- <module name="MethodLength">
- <property name="max" value="250"/>
- <property name="countEmpty" value="false"/>
- </module>
- <!-- We should try to get this enabled soon..
- <module name="ParameterNumber">
- <property name="max" value="7"/>
- </module>
- -->
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <!--
- <module name="EmptyForIteratorPad"/>
- <module name="EmptyForInitializerPad"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter">
- <property name="tokens" value="COMMA, SEMI"/>
- </module>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_ [...]
- </module>
- -->
-
- <!--
- <module name="GenericWhitespace"/>
- -->
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier">
- <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/>
- </module>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <!--
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true"/>
- </module>
- -->
- <!-- We use alot of emply blocks.. they can be good too.
- <module name="EmptyBlock">
- <property name="option" value="text"/>
- </module>
- -->
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
- <!--
- <module name="OuterTypeNumber"/>
- -->
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <!--<module name="ArrayTrailingComma"/>-->
- <!--<module name="AvoidInlineConditionals"/>-->
- <module name="CovariantEquals"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <!--<module name="FinalLocalVariable"/>-->
- <!--
- <module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
- </module>
- -->
- <!--
- <module name="EqualsAvoidNull"/>
- -->
- <module name="IllegalInstantiation"/>
- <!--<module name="IllegalToken"/>-->
- <!--<module name="IllegalTokenText"/>-->
- <!--<module name="InnerAssignment"/>-->
- <!--<module name="MagicNumber"/>-->
- <module name="MissingSwitchDefault"/>
- <!--module name="ModifiedControlVariable"/-->
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="NestedIfDepth">
- <property name="max" value="8"/>
- </module>
- <module name="NestedTryDepth">
- <property name="max" value="8"/>
- </module>
- <!--<module name="SuperClone"/>-->
- <module name="SuperFinalize"/>
- <!--<module name="IllegalCatch"/>-->
- <module name="IllegalThrows">
- <property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
- </module>
- <!--<module name="RedundantThrows"/>-->
- <module name="PackageDeclaration"/>
- <!--
- <module name="JUnitTestCase"/>
- -->
- <module name="ReturnCount">
- <property name="max" value="30"/>
- <property name="maxForVoid" value="30"/>
- </module>
-
- <!-- Um.. we tend to use these alot.. perhaps enable this check later.
- <module name="IllegalType">
- <property name="format" value="^xxx$"/>
- <property name="illegalClassNames" value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap"/> We use alot of emply blocks.. they can be good too.
- </module>
- -->
- <module name="DeclarationOrder"/>
- <!--<module name="ParameterAssignment"/>-->
- <module name="ExplicitInitialization"/>
- <!-- <module name="AnnotationUseStyle"/> -->
- <!-- <module name="MissingDeprecated"/> -->
- <!--
- <module name="MissingOverride">
- <property name="javaFiveCompatibility" value="true"/>
- </module>
- -->
- <!-- <module name="PackageAnnotation"/> -->
- <!-- <module name="SuppressWarnings"/> -->
- <module name="DefaultComesLast"/>
- <!--<module name="MissingCtor"/>-->
- <module name="FallThrough"/>
- <!--<module name="MultipleStringLiterals"/>-->
- <module name="MultipleVariableDeclarations"/>
- <!--<module name="RequireThis"/>-->
- <module name="UnnecessaryParentheses"/>
-
-
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <!--<module name="DesignForExtension"/>-->
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <!-- We still do enum style interfaces
- <module name="InterfaceIsType"/>
- -->
- <module name="MutableException">
- <property name="format" value="^.*Exception$"/>
- </module>
- <module name="ThrowsCount">
- <property name="max" value="5"/>
- </module>
-
- <!-- Ah we do a fair bit of using a class like a struct.. so
- we are not so strict on requirin encapsulation
- <module name="VisibilityModifier">
- <property name="protectedAllowed" value="true"/>
- <property name="packageAllowed" value="true"/>
- <property name="publicMemberPattern" value="resource[12].*"/>
- </module>
- -->
-
-
- <!-- Metrics checks. -->
- <!-- See http://checkstyle.sf.net/config_metrics.html -->
- <module name="BooleanExpressionComplexity">
- <property name="max" value="6"/>
- </module>
- <!--<module name="ClassDataAbstractionCoupling"/>-->
- <!--<module name="ClassFanOutComplexity"/>-->
- <!--<module name="CyclomaticComplexity"/>-->
- <!--<module name="NPathComplexity"/>-->
- <!-- Ah big methods aint so bad! :)
- <module name="JavaNCSS">
- <property name="methodMaximum" value="75"/>
- </module>
- -->
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <!--
- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- -->
- <!--
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- -->
-
- <module name="UpperEll"/>
-
- <!--Assert statement may have side effects:-->
- <module name="DescendantToken">
- <property name="tokens" value="LITERAL_ASSERT"/>
- <property name="limitedTokens" value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
- <property name="maximumNumber" value="0"/>
- </module>
-
- <!--<module name="UncommentedMain"/>-->
- <!--module name="TrailingComment"/-->
- <!--
- <module name="Indentation">
- <property name="lineWrappingIndentation" value="0"/>
- </module>
- -->
- <!--<module name="RequiredRegexp">-->
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
- <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
- </module>
-</module>
diff --git a/buildingtools/src/main/resources/camel-eclipse-checkstyle b/buildingtools/src/main/resources/camel-eclipse-checkstyle
deleted file mode 100644
index 5e8b9408d46..00000000000
--- a/buildingtools/src/main/resources/camel-eclipse-checkstyle
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <fileset name="all" enabled="true" check-config-name="Camel Checks" local="false">
- <file-match-pattern match-pattern="^src[/\\].*java$" include-pattern="true"/>
- <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/>
- <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/>
- <file-match-pattern match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]." include-pattern="false"/>
- </fileset>
-</fileset-config>
diff --git a/buildingtools/src/main/resources/header-java.txt b/buildingtools/src/main/resources/header-java.txt
deleted file mode 100644
index ae6f28c4a1c..00000000000
--- a/buildingtools/src/main/resources/header-java.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/buildingtools/src/main/resources/header-properties.txt b/buildingtools/src/main/resources/header-properties.txt
deleted file mode 100644
index fa7a54b8349..00000000000
--- a/buildingtools/src/main/resources/header-properties.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
diff --git a/buildingtools/src/main/resources/header-xml.txt b/buildingtools/src/main/resources/header-xml.txt
deleted file mode 100644
index f0a6f8f965c..00000000000
--- a/buildingtools/src/main/resources/header-xml.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 93b74eb4990..7d82a7e0fb6 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -52,7 +52,6 @@
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
<cxf.xjc.jvmArgs />
<trimStackTrace>false</trimStackTrace>
- <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<activemq-version>5.18.1</activemq-version>
@@ -343,8 +342,6 @@
<maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
- <maven-checkstyle-plugin-version>3.3.0</maven-checkstyle-plugin-version>
- <maven-checkstyle-version>8.45.1</maven-checkstyle-version>
<maven-owasp-plugin-version>8.2.1</maven-owasp-plugin-version>
<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 24973b36e3a..9238ff938b4 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -581,6 +581,4 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
}
- // CHECKSTYLE:ON
-
}
diff --git a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index 270772645ad..76af744df8c 100644
--- a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++ b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -125,7 +125,6 @@ public class GenerateMojo extends AbstractExecMojo {
private final Set<String> imports = new TreeSet<>();
private final Map<String, String> aliases = new HashMap<>();
- // CHECKSTYLE:OFF
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
loadConfiguration();
@@ -313,8 +312,6 @@ public class GenerateMojo extends AbstractExecMojo {
}
}
- // CHECKSTYLE:ON
-
private void findJavaFiles(File dir, Set<File> javaFiles) {
File[] files = dir.isDirectory() ? dir.listFiles() : null;
if (files != null) {
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index aa026830e14..82fdcd208f5 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -142,7 +142,6 @@ public class RouteCoverageMojo extends AbstractExecMojo {
@Parameter(property = "camel.generateJacocoXmlReport", defaultValue = "false")
private boolean generateJacocoXmlReport;
- // CHECKSTYLE:OFF
@Override
public void execute() throws MojoExecutionException {
@@ -377,7 +376,6 @@ public class RouteCoverageMojo extends AbstractExecMojo {
return it;
}
- // CHECKSTYLE:ON
@SuppressWarnings("unchecked")
private String templateCoverageData(
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 885a3ce4ea2..3c8fbfb5ba9 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -178,7 +178,6 @@ public class ValidateMojo extends AbstractExecMojo {
@Parameter(property = "camel.configurationFiles")
private String configurationFiles = "application.properties";
- // CHECKSTYLE:OFF
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
CamelCatalog catalog = new DefaultCamelCatalog();
@@ -775,7 +774,6 @@ public class ValidateMojo extends AbstractExecMojo {
return sb.toString();
}
- // CHECKSTYLE:ON
private static int countRouteId(List<CamelRouteDetails> details, String routeId) {
int answer = 0;
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
index 503501a1d74..9b5f45d223f 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// CHECKSTYLE:OFF
/**
* Autogenerated by Avro
*
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
index 7eab6479670..3b966587485 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// CHECKSTYLE:OFF
/**
* Autogenerated by Avro
*
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
index 8e0dae0c3d6..d90ba156f78 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// CHECKSTYLE:OFF
/**
* Autogenerated by Avro
*
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
index b50363da98b..aa013f29ac7 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// CHECKSTYLE:OFF
/**
* Autogenerated by Avro
*
diff --git a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
index 1d76f24750c..0c137f1e11a 100644
--- a/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
+++ b/components/camel-aws/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonParser.java
@@ -39,7 +39,6 @@ public final class JsonParser {
String keyName = null;
boolean inWord = false;
for (char c : json.toCharArray()) {
- // CHECKSTYLE:OFF
// fallthrough is intended here and as this is only a helper class for tests (as the previously used
// org.json classes are incompatible with Apache 2.0 license) formatting rules shouldn't be that strict IMO
// Note that the fall-through was the only rant checkstyle generated, so everything else should follow these
@@ -115,7 +114,6 @@ public final class JsonParser {
curToken.append(c);
}
}
- // CHECKSTYLE:ON
}
return ret;
}
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/Constants.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/Constants.java
index a5b894ff9a3..2237eef28d9 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/Constants.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/Constants.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.csimple.joor;
-// CHECKSTYLE:OFF
// we want to use the code as-is as that is how end users may code
public class Constants {
@@ -28,4 +27,3 @@ public class Constants {
}
}
-// CHECKSTYLE:ON
diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/component/debezium/configuration/ConfigurationValidation.java b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/component/debezium/configuration/ConfigurationValidation.java
index 8d0d3d60974..744c7ea92e9 100644
--- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/component/debezium/configuration/ConfigurationValidation.java
+++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/component/debezium/configuration/ConfigurationValidation.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package org.apache.camel.component.debezium.configuration;
// Empty class only meant to provide the generator about the class information only for compilation
public final class ConfigurationValidation {
}
-//CHECKSTYLE:ON
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
index 478947b2127..e6f80f6fb22 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
@@ -85,7 +85,6 @@ public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends LevelDBTest
return new RouteBuilder() {
@Override
public void configure() {
- // CHECKSTYLE:OFF
from("direct:start")
.aggregate(header("id"), new StringAggregationStrategy())
.completionSize(5).aggregationRepository(getRepo())
@@ -103,7 +102,6 @@ public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends LevelDBTest
})
.to("mock:result")
.end();
- // CHECKSTYLE:ON
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index 1a4d9f834c5..5b68965024a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -31,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test allowing end users to set additional mail.xxx properties.
*/
public class AdditionalMailPropertiesTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser user = Mailbox.getOrCreateUser("additionalMailProperties");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
index c5b21e4f08c..3f06d75d9cf 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
@@ -37,9 +37,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class AuthenticatorTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james3 = Mailbox.getOrCreateUser("james3", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james4 = Mailbox.getOrCreateUser("james4", "secret");
/**
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index 5ef3b34ad29..9310471afbb 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class FromFileSendMailTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index f4fc21f2ecb..fd90250e557 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for Camel attachments and Mail attachments.
*/
public class MailAttachmentDuplicateNamesTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
index aad85f814fb..464d8407c75 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentNamesTest.java
@@ -47,11 +47,8 @@ public class MailAttachmentNamesTest extends CamelTestSupport {
public static final String UUID_EXPRESSION = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser default_ = Mailbox.getOrCreateUser("default", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser suffix = Mailbox.getOrCreateUser("suffix", "secret");
MockEndpoint resultEndpoint;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index ef6761512f4..258cdf3214f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -43,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for Camel attachments and Mail attachments.
*/
public class MailAttachmentRedeliveryTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
private final List<String> names = new ArrayList<>();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index 54b34eebec2..d0dc036634a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -42,7 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for Camel attachments and Mail attachments.
*/
public class MailAttachmentTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index 83d7c8d6d13..73c14c9601f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -44,7 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
@Disabled("Fails on CI servers and some platforms - maybe due locale or something")
public class MailAttachmentsUmlautIssueTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index b7cabfca4d3..1d8c85f56ac 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for batch consumer.
*/
public class MailBatchConsumerTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
index 729b43ed81b..c5144e83181 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MailCollectionHeaderTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index 9ace93e12bf..d41154e81b6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for delete mail runs as an onCompletion.
*/
public class MailCommitOnCompletionTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jonesCommitOnCompletion", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
index 9507b3efd0f..fd2cc2c6403 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
@@ -27,16 +27,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MailComponentRecipientSetTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser admin = Mailbox.getOrCreateUser("admin", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser a = Mailbox.getOrCreateUser("a", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser b = Mailbox.getOrCreateUser("b", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser c = Mailbox.getOrCreateUser("c", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
index 99cf8893322..6e3873e97db 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
@@ -40,7 +40,6 @@ import static org.mockito.Mockito.when;
* Test the dynamic behavior of the MailAuthenticator in the MailConsumer.
*/
public class MailConsumerAuthenticatorTest {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser user1 = Mailbox.getOrCreateUser("user1", "correctPassword");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
index 3ca1e011b5d..0b59144b17f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
* and a polling event yields no results.
*/
public class MailConsumerIdleMessageTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
index 264c4ceef06..5ddcf27d26f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
@@ -31,7 +31,6 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
public class MailConsumerUnsupportedCharsetTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index cc72b35de50..9beefd987aa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for Camel attachments and Mail attachments.
*/
public class MailContentTypeResolverTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
index 1a789f5326d..8325752f7b6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
@@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for contentType option.
*/
public class MailContentTypeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 24315ba5bda..c25fe9e7cc6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MailConvertersTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index e01afc8eb23..1d8084f7ad6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for copyTo.
*/
public class MailCopyToTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
index 27b74cb8a31..f26e29c5ca0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
@@ -32,7 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for contentType option.
*/
public class MailCustomContentTypeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
index 7609e7047ba..cd309cd68a2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MailCustomMailSenderTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
private static boolean sent;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
index 460e90f7b51..a0fcb373dba 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for testing mail polling is happening according to the default poll interval.
*/
public class MailDefaultDelayForMailConsumeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bond = Mailbox.getOrCreateUser("bond", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index f2b3c705a86..8f01f520a62 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
* Unit test for batch consumer.
*/
public class MailDisconnectTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index fe3ace4ce2c..3da6db5b132 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for rollback option.
*/
public class MailDoNotDeleteIfProcessFailsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
private static int counter;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index 206a7942267..2b7cb187151 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for fetch size.
*/
public class MailFetchSizeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index d70feba51dd..5fc493b555d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for a special corner case with fetchSize=0
*/
public class MailFetchSizeZeroTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index 92c58c5f5be..737d2e66bdb 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -31,9 +31,7 @@ import org.junit.jupiter.api.Test;
* Unit test to verify that message headers override pre configuration.
*/
public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser willem = Mailbox.getOrCreateUser("willem", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index e4e5dde9cbf..ad6175df28a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -41,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for Camel html attachments and Mail attachments.
*/
public class MailHtmlAttachmentTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index 4ca35f10945..78bc4e9bef2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for idempotent repository.
*/
public class MailIdempotentRepositoryDuplicateTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
protected static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@BindToRegistry("myRepo")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index 1da570c1230..96e7834c2b6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for idempotent repository.
*/
public class MailIdempotentRepositoryTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@BindToRegistry("myRepo")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index f13321758ef..48d1a67c19c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
* Unit test for batch consumer.
*/
public class MailMaxMessagesPerPollTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index 08208b8d3b7..867643b6867 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -29,9 +29,7 @@ import org.junit.jupiter.api.Test;
* Unit test for Mail header decoding/unfolding support.
*/
public class MailMimeDecodeHeadersTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser plain = Mailbox.getOrCreateUser("plain", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser decoded = Mailbox.getOrCreateUser("decoded", "secret");
private String nonAsciiSubject = "\uD83D\uDC2A rocks!";
private String encodedNonAsciiSubject = "=?UTF-8?Q?=F0=9F=90=AA_rocks!?=";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
index b4c0b7d0868..f677a4cfcc4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
@@ -42,9 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for moveTo.
*/
public class MailMoveToTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones2 = Mailbox.getOrCreateUser("jones2", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index d94b093cb7a..5deeb8c0aab 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -30,13 +30,9 @@ import org.junit.jupiter.api.Test;
* Unit test to verify that we can have multiple recipients in To, CC and BCC
*/
public class MailMultipleRecipientsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser willem = Mailbox.getOrCreateUser("willem", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser hadrian = Mailbox.getOrCreateUser("hadrian", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser tracy = Mailbox.getOrCreateUser("tracy", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index 5e8f61795e4..47732f844a2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -33,9 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for Mail using camel headers to set recipeient subject.
*/
public class MailMultipleRecipientsUsingHeadersTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jon = Mailbox.getOrCreateUser("jon", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index de744cb06c8..e217c3655e8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -27,9 +27,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser davsclaus = Mailbox.getOrCreateUser("davsclaus", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jstrachan = Mailbox.getOrCreateUser("jstrachan", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index 76431ab4da5..67f523614ce 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
* Unit test with poll enrich
*/
public class MailPollEnrichNoMailTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index 6eaa0c3cd5e..d67047bb704 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test with poll enrich
*/
public class MailPollEnrichTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index f817bc65bf8..9339c2537ab 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Tests if post process action is called if it is set
*/
public class MailPostProcessActionTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
private static final Logger LOG = LoggerFactory.getLogger(MailPostProcessActionTest.class);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index 6ea98bbb7d3..0bb220b5bc2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
* Unit test for unseen option.
*/
public class MailProcessOnlyUnseenMessagesTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser claus = Mailbox.getOrCreateUser("claus", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
index 856924ee7f9..3df28410d59 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
@@ -40,9 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Mail producer concurrent test.
*/
public class MailProducerConcurrentTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser camel = Mailbox.getOrCreateUser("camel", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser someone = Mailbox.getOrCreateUser("someone", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
index 2d1d4568d7c..15652685b69 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
@@ -34,11 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MailProducerTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser camel = Mailbox.getOrCreateUser("camel", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser someone = Mailbox.getOrCreateUser("someone", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser recipient2 = Mailbox.getOrCreateUser("recipient2", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index 09d30ea472b..d08e2ae10a4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -32,7 +32,6 @@ import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
index bb5654911e8..9f63f904264 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
@@ -30,11 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for recipients using | in email address
*/
public class MailRecipientsPipeIssueTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser you = Mailbox.getOrCreateUser("you", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser camelPipes = Mailbox.getOrCreateUser("camel|pipes@riders.org", "camelPipes", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser easyPipes = Mailbox.getOrCreateUser("easyPipes@riders.org", "easyPipes", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
index 6b47787cfa4..09a7accfb3d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
@@ -35,20 +35,14 @@ import static org.junit.jupiter.api.Assertions.assertNull;
* Unit test for recipients (To, CC, BCC)
*/
public class MailRecipientsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser you = Mailbox.getOrCreateUser("youRecipients", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser camelRiders
= Mailbox.getOrCreateUser("camelRecipients@riders.org", "camelRecipients", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser easyRiders
= Mailbox.getOrCreateUser("easyRecipients@riders.org", "easyRecipients", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser me = Mailbox.getOrCreateUser("meRecipients@you.org", "meRecipients", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser someone
= Mailbox.getOrCreateUser("someoneRecipients@somewhere.org", "someoneRecipients", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser to = Mailbox.getOrCreateUser("toRecipients@somewhere.org", "toRecipients", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index 11e19642581..713fc6955b6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -31,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for Mail replyTo support.
*/
public class MailReplyToTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser christian = Mailbox.getOrCreateUser("christian", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index 92c09de0877..095b1c15813 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -41,11 +41,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MailRouteTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser result = Mailbox.getOrCreateUser("result", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser copy = Mailbox.getOrCreateUser("copy", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index 04ec1350c97..4d43086d82b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -36,7 +36,6 @@ import static org.apache.camel.component.mail.SearchTermBuilder.Op;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MailSearchTermTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
protected static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@BindToRegistry("myTerm")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
index 2820afeeaab..dc92767adee 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
public class MailSearchTermUriConfigBeanTest extends MailSearchTermUriConfigTest {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@BindToRegistry("mySearchTerm")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index dd61cea0c1b..29a8d4cb6a7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MailSearchTermUriConfigLast24HoursTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index 03fb9cfdc8c..aabe8c51dac 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MailSearchTermUriConfigTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index ef634820f35..1a621299424 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for shutdown.
*/
public class MailShutdownCompleteAllTasksTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index a5415722228..ce1af7f1fcd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Unit test for shutdown.
*/
public class MailShutdownCompleteCurrentTaskOnlyTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jones = Mailbox.getOrCreateUser("jones", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index d240b02581b..286ab7a2d20 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -41,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* SortUtilTest.
*/
public class MailSortTermTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@BindToRegistry("sortAscendingDate")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index c04edefbc75..51f80d2f920 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -41,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* SortUtilTest.
*/
public class MailSortTermThreeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@BindToRegistry("sortAscendingDate")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
index 8f44fc8ed08..244fa150246 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
public class MailSortTermThreeUriConfigTest extends MailSortTermThreeTest {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index 30fee0e0cd3..00dc12971b1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -41,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* SortUtilTest.
*/
public class MailSortTermTwoTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@BindToRegistry("sortAscendingDate")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
index 34ae7457710..bc71a03b406 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
public class MailSortTermTwoUriConfigTest extends MailSortTermTwoTest {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
index 1e88f220078..7e6f2d18858 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.mail.Mailbox.MailboxUser;
import org.apache.camel.component.mail.Mailbox.Protocol;
public class MailSortTermUriConfigTest extends MailSortTermTest {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bill = Mailbox.getOrCreateUser("bill", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
index d6baf20cb07..5bbc68c11c7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
@@ -43,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Tests the {@link SplitAttachmentsExpression}.
*/
public class MailSplitAttachmentsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
private Endpoint endpoint;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index e9a6e78d31d..49562621fc1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
* Unit test for Mail subject support.
*/
public class MailSubjectTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james2 = Mailbox.getOrCreateUser("james2", "secret");
private String subject = "Camel rocks";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
index fb5038c3e11..7690b1928a2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
@@ -27,18 +27,12 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MailToMultipleEndpointsTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james2 = Mailbox.getOrCreateUser("james2", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser admin = Mailbox.getOrCreateUser("admin", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser a = Mailbox.getOrCreateUser("a", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser b = Mailbox.getOrCreateUser("b", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser c = Mailbox.getOrCreateUser("c", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
index 961422cd037..8558990de71 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
* Unit test for Mail using @ in username option
*/
public class MailUsernameWithAtSignTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jamesAtSign
= Mailbox.getOrCreateUser("jamesAtSign@localhost", "jamesAtSign@localhost", "secret");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index ff9ec9a8c2f..cdaca8c6b24 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
public class MailUsingCustomSessionTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
@BindToRegistry("myCustomMailSession")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
index e919016e73f..dde7142f466 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
@@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
* Unit test for Mail using camel headers to set recipient subject.
*/
public class MailUsingHeadersTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser davsclaus = Mailbox.getOrCreateUser("davsclaus", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
index 7039e73a905..a638800031b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
@@ -30,9 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit test for CAMEL-1249
*/
public class MailUsingOwnComponentTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser davsclaus = Mailbox.getOrCreateUser("davsclaus", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
index 0b847859f8e..3bbada00f2a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
@@ -47,9 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MimeMessageConsumeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james3 = Mailbox.getOrCreateUser("james3", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james4 = Mailbox.getOrCreateUser("james4", "secret");
private String body = "hello world!";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index aa06c0e2f80..5e4d4f43d0e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MimeMultipartAlternativeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser ryan = Mailbox.getOrCreateUser("ryan", "secret");
private Logger log = LoggerFactory.getLogger(getClass());
private String alternativeBody = "hello world! (plain text)";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
index 7b8b9a8dbcc..75ee975479c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
@@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MimeMultipartAlternativeWithContentTypeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser sachin = Mailbox.getOrCreateUser("sachin", "secret");
private Logger log = LoggerFactory.getLogger(getClass());
private String alternativeBody = "hello world! (plain text)";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 7cd88303f65..8c5679dd2eb 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser ryanWithLongerFilename = Mailbox.getOrCreateUser("ryanWithLongerFilename", "secret");
private Logger log = LoggerFactory.getLogger(getClass());
private String alternativeBody = "hello world! (plain text)";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
index 19881c8ae3b..cab53f49314 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
@@ -44,9 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class MultipleDestinationConsumeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser bar = Mailbox.getOrCreateUser("bar", "secret");
private Logger log = LoggerFactory.getLogger(getClass());
private String body = "hello world!\r\n";
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
index b29b9fcee70..215bcdc3eb4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
@@ -44,9 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class NestedMimeMessageConsumeTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james3 = Mailbox.getOrCreateUser("james3", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james4 = Mailbox.getOrCreateUser("james4", "secret");
@Test
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 43dd44a6330..cfb34e2b06f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -45,15 +45,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class RawMailMessageTest extends CamelTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jonesPop3 = Mailbox.getOrCreateUser("jonesPop3", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jonesRawPop3 = Mailbox.getOrCreateUser("jonesRawPop3", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jonesImap = Mailbox.getOrCreateUser("jonesImap", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser jonesRawImap = Mailbox.getOrCreateUser("jonesRawImap", "secret");
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser davsclaus = Mailbox.getOrCreateUser("davsclaus", "secret");
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
index 262835707f2..4457b0f16ce 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
@@ -44,7 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Spring XML version of {@link MailSplitAttachmentsTest}
*/
public class SpringMailSplitAttachmentsTest extends CamelSpringTestSupport {
- @SuppressWarnings({ "checkstyle:ConstantName" })
private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret");
private Endpoint endpoint;
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbBigDecimalConverterIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbBigDecimalConverterIT.java
index 01101ad4494..47468a3b08e 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbBigDecimalConverterIT.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbBigDecimalConverterIT.java
@@ -33,9 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class MongoDbBigDecimalConverterIT extends AbstractMongoDbITSupport implements ConfigurableRoute {
private class NumberClass {
- // CHECKSTYLE:OFF
public String _id = "testBigDecimalConvert";
- // CHECKSTYLE:ON
public BigDecimal aNumber = new BigDecimal(0);
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
index e1413a72cc1..a002158e60d 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
@@ -141,9 +141,7 @@ public class MongoDbConversionsIT extends AbstractMongoDbITSupport implements Co
public int number = 123;
public String text = "hello";
public String[] array = { "daVinci", "copernico", "einstein" };
- // CHECKSTYLE:OFF
public String _id = "testInsertPojo";
- // CHECKSTYLE:ON
}
@Test
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
index 5e35aa18561..efced61cf78 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-// CHECKSTYLE:OFF
public class AbstractOlingo2AppAPITestSupport {
protected static final String SERVICE_NAME = "MyFormula.svc";
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 98a93635ab4..275e178b5d3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -41,7 +41,6 @@ public class SalesforceEndpoint extends DefaultEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(SalesforceEndpoint.class);
- //CHECKSTYLE:OFF
@UriPath( label = "common", description = "The operation to use", enums = "getVersions,"
+ "getResources,getGlobalObjects,getBasicInfo,getDescription,getSObject,createSObject,"
+ "updateSObject,deleteSObject,getSObjectWithId,upsertSObject,deleteSObjectWithId,"
@@ -60,7 +59,6 @@ public class SalesforceEndpoint extends DefaultEndpoint {
+ "raw,subscribe,pubSubSubscribe,pubSubPublish")
@Metadata(required = true)
private final OperationName operationName;
- //CHECKSTYLE:ON
@UriPath(label = "consumer,producer", description = "The name of the topic/channel to use")
private final String topicName;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
index 6d08af8f97f..05963ca214b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-//CHECKSTYLE:OFF
@JsonFilter("fieldsToNull")
public abstract class AbstractSObjectBase extends AbstractDTOBase {
@@ -218,4 +217,3 @@ public abstract class AbstractSObjectBase extends AbstractDTOBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
index c14e7e695f5..050e35addb4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.salesforce.api.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
-//CHECKSTYLE:OFF
public class RecentItem extends AbstractDTOBase {
// WARNING: these fields have case sensitive names,
@@ -56,4 +55,3 @@ public class RecentItem extends AbstractDTOBase {
this.Name = name;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
index 5f9905a0132..811c68e3d9b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
@@ -21,7 +21,6 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonSetter;
-//CHECKSTYLE:OFF
public class RestError extends AbstractDTOBase {
private String errorCode;
@@ -97,4 +96,3 @@ public class RestError extends AbstractDTOBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
index 565ecd727ae..607eb649d5b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* DTO for Salesforce SOSL Search result record. Starting with v37, this is wrapped by
* {@link org.apache.camel.component.salesforce.api.dto.SearchResult2}
*/
-//CHECKSTYLE:OFF
public final class SearchResult extends AbstractDTOBase {
// WARNING: these fields have case sensitive names,
@@ -49,4 +48,3 @@ public final class SearchResult extends AbstractDTOBase {
this.Id = id;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java
index 11fafa0fac8..b4eef994536 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
/**
* Salesforce DTO for SObject Report
*/
-//CHECKSTYLE:OFF
public class Report extends AbstractSObjectBase {
// Description
@@ -93,4 +92,3 @@ public class Report extends AbstractSObjectBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
index 9b9291f08f8..c68dc3f5ddc 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
@@ -21,7 +21,6 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
-//CHECKSTYLE:OFF
/**
* <p>
* Java class for Error complex type.
@@ -90,4 +89,3 @@ public class Error {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
index 432eb921a96..5c315c8f339 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
@@ -24,7 +24,6 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
-//CHECKSTYLE:OFF
/**
* <p>
* Java class for ResultError complex type.
@@ -123,4 +122,3 @@ public class ResultError {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
index 778331ae7dc..9bba90057ea 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* DTO for Salesforce login error
*/
-//CHECKSTYLE:OFF
public class LoginError {
private String error;
@@ -46,4 +45,3 @@ public class LoginError {
this.errorDescription = errorDescription;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
index a16398c7e43..3464f8f3761 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.salesforce.internal.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-//CHECKSTYLE:OFF
/**
* Salesforce DTO for SObject PushTopic
*/
@@ -148,4 +147,3 @@ public class PushTopic extends AbstractSObjectBase {
this.NotifyForOperationUndelete = notifyForOperationUndelete;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectCompositeTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectCompositeTest.java
index 89edf08e686..f83dffe074a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectCompositeTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectCompositeTest.java
@@ -35,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat;
public class SObjectCompositeTest {
- // CHECKSTYLE:OFF
@JsonPropertyOrder({"account__c", "contactId__c"})
public static class AccountContactJunction__c extends AbstractDescribedSObjectBase {
@@ -68,7 +67,6 @@ public class SObjectCompositeTest {
this.contactId__c = contactId__c;
}
}
- // CHECKSTYLE:ON
@JsonPropertyOrder({ "Name", "BillingStreet", "BillingCity", "BillingState", "Industry" })
public static class TestAccount extends Account {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java
index 4b67113fc16..1ac546a6408 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
-//CHECKSTYLE:OFF
/**
* Salesforce DTO for SObject Account
*/
@@ -774,4 +773,3 @@ public class Account extends AbstractDescribedSObjectBase {
return description;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account_IndustryEnum.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account_IndustryEnum.java
index 5db8b50ac41..bc9cd6fa717 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account_IndustryEnum.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account_IndustryEnum.java
@@ -23,7 +23,6 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
-//CHECKSTYLE:OFF
/**
* Salesforce Enumeration DTO for picklist Industry
*/
@@ -116,4 +115,3 @@ public enum Account_IndustryEnum {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java
index 798817e0808..02aae843b0f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-//CHECKSTYLE:OFF
/**
* Salesforce DTO for SObject Asset
*/
@@ -173,4 +172,3 @@ public class Asset extends AbstractSObjectBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
index d96b961d10b..f4fdf4398ca 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
-// CHECKSTYLE:OFF
/**
* Salesforce DTO for SObject Contact
*/
@@ -735,4 +734,3 @@ public class Contact extends AbstractDescribedSObjectBase {
}
}
-// CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
index 99741871b42..309402b3bbd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
-//CHECKSTYLE:OFF
/**
* Salesforce DTO for SObject Document
*/
@@ -283,4 +282,3 @@ public class Document extends AbstractDescribedSObjectBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
index 62264eb78be..63a2cffbe73 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
@@ -30,7 +30,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
import org.apache.camel.component.salesforce.api.utils.AsNestedPropertyResolver;
-//CHECKSTYLE:OFF
public class Line_Item__c extends AbstractDescribedSObjectBase {
@JsonTypeResolver(AsNestedPropertyResolver.class)
@@ -163,4 +162,3 @@ public class Line_Item__c extends AbstractDescribedSObjectBase {
return description;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java
index 54151d58148..4476b399fe0 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
/**
* Sample POJO for MSP tests.
*/
-//CHECKSTYLE:OFF
public class MSPTest extends AbstractSObjectBase {
public MSPTest() {
@@ -84,4 +83,3 @@ public class MSPTest extends AbstractSObjectBase {
}
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
index ea311d27ff0..b13bdf80b23 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
-//CHECKSTYLE:OFF
public class Merchandise__c extends AbstractDescribedSObjectBase {
public Merchandise__c() {
@@ -147,4 +146,3 @@ public class Merchandise__c extends AbstractDescribedSObjectBase {
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
index 4a5eee91f31..52834ddc810 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
@@ -18,7 +18,5 @@ package org.apache.camel.component.salesforce.dto.generated;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-//CHECKSTYLE:OFF
public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase<Line_Item__c> {
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
index da531f9549c..edc1c9e3df8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
/**
* Sample POJO for MSP tests using Strings instead of Constants.
*/
-//CHECKSTYLE:OFF
public class StringMSPTest extends AbstractSObjectBase {
public StringMSPTest() {
@@ -47,4 +46,3 @@ public class StringMSPTest extends AbstractSObjectBase {
this.MspField = mspField;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
index 16ffedd5d68..8380e10c638 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
/**
* Salesforce DTO for SObject Task
*/
-//CHECKSTYLE:OFF
public class Task extends AbstractSObjectBase {
public Task() {
@@ -67,4 +66,3 @@ public class Task extends AbstractSObjectBase {
this.What = What;
}
}
-//CHECKSTYLE:ON
diff --git a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
index 71c6ebaef3b..1e71545322e 100644
--- a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
@@ -61,7 +61,6 @@ public class ErrorHandlerDefinitionParser extends BeanDefinitionParser {
if (attributeName.equals("xmlns") || attributeName.startsWith("xmlns:")) {
return false;
}
- // CHECKSTYLE:OFF
return !attributeName.equals("type")
&& !attributeName.equals("onRedeliveryRef")
&& !attributeName.equals("onRetryWhileRef")
@@ -70,7 +69,6 @@ public class ErrorHandlerDefinitionParser extends BeanDefinitionParser {
&& !attributeName.equals("redeliveryPolicyRef")
&& !attributeName.equals("transactionTemplateRef")
&& !attributeName.equals("transactionManagerRef");
- // CHECKSTYLE:ON
}
@Override
diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
index 802be364369..2899890e94a 100644
--- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
+++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java
@@ -46,7 +46,6 @@ import org.apache.camel.util.ObjectHelper;
/**
* class extracted from spring 3.0.6.RELEASE.
*/
-// CHECKSTYLE:OFF
public class StaxStreamXMLReader implements XMLReader {
private static final String DEFAULT_XML_VERSION = "1.0";
@@ -587,4 +586,3 @@ public class StaxStreamXMLReader implements XMLReader {
}
}
}
-// CHECKSTYLE:ON
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 9d709d99ad7..ed8a777a80e 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -95,7 +95,6 @@ public abstract class CamelTestSupport
*/
public static final String ROUTE_COVERAGE_ENABLED = "CamelTestRouteCoverage";
- // CHECKSTYLE:OFF
private static final Logger LOG = LoggerFactory.getLogger(CamelTestSupport.class);
private static ThreadLocal<ModelCamelContext> threadCamelContext = new ThreadLocal<>();
private static ThreadLocal<ProducerTemplate> threadTemplate = new ThreadLocal<>();
@@ -120,7 +119,6 @@ public abstract class CamelTestSupport
private boolean isCreateCamelContextPerClass = false;
private CamelRouteCoverageDumper routeCoverageDumper = new CamelRouteCoverageDumper();
private ExtensionContext.Store globalStore;
- // CHECKSTYLE:ON
@Override
public void afterTestExecution(ExtensionContext context) throws Exception {
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
index 1788333831b..26a7f510973 100644
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
+++ b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
@@ -33,7 +33,6 @@ import weka.classifiers.Classifier;
import weka.classifiers.Evaluation;
import weka.core.Instances;
-@SuppressWarnings("checkstyle:rightcurly")
public class WekaProducer extends DefaultProducer {
static final Logger LOG = LoggerFactory.getLogger(WekaProducer.class);
diff --git a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
index 58b7ca6c215..3e390e85996 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
@@ -84,7 +84,6 @@ public enum ExchangePropertyKey {
return name;
}
- // CHECKSTYLE:OFF
public static ExchangePropertyKey asExchangePropertyKey(String name) {
switch (name) {
case Exchange.AGGREGATED_COMPLETED_BY:
@@ -189,5 +188,4 @@ public enum ExchangePropertyKey {
return null;
}
}
- // CHECKSTYLE:ON
}
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index f634ed47be5..fa50a01dd6b 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -62,7 +62,6 @@ import org.apache.camel.util.StringHelper;
@SuppressWarnings("unused")
public abstract class AbstractCamelCatalog {
- // CHECKSTYLE:OFF
private static final Pattern SYNTAX_PATTERN = Pattern.compile("([\\w.]+)");
private static final Pattern ENV_OR_SYS_PATTERN = Pattern.compile("\\{\\{(env|sys):\\w+\\}\\}");
@@ -1583,6 +1582,5 @@ public abstract class AbstractCamelCatalog {
return sb.toString();
}
- // CHECKSTYLE:ON
}
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
index 4673106bd08..66ed1990c37 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/URISupport.java
@@ -34,10 +34,8 @@ import java.util.function.BiConsumer;
public final class URISupport {
public static final String RAW_TOKEN_PREFIX = "RAW";
- // CHECKSTYLE:OFF
public static final char[] RAW_TOKEN_START = { '(', '{' };
public static final char[] RAW_TOKEN_END = { ')', '}' };
- // CHECKSTYLE:ON
private static final String CHARSET = "UTF-8";
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index 2989c6df526..fea6a5e405f 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -108,7 +108,6 @@ public class SimplePredicateParser extends BaseSimpleParser {
nextToken();
while (!token.getType().isEol()) {
// predicate supports quotes, functions, operators and whitespaces
- //CHECKSTYLE:OFF
if (!singleQuotedLiteralWithFunctionsText()
&& !doubleQuotedLiteralWithFunctionsText()
&& !functionText()
@@ -122,7 +121,6 @@ public class SimplePredicateParser extends BaseSimpleParser {
// use the previous index as that is where the problem is
throw new SimpleParserException("Unexpected token " + token, previousIndex);
}
- //CHECKSTYLE:ON
// take the next token
nextToken();
}
@@ -695,7 +693,6 @@ public class SimplePredicateParser extends BaseSimpleParser {
}
// then we proceed in the grammar according to the parameter types supported by the given binary operator
- //CHECKSTYLE:OFF
if ((literalWithFunctionsSupported && singleQuotedLiteralWithFunctionsText())
|| (literalWithFunctionsSupported && doubleQuotedLiteralWithFunctionsText())
|| (literalSupported && singleQuotedLiteralText())
@@ -713,7 +710,6 @@ public class SimplePredicateParser extends BaseSimpleParser {
} else {
throw new SimpleParserException("Binary operator " + operatorType + " does not support token " + token, token.getIndex());
}
- //CHECKSTYLE:ON
return true;
}
return false;
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
index 3ab8c1f1d86..35e3cd6bcd2 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
@@ -44,7 +44,6 @@ public enum BinaryOperatorType {
STARTS_WITH,
ENDS_WITH;
- //CHECKSTYLE:OFF
public static BinaryOperatorType asOperator(String text) {
if ("==".equals(text)) {
return EQ;
@@ -240,7 +239,6 @@ public enum BinaryOperatorType {
}
return null;
}
- //CHECKSTYLE:ON
@Override
public String toString() {
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index fa9a2855065..90c9882a7ef 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -185,7 +185,6 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
return answer;
}
- // CHECKSTYLE:OFF
public static ProcessorReifier<? extends ProcessorDefinition<?>> coreReifier(
Route route, ProcessorDefinition<?> definition) {
@@ -322,7 +321,6 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
}
return null;
}
- // CHECKSTYLE:OFF
/**
* Determines whether a new thread pool will be created or not.
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index be920d3e058..fe02153b35d 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -173,7 +173,6 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends
return answer;
}
- // CHECKSTYLE:OFF
private static DataFormatReifier<? extends DataFormatDefinition> coreReifier(
CamelContext camelContext, DataFormatDefinition definition) {
if (definition instanceof ASN1DataFormat) {
@@ -261,7 +260,6 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends
}
return null;
}
- // CHECKSTYLE:ON
public DataFormat createDataFormat() {
DataFormat dataFormat = definition.getDataFormat();
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index fea2e9c2cae..f20374b6462 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -185,7 +185,6 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
return contextClassLoaderOnStart;
}
- //CHECKSTYLE:OFF
public void afterPropertiesSet() throws Exception {
if (org.apache.camel.util.ObjectHelper.isEmpty(getId())) {
throw new IllegalArgumentException("Id must be set");
@@ -477,7 +476,6 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
// init route controller
initRouteController();
}
- //CHECKSTYLE:ON
/**
* Setup all the routes which must be done prior starting {@link CamelContext}.
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/simple/Constants.java b/core/camel-core/src/test/java/org/apache/camel/language/simple/Constants.java
index 00d0ffbc199..7d748636602 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/simple/Constants.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/simple/Constants.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.simple;
-// CHECKSTYLE:OFF
// we want to use the code as-is as that is how end users may code
public class Constants {
@@ -28,4 +27,3 @@ public class Constants {
}
}
-// CHECKSTYLE:ON
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
index 4b48a7f9a5d..45f19bb8679 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
@@ -307,7 +307,6 @@ public class ObjectHelperTest {
assertEquals("bean:bar?method=cool('A','Hello,World')", it.next());
}
- // CHECKSTYLE:OFF
@Test
void testCreateIteratorWithPrimitiveArrayTypes() {
Iterator<?> it = ObjectHelper.createIterator(new byte[] {13, Byte.MAX_VALUE, 7, Byte.MIN_VALUE}, null);
@@ -554,7 +553,6 @@ public class ObjectHelperTest {
assertTrue(nsee.getMessage().endsWith("at the index 0"), nsee.getMessage());
}
}
- // CHECKSTYLE:ON
@Test
void testArrayAsIterator() {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
index 299c618fbfb..8eb5702774c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AsyncProcessorConverterHelper.java
@@ -46,9 +46,7 @@ public final class AsyncProcessorConverterHelper {
* Creates a {@link AsyncProcessor} that delegates to the given processor. It is important that this implements
* {@link DelegateProcessor}
*/
- // CHECKSTYLE:OFF
private static class ProcessorToAsyncProcessorBridge implements DelegateProcessor, AsyncProcessor, Navigate<Processor>, Service {
- // CHECKSTYLE:ON
protected final Processor processor;
private ProcessorToAsyncProcessorBridge(Processor processor) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 05766c00e7c..b2674ead567 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -60,7 +60,6 @@ import org.apache.camel.util.xml.XmlPrettyPrinter;
/**
* A helper class for working with <a href="http://camel.apache.org/expression.html">expressions</a>.
*/
-//CHECKSTYLE:OFF
public class ExpressionBuilder {
/**
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
index 572f6ee4897..559026f6a2a 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/PredicateBuilder.java
@@ -34,7 +34,6 @@ import static org.apache.camel.util.ObjectHelper.notNull;
/**
* A helper class for working with predicates
*/
-//CHECKSTYLE:OFF
public class PredicateBuilder {
/**
* Converts the given expression into an {@link Predicate}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
index 65967eb0095..8544d492b4d 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -473,7 +473,6 @@ public final class ObjectHelper {
* @param name the name of the class to load
* @return the class or <tt>null</tt> if it could not be loaded
*/
- //CHECKSTYLE:OFF
public static Class<?> loadSimpleType(String name) {
// special for byte[] or Object[] as its common to use
if ("java.lang.byte[]".equals(name) || "byte[]".equals(name)) {
@@ -522,7 +521,6 @@ public final class ObjectHelper {
}
return null;
}
- //CHECKSTYLE:ON
/**
* Loads the given class with the provided classloader (may be null). Will ignore any class not found and return
diff --git a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
index f24b9ff398f..9222ae0d6aa 100644
--- a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
+++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java
@@ -32,7 +32,6 @@
*
*/
-// CHECKSTYLE:OFF
package org.apache.camel.xml.io.util;
import java.io.BufferedInputStream;
@@ -773,4 +772,3 @@ public class XmlStreamReader extends Reader {
}
}
-// CHECKSTYLE:ON
diff --git a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
index edcb4df04aa..a6e1e302064 100644
--- a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
+++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java
@@ -32,7 +32,6 @@
*
*/
-// CHECKSTYLE:OFF
package org.apache.camel.xml.io.util;
import java.io.IOException;
@@ -166,4 +165,3 @@ public class XmlStreamReaderException extends IOException {
return is;
}
}
-// CHECKSTYLE:ON
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 3f1bca0a6cd..7491773fbd8 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-//CHECKSTYLE:OFF
-
-
/**
* Generated by Camel build tools - do NOT edit this file!
*/
@@ -3481,4 +3478,3 @@ public class ModelParser extends BaseParser {
}
}
}
-//CHECKSTYLE:ON
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index 5adeebfbe01..c068fb2d0fa 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-//CHECKSTYLE:OFF
-
-
/**
* Generated by Camel build tools - do NOT edit this file!
*/
@@ -5042,4 +5039,3 @@ public class ModelWriter extends BaseWriter {
void doWriteElement(String name, T value) throws IOException;
}
}
-//CHECKSTYLE:ON
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
index 8b2c139e1ea..032a2f3d064 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
@@ -24,7 +24,6 @@
* $Id: MXParser.java,v 1.52 2006/11/09 18:29:37 aslom Exp $
*/
-// CHECKSTYLE:OFF
package org.apache.camel.xml.io;
import java.io.EOFException;
@@ -3148,4 +3147,3 @@ public class MXParser implements XmlPullParser {
* PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING SOFTWARE.
*/
-// CHECKSTYLE:ON
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
index 1a6148dc807..cebc83ea1f3 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
@@ -18,7 +18,6 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/
// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)
-// CHECKSTYLE:OFF
package org.apache.camel.xml.io;
import java.io.IOException;
@@ -1103,4 +1102,3 @@ public interface XmlPullParser {
int nextTag() throws XmlPullParserException, IOException;
}
-// CHECKSTYLE:ON
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
index 9f4d139223f..f0ff666acfc 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParserException.java
@@ -19,7 +19,6 @@
// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)
package org.apache.camel.xml.io;
-// CHECKSTYLE:OFF
/**
* This exception is thrown to signal XML Pull Parser related faults.
@@ -63,4 +62,3 @@ public class XmlPullParserException extends Exception {
}
}
-// CHECKSTYLE:ON
diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
index 1c93ab15420..1de667e6cec 100644
--- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
+++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-//CHECKSTYLE:OFF
-
-
/**
* Generated by Camel build tools - do NOT edit this file!
*/
@@ -5042,4 +5039,3 @@ public class ModelWriter extends BaseWriter {
void doWriteElement(String name, T value) throws IOException;
}
}
-//CHECKSTYLE:ON
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 912ff866f18..7cdc76e76fa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package org.apache.camel.builder.endpoint;
import java.util.List;
@@ -365,5 +364,4 @@ public interface EndpointBuilderFactory
}
};
}
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index 5950134a1a5..77e3454252c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package org.apache.camel.builder.endpoint;
import javax.annotation.processing.Generated;
@@ -342,5 +341,4 @@ public interface EndpointBuilders
org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory,
org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory {
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index b5aaa14ba10..a17bd194553 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package org.apache.camel.builder.endpoint;
import javax.annotation.processing.Generated;
@@ -15559,5 +15558,4 @@ public class StaticEndpointBuilders {
String path) {
return org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.endpointBuilder(componentName, path);
}
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
index c30cbc95029..66fc65bfb71 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
@@ -41,10 +41,8 @@ public abstract class CamelCommand implements Callable<Integer> {
private final CamelJBangMain main;
private File camelDir;
- //CHECKSTYLE:OFF
@CommandLine.Option(names = { "-h", "--help" }, usageHelp = true, description = "Display the help and sub-commands")
private boolean helpRequested = false;
- //CHECKSTYLE:ON
public CamelCommand(CamelJBangMain main) {
this.main = main;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 9862d46300e..3abd19cd810 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -113,7 +113,6 @@ public class Run extends CamelCommand {
private File logFile;
- //CHECKSTYLE:OFF
@Parameters(description = "The Camel file(s) to run. If no files specified then application.properties is used as source for which files to run.",
arity = "0..9", paramLabel = "<files>", parameterConsumer = FilesConsumer.class)
Path[] filePaths; // Defined only for file path completion; the field never used
@@ -228,7 +227,6 @@ public class Run extends CamelCommand {
super(main);
}
- //CHECKSTYLE:ON
public String getProfile() {
return profile;
diff --git a/dsl/camel-jbang/camel-jbang-main/pom.xml b/dsl/camel-jbang/camel-jbang-main/pom.xml
index 604530055a4..6fb66b4bef4 100644
--- a/dsl/camel-jbang/camel-jbang-main/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-main/pom.xml
@@ -38,7 +38,6 @@
<firstVersion>3.12.0</firstVersion>
<label>jbang</label>
<supportLevel>Preview</supportLevel>
- <checkstyle.skip>true</checkstyle.skip>
<dist.dir>dist</dist.dir>
<camel-prepare-component>false</camel-prepare-component>
</properties>
@@ -63,14 +62,6 @@
</resources>
<sourceDirectory>src/main/jbang</sourceDirectory>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <skip>${checkstyle.skip}</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 08c4de36809..d8abe6c309c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,7 +47,6 @@
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
<cxf.xjc.jvmArgs />
<trimStackTrace>false</trimStackTrace>
- <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<activemq-version>5.18.1</activemq-version>
@@ -338,8 +337,6 @@
<maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
- <maven-checkstyle-plugin-version>3.3.0</maven-checkstyle-plugin-version>
- <maven-checkstyle-version>8.45.1</maven-checkstyle-version>
<maven-owasp-plugin-version>8.2.1</maven-owasp-plugin-version>
<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
@@ -2892,46 +2889,6 @@
<artifactId>maven-archetype-plugin</artifactId>
<version>${maven-archetype-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin-version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${maven-checkstyle-version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>validate</phase>
- <configuration>
- <includeResources>false</includeResources>
- <configLocation>camel-checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>${checkstyle.failOnViolation}</failsOnError>
- <linkXRef>false</linkXRef>
- <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
- <sourceDirectories>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- </sourceDirectories>
- <headerLocation>header-java.txt</headerLocation>
- <includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes>
- <excludes>${sourcecheckExcludesComma}**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java</excludes>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
@@ -3019,18 +2976,10 @@
<configuration>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
- <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</projectnatures>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
- <location>/camel-eclipse-checkstyle</location>
- </file>
- </additionalConfig>
</configuration>
</plugin>
<plugin>
@@ -3345,11 +3294,6 @@
</formats>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin-version}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -3432,10 +3376,6 @@
<id>sourcecheck</id>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
@@ -3472,9 +3412,6 @@
</plugin>
</plugins>
</build>
- <properties>
- <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
- </properties>
</profile>
<profile>
diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
index de62c3e90dd..518583a56e8 100644
--- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
+++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
@@ -151,7 +151,6 @@ public final class Jsoner {
* @throws IOException if the underlying reader encounters an I/O error. Ensure the reader is properly
* instantiated, isn't closed, or that it is ready before trying again.
*/
- // CHECKSTYLE:OFF
private static JsonArray deserialize(final Reader deserializable, final Set<DeserializationOptions> flags) throws DeserializationException, IOException {
final Yylex lexer = new Yylex(deserializable);
Yytoken token;
@@ -364,7 +363,6 @@ public final class Jsoner {
} while (!(States.DONE.equals(currentState) && Yytoken.Types.END.equals(token.getType())));
return new JsonArray(valueStack);
}
- // CHECKSTYLE:ON
/**
* A convenience method that assumes a StringReader to deserialize a string.
@@ -926,7 +924,6 @@ public final class Jsoner {
* @throws IllegalArgumentException if the jsonSerializable isn't serializable in JSON.
* @see SerializationOptions
*/
- // CHECKSTYLE:OFF
private static void serialize(final Object jsonSerializable, final Writer writableDestination, final Set<SerializationOptions> flags) throws IOException {
if (jsonSerializable == null) {
/* When a null is passed in the word null is supported in JSON. */
@@ -1173,7 +1170,6 @@ public final class Jsoner {
}
}
}
- // CHECKSTYLE:ON
/**
* Serializes like the first version of this library. It has been adapted to use Jsonable for serializing custom
diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
index 8fc3a75602a..b76415f6a4c 100644
--- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
+++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java
@@ -448,7 +448,6 @@ class Yylex {
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- // CHECKSTYLE:OFF
public Yytoken yylex() throws java.io.IOException, DeserializationException {
int zzInput;
int zzAction;
@@ -659,6 +658,5 @@ class Yylex {
}
}
}
- // CHECKSTYLE:ON
}
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/AddressGateway.java b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/AddressGateway.java
index 22c186c07c2..802ecdd4084 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/AddressGateway.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/AddressGateway.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package com.braintreegateway;
import com.braintreegateway.exceptions.NotFoundException;
@@ -88,5 +87,4 @@ public class AddressGateway {
NodeWrapper node = http.put(configuration.getMerchantPath() + "/customers/" + customerId + "/addresses/" + id, request);
return new Result<Address>(node, Address.class);
}
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomGateway.java b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomGateway.java
index 977d17998a7..36c37f128bc 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomGateway.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomGateway.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package com.braintreegateway;
import com.braintreegateway.exceptions.NotFoundException;
@@ -152,5 +151,4 @@ public class CustomerGateway {
return new Result<Customer>(node, Customer.class);
}
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomerGateway.java b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomerGateway.java
index 977d17998a7..36c37f128bc 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomerGateway.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/CustomerGateway.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package com.braintreegateway;
import com.braintreegateway.exceptions.NotFoundException;
@@ -152,5 +151,4 @@ public class CustomerGateway {
return new Result<Customer>(node, Customer.class);
}
-}
-//CHECKSTYLE:ON
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/DisputeGateway.java b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/DisputeGateway.java
index ca8aacb3493..69c1d4666be 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/DisputeGateway.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/DisputeGateway.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//CHECKSTYLE:OFF
package com.braintreegateway;
import com.braintreegateway.exceptions.NotFoundException;
@@ -260,4 +259,3 @@ public class DisputeGateway {
return new PaginatedResult<Dispute>(response.findInteger("total-items"), response.findInteger("page-size"), disputes);
}
}
-//CHECKSTYLE:ON
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 669c059342d..5121f6c1c22 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -233,7 +233,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
}
- @SuppressWarnings({ "checkstyle:executablestatementcount", "checkstyle:methodlength" })
private boolean doCreateEndpointDsl(ComponentModel model, List<ComponentModel> aliases, List<Method> staticBuilders)
throws MojoFailureException {
String componentClassName = model.getJavaType();
@@ -857,7 +856,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
javaClass.implementInterface(componentsFactoriesPackageName + "." + factoryName + "." + endpointsName);
}
- return writeSourceIfChanged("//CHECKSTYLE:OFF\n" + javaClass.printClass() + "\n//CHECKSTYLE:ON",
+ return writeSourceIfChanged(javaClass.printClass(),
endpointFactoriesPackageName.replace('.', '/'), "EndpointBuilderFactory.java");
}
@@ -874,7 +873,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
javaClass.implementInterface(componentsFactoriesPackageName + "." + Strings.before(factory.getName(), "."));
}
- return writeSourceIfChanged("//CHECKSTYLE:OFF\n" + javaClass.printClass() + "\n//CHECKSTYLE:ON",
+ return writeSourceIfChanged(javaClass.printClass(),
endpointFactoriesPackageName.replace(".", "/"), "EndpointBuilders.java");
}
@@ -942,7 +941,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
String printClass = javaClass.printClass();
- return writeSourceIfChanged("//CHECKSTYLE:OFF\n" + printClass + "\n//CHECKSTYLE:ON",
+ return writeSourceIfChanged(printClass,
endpointFactoriesPackageName.replace(".", "/"), "StaticEndpointBuilders.java");
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 926af5f4483..5078ed4c444 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -1163,7 +1163,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
}
- // CHECKSTYLE:OFF
protected void findClassProperties(
ComponentModel componentModel, Class<?> classElement,
Set<String> excludes, String prefix,
@@ -1587,7 +1586,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
return null;
}
- // CHECKSTYLE:ON
private static boolean isNullOrEmpty(Object value) {
return value == null || "".equals(value) || "null".equals(value);
@@ -1606,7 +1604,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
return false;
}
- // CHECKSTYLE:ON
private static boolean isGroovyMetaClassProperty(final Method method) {
final String methodName = method.getName();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
index c089518917e..1ce92bc0ae5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
@@ -137,9 +137,9 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
+ " * distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+ " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+ " * See the License for the specific language governing permissions and\n"
- + " * limitations under the License.\n" + " */\n" + "\n" + "//CHECKSTYLE:OFF\n" + "\n"
+ + " * limitations under the License.\n" + " */\n"
+ "\n/**\n * Generated by Camel build tools - do NOT edit this file!\n */\n"
- + writer.printClass() + "\n" + "//CHECKSTYLE:ON\n";
+ + writer.printClass() + "\n";
}
protected Class<?> loadClass(ClassLoader loader, String name) {
@@ -179,7 +179,6 @@ public abstract class ModelWriterGeneratorMojo extends AbstractGeneratorMojo {
.filter(c -> c.getName().startsWith("org.apache.camel.")));
}
- // CHECKSTYLE:OFF
private JavaClass generateWriter(List<Class<?>> model, ClassLoader classLoader) {
JavaClass writer = new JavaClass(classLoader);
writer.setMaxImportPerPackage(4);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index 9fb32117d77..7b8c2723fce 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -181,9 +181,9 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
+ " * distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+ " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+ " * See the License for the specific language governing permissions and\n"
- + " * limitations under the License.\n" + " */\n" + "\n" + "//CHECKSTYLE:OFF\n" + "\n"
+ + " * limitations under the License.\n" + " */\n"
+ "\n/**\n * Generated by Camel build tools - do NOT edit this file!\n */\n"
- + parser.printClass() + "\n" + "//CHECKSTYLE:ON\n";
+ + parser.printClass() + "\n";
}
protected Class<?> loadClass(ClassLoader loader, String name) {
@@ -219,7 +219,6 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
.filter(c -> c.getName().startsWith("org.apache.camel.")));
}
- // CHECKSTYLE:OFF
private JavaClass generateParser(List<Class<?>> model, ClassLoader classLoader) {
JavaClass parser = new JavaClass(classLoader);
parser.setMaxImportPerPackage(4);
@@ -656,7 +655,6 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
attributes = sb.toString();
return attributes;
}
- // CHECKSTYLE:ON
private String conversion(JavaClass parser, GenericType type, String val, String clazzName) {
Class<?> rawClass = type.getRawClass();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index be1fd0eebeb..783328ce7fe 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -432,7 +432,6 @@ public class PrepareCatalogMojo extends AbstractMojo {
printModelsReport(jsonFiles, duplicateJsonFiles, missingLabels, usedLabels, missingJavaDoc);
}
- // CHECKSTYLE:OFF
protected Set<String> executeComponents() throws Exception {
Path componentsOutDir = this.componentsOutDir.toPath();
@@ -1146,7 +1145,6 @@ public class PrepareCatalogMojo extends AbstractMojo {
return Stream.concat(l1.stream(), l2.stream()).collect(Collectors.toList());
}
- // CHECKSTYLE:ON
private Stream<Path> list(Path dir) {
try {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
index f0e2386ba47..5e7c43fe269 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.util.Arrays;
-// CHECKSTYLE:OFF
public class OwbTypeVariableImpl {
private static final Class<?>[] TYPE_VARIABLE_TYPES = new Class<?>[] {TypeVariable.class};
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
index 4ed07275140..c0dfa8fdb87 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test;
public class JavadocTest {
- // CHECKSTYLE:OFF
public static final String SOURCE_CLASS_1 =
" /**\n" +
" * Path to the template.\n" +
@@ -101,7 +100,6 @@ public class JavadocTest {
public static final String JAVADOC_4 =
"Messaging with AMQP protocol using Apache QPid Client.\n\nThis class extends JmsEndpoint " +
"because it uses Apache Qpid JMS-compatible client for\nperforming the AMQP connectivity.";
- // CHECKSTYLE:ON
@Test
public void testJavadoc1() {
[camel] 06/18: CAMEL-19466 - Skip Maven mojos in the fast profile properly
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dab0094b03f48764e26ae862b7715e0828757e66
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 15:45:50 2023 +0200
CAMEL-19466 - Skip Maven mojos in the fast profile properly
---
apache-camel/pom.xml | 81 ++++------
archetypes/pom.xml | 1 -
buildingtools/pom.xml | 10 --
camel-dependencies/pom.xml | 1 -
catalog/camel-catalog-console/pom.xml | 1 -
catalog/camel-catalog/pom.xml | 56 +++----
.../org/apache/camel/catalog/others.properties | 1 -
.../apache/camel/catalog/others/dsl-support.json | 15 --
catalog/dummy-component/pom.xml | 1 -
catalog/pom.xml | 9 --
components/camel-as2/camel-as2-api/pom.xml | 1 -
components/camel-as2/pom.xml | 8 -
components/camel-asterisk/pom.xml | 35 +++--
components/camel-avro/pom.xml | 27 +---
.../camel-aws/camel-aws-secrets-manager/pom.xml | 32 ++--
components/camel-aws/camel-aws2-kms/pom.xml | 32 ++--
components/camel-aws/camel-aws2-lambda/pom.xml | 32 ++--
components/camel-aws/camel-aws2-sns/pom.xml | 32 ++--
components/camel-box/camel-box-api/pom.xml | 1 -
components/camel-box/camel-box-component/pom.xml | 43 +++---
components/camel-box/pom.xml | 9 --
components/camel-couchbase/pom.xml | 80 +++++-----
components/camel-cxf/camel-cxf-common/pom.xml | 28 ++--
components/camel-cxf/camel-cxf-rest/pom.xml | 39 +++--
components/camel-cxf/camel-cxf-soap/pom.xml | 29 ++--
.../camel-cxf/camel-cxf-spring-common/pom.xml | 41 +++--
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 29 ++--
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 29 ++--
components/camel-datasonnet/pom.xml | 37 +++--
components/camel-elasticsearch/pom.xml | 40 +++--
components/camel-etcd3/pom.xml | 35 +++--
components/camel-facebook/pom.xml | 40 +++--
components/camel-fhir/camel-fhir-api/pom.xml | 1 -
components/camel-flink/pom.xml | 8 +-
components/camel-ftp/pom.xml | 98 ++++++------
.../camel-google/camel-google-functions/pom.xml | 38 +++--
components/camel-google/camel-google-mail/pom.xml | 10 --
.../camel-google-secret-manager/pom.xml | 38 +++--
.../camel-google/camel-google-storage/pom.xml | 38 +++--
components/camel-grpc/pom.xml | 7 -
components/camel-hazelcast/pom.xml | 49 +++---
components/camel-ignite/pom.xml | 6 +-
.../camel-infinispan-embedded/pom.xml | 40 +++--
.../camel-infinispan/camel-infinispan/pom.xml | 21 +--
components/camel-jasypt/pom.xml | 22 ---
components/camel-jcr/pom.xml | 34 +++--
components/camel-jgroups-raft/pom.xml | 36 +++--
components/camel-jgroups/pom.xml | 36 +++--
components/camel-jms/pom.xml | 79 ++++++----
components/camel-jooq/pom.xml | 2 -
components/camel-jpa/pom.xml | 96 +++++++-----
components/camel-kafka/pom.xml | 97 +++++++-----
components/camel-kudu/pom.xml | 6 +-
components/camel-mail/pom.xml | 32 ++--
components/camel-mapstruct/pom.xml | 1 -
components/camel-master/pom.xml | 38 +++--
components/camel-mina/pom.xml | 57 ++++---
components/camel-mllp/pom.xml | 39 +++--
components/camel-netty/pom.xml | 33 ++--
components/camel-observation/pom.xml | 80 +++++-----
components/camel-olingo2/camel-olingo2-api/pom.xml | 1 -
.../camel-olingo2/camel-olingo2-component/pom.xml | 12 --
components/camel-olingo4/camel-olingo4-api/pom.xml | 1 -
components/camel-opentelemetry/pom.xml | 79 +++++-----
components/camel-protobuf/pom.xml | 7 -
components/camel-pulsar/pom.xml | 61 ++++----
components/camel-robotframework/pom.xml | 94 ++++++------
components/camel-rocketmq/pom.xml | 44 +++---
components/camel-rxjava/pom.xml | 35 +++--
.../camel-salesforce-maven-plugin/pom.xml | 1 -
components/camel-service/pom.xml | 38 +++--
.../camel-servicenow-maven-plugin/pom.xml | 12 +-
components/camel-sjms/pom.xml | 26 +++-
components/camel-sjms2/pom.xml | 26 +++-
components/camel-soap/pom.xml | 6 +-
components/camel-spring-xml/pom.xml | 79 +++++-----
components/camel-undertow/pom.xml | 33 ++--
components/camel-xmpp/pom.xml | 42 +++--
components/camel-zendesk/pom.xml | 1 -
components/camel-zookeeper-master/pom.xml | 46 +++---
components/camel-zookeeper/pom.xml | 47 +++---
components/pom.xml | 71 ++++-----
core/camel-core/pom.xml | 51 ++++---
core/camel-util/pom.xml | 37 +++--
.../java/org/apache/camel/util/SensitiveUtils.java | 2 +-
core/pom.xml | 1 -
docs/pom.xml | 149 +++++++++---------
dsl/camel-componentdsl/pom.xml | 51 ++++---
dsl/camel-endpointdsl/pom.xml | 50 +++---
dsl/camel-kotlin-dsl/pom.xml | 30 +++-
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 1 -
dsl/pom.xml | 1 -
parent/pom.xml | 163 +++++++-------------
pom.xml | 169 +++++++++++++++------
test-infra/camel-test-infra-arangodb/pom.xml | 10 --
test-infra/camel-test-infra-artemis/pom.xml | 9 --
test-infra/camel-test-infra-aws-common/pom.xml | 9 --
test-infra/camel-test-infra-aws-v2/pom.xml | 10 --
test-infra/camel-test-infra-azure-common/pom.xml | 10 --
.../camel-test-infra-azure-storage-blob/pom.xml | 9 --
.../pom.xml | 9 --
.../camel-test-infra-azure-storage-queue/pom.xml | 9 --
test-infra/camel-test-infra-cassandra/pom.xml | 8 -
test-infra/camel-test-infra-chatscript/pom.xml | 10 --
test-infra/camel-test-infra-common/pom.xml | 9 --
test-infra/camel-test-infra-consul/pom.xml | 9 --
test-infra/camel-test-infra-couchbase/pom.xml | 9 --
test-infra/camel-test-infra-couchdb/pom.xml | 9 --
.../camel-test-infra-dispatch-router/pom.xml | 9 --
test-infra/camel-test-infra-elasticsearch/pom.xml | 9 --
test-infra/camel-test-infra-etcd3/pom.xml | 9 --
test-infra/camel-test-infra-fhir/pom.xml | 9 --
test-infra/camel-test-infra-ftp/pom.xml | 9 --
test-infra/camel-test-infra-google-pubsub/pom.xml | 9 --
.../camel-test-infra-hashicorp-vault/pom.xml | 9 --
test-infra/camel-test-infra-hdfs/pom.xml | 9 --
test-infra/camel-test-infra-ignite/pom.xml | 9 --
test-infra/camel-test-infra-infinispan/pom.xml | 9 --
test-infra/camel-test-infra-jdbc/pom.xml | 9 --
test-infra/camel-test-infra-jetty/pom.xml | 9 --
test-infra/camel-test-infra-kafka/pom.xml | 9 --
.../camel-test-infra-messaging-common/pom.xml | 9 --
.../camel-test-infra-microprofile-lra/pom.xml | 9 --
test-infra/camel-test-infra-minio/pom.xml | 9 --
test-infra/camel-test-infra-mongodb/pom.xml | 9 --
test-infra/camel-test-infra-mosquitto/pom.xml | 9 --
test-infra/camel-test-infra-nats/pom.xml | 9 --
test-infra/camel-test-infra-openldap/pom.xml | 59 +++----
test-infra/camel-test-infra-postgres/pom.xml | 9 --
test-infra/camel-test-infra-pulsar/pom.xml | 9 --
test-infra/camel-test-infra-rabbitmq/pom.xml | 9 --
test-infra/camel-test-infra-redis/pom.xml | 9 --
test-infra/camel-test-infra-xmpp/pom.xml | 9 --
test-infra/camel-test-infra-zookeeper/pom.xml | 9 --
tests/camel-itest/pom.xml | 38 +++--
.../pom.xml | 36 +++--
tooling/maven/camel-maven-plugin/pom.xml | 38 +++--
tooling/maven/camel-package-maven-plugin/pom.xml | 7 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 18 +--
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 87 +++++------
tooling/maven/pom.xml | 2 -
141 files changed, 2004 insertions(+), 1999 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index bb2a97cf41c..aef50b6108d 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -192,52 +192,37 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <!-- skip remote resources in assembly is a bit cumbersome to turn off -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>${maven-remote-resources-plugin-version}</version>
- <executions>
- <execution>
- <id>process-remote-resources</id>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <attachToTest>false</attachToTest>
- <excludeTransitive>true</excludeTransitive>
- <includeGroupIds>org.apache.camel</includeGroupIds>
- <includeScope>compile</includeScope>
- <resourceBundles>
- <resourceBundle>org.apache.camel:*:${project.version}</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin-version}</version>
- <executions>
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>${tarLongFileMode}</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>${tarLongFileMode}</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 8da18c9375b..86be420ddd1 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -96,7 +96,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>1.1.0</version>
<executions>
<execution>
<id>default-cli</id>
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 838146b3044..4a672cdf5cc 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -35,14 +35,4 @@
<maven.test.skip>true</maven.test.skip>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index ca63e47dd0a..52da7e84fe8 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -345,7 +345,6 @@
<maven-plugin-plugin-version>3.9.0</maven-plugin-plugin-version>
<maven-plugin-annotations-version>3.9.0</maven-plugin-annotations-version>
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
- <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
<!-- resources plugin needed by Camel maven archetypes -->
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index de678f4e39f..b18bd9dc56f 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -90,7 +90,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index 06284ae2084..f64300c4788 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -43,29 +43,25 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-model</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- disable all components -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-allcomponents</artifactId>
- <version>${project.version}</version>
<type>pom</type>
- <scope>provided</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.camel</groupId>
+ <groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -78,12 +74,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-all</artifactId>
- <version>${project.version}</version>
<type>pom</type>
- <scope>provided</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.camel</groupId>
+ <groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
@@ -133,21 +128,6 @@
<build>
<plugins>
- <!-- sync parent/pom.xml with camel-dependencies/pom.xml -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>sync-properties-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>sync-properties</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- generate and include all components in the catalog -->
<plugin>
<groupId>org.apache.camel</groupId>
@@ -189,9 +169,7 @@
</execution>
</executions>
</plugin>
-
</plugins>
-
</build>
<profiles>
@@ -215,6 +193,32 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!-- sync parent/pom.xml with camel-dependencies/pom.xml -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>sync-properties-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>sync-properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 04d6b9ef566..222d2f13b83 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -9,7 +9,6 @@ console
csimple-joor
debug
dsl-modeline
-dsl-support
elytron
endpointdsl
groovy-dsl
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
deleted file mode 100644
index b4fbba40983..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "other": {
- "kind": "other",
- "name": "dsl-support",
- "title": "DSL Support",
- "description": "Camel DSL Support",
- "deprecated": false,
- "firstVersion": "3.10.0",
- "label": "dsl",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-dsl-support",
- "version": "4.0.0-SNAPSHOT"
- }
-}
diff --git a/catalog/dummy-component/pom.xml b/catalog/dummy-component/pom.xml
index c80134e194e..f62ed87da3b 100644
--- a/catalog/dummy-component/pom.xml
+++ b/catalog/dummy-component/pom.xml
@@ -67,7 +67,6 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<execution>
<id>generate</id>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 38adeffa99b..ca358fc2453 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -50,13 +50,4 @@
<module>camel-report-maven-plugin</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 338895e7a64..b18b3e77ac5 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -106,7 +106,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/components/camel-as2/pom.xml b/components/camel-as2/pom.xml
index afe6af6687c..4d8ef34cfe2 100644
--- a/components/camel-as2/pom.xml
+++ b/components/camel-as2/pom.xml
@@ -37,12 +37,4 @@
<module>camel-as2-api</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 15c59870312..d5c09d80ca0 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -65,16 +65,27 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index dd3e414ccb0..3c53f516d9f 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -32,32 +32,7 @@
<description>Camel Avro data format</description>
<properties>
-</properties>
-
- <build>
- <plugins>
- <!--plugin>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <version>${avro-version}</version>
- <executions>
- <execution>
- <id>schemas</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>schema</goal>
- <goal>protocol</goal>
- <goal>idl-protocol</goal>
- </goals>
- <configuration>
- <sourceDirectory>${project.basedir}/src/test/avro/</sourceDirectory>
- <outputDirectory>${project.basedir}/src/test/java/</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
+ </properties>
<dependencies>
<dependency>
diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
index 8797ee1bf31..c94b608a546 100644
--- a/components/camel-aws/camel-aws-secrets-manager/pom.xml
+++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -86,15 +86,25 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml
index c85f8255635..dc351d12185 100644
--- a/components/camel-aws/camel-aws2-kms/pom.xml
+++ b/components/camel-aws/camel-aws2-kms/pom.xml
@@ -74,15 +74,25 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml
index 06b8092d2a4..55761f8ea0f 100644
--- a/components/camel-aws/camel-aws2-lambda/pom.xml
+++ b/components/camel-aws/camel-aws2-lambda/pom.xml
@@ -73,15 +73,25 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml
index 1e78606757f..b10b6ae95fb 100644
--- a/components/camel-aws/camel-aws2-sns/pom.xml
+++ b/components/camel-aws/camel-aws2-sns/pom.xml
@@ -101,15 +101,25 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index d93d00da761..2cd71131f6b 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -57,7 +57,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index 22a32d2bbcf..74f95a72629 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -91,29 +91,8 @@
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- Avoid 'bootstrap classpath has been appended' error message caused by mockito-inline -->
- <argLine>-Xshare:off</argLine>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api-component-maven-plugin</artifactId>
@@ -602,5 +581,27 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- Avoid 'bootstrap classpath has been appended' error message caused by mockito-inline -->
+ <argLine>-Xshare:off</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml
index 4e2439342db..c02b81858fb 100644
--- a/components/camel-box/pom.xml
+++ b/components/camel-box/pom.xml
@@ -38,13 +38,4 @@
<module>camel-box-api</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml
index ec62b036539..1a6f8730ed0 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -80,41 +80,51 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <excludedGroups>couchbase-7</excludedGroups>
+ <reuseForks>true</reuseForks>
</configuration>
- </execution>
- <execution>
- <id>couchbase-7</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <groups>couchbase-7</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <systemPropertyVariables>
- <couchbase.container>couchbase/server:7.1.1</couchbase.container>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <excludedGroups>couchbase-7</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>couchbase-7</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <groups>couchbase-7</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ <systemPropertyVariables>
+ <couchbase.container>couchbase/server:7.1.1</couchbase.container>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index 29db3647354..f8d00109033 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -83,7 +83,6 @@
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -112,16 +111,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -147,15 +136,28 @@
</dependencies>
</profile>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
<argLine>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index fb7de2bfb62..255b39f4103 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -33,7 +33,6 @@
<description>Camel CXF REST support</description>
<properties>
-
</properties>
<dependencies>
@@ -63,7 +62,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf-version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -94,7 +93,7 @@
<artifactId>camel-xpath</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
@@ -238,21 +237,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- <!--parallel>classes</parallel>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>2</threadCount-->
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
@@ -272,25 +256,36 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>${jaxp-ri-version}</version>
+ <version>${jaxp-ri-version}</version>
</dependency>
</dependencies>
</profile>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>classes</parallel>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <threadCount>2</threadCount-->
<argLine>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
</profiles>
</project>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index 1defc5f139e..25626085945 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -267,19 +267,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- <!--parallel>classes</parallel>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>2</threadCount-->
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
@@ -356,20 +343,30 @@
</dependencies>
</profile>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>classes</parallel>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <threadCount>2</threadCount-->
<argLine>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
</profiles>
</project>
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index d867fde4e08..ff161298199 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -95,21 +95,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- <!--parallel>classes</parallel>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>2</threadCount-->
- </configuration>
- </plugin>
- </plugins>
</build>
<profiles>
@@ -149,5 +134,31 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>classes</parallel>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <threadCount>2</threadCount-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
index 012d4df4ceb..b09428a0758 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
@@ -264,19 +264,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- <!--parallel>classes</parallel>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>2</threadCount-->
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -351,20 +338,30 @@
</dependencies>
</profile>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>classes</parallel>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <threadCount>2</threadCount-->
<argLine>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
</profiles>
</project>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 8c8d5371230..4e2c89d2d7e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -279,19 +279,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <runOrder>alphabetical</runOrder>
- <!--parallel>classes</parallel>
- <perCoreThreadCount>true</perCoreThreadCount>
- <threadCount>2</threadCount-->
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -423,20 +410,30 @@
</dependencies>
</profile>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <childDelegation>false</childDelegation>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>classes</parallel>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ <threadCount>2</threadCount-->
<argLine>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED --add-opens java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
</profiles>
</project>
diff --git a/components/camel-datasonnet/pom.xml b/components/camel-datasonnet/pom.xml
index be27c6ff22e..7276bcd51e5 100644
--- a/components/camel-datasonnet/pom.xml
+++ b/components/camel-datasonnet/pom.xml
@@ -32,20 +32,6 @@
<name>Camel :: DataSonnet</name>
<description>Camel DataSonnet support</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>${project.basedir}/src/test/resources/dslibs.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -109,4 +95,27 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.basedir}/src/test/resources/dslibs.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml
index 783ba6ccb0d..bd923964fad 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -88,19 +88,29 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <es.path.data>target/data</es.path.data>
- </systemPropertyVariables>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <es.path.data>target/data</es.path.data>
+ </systemPropertyVariables>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-etcd3/pom.xml b/components/camel-etcd3/pom.xml
index cb7a49dd8b5..d8560e1b1a2 100644
--- a/components/camel-etcd3/pom.xml
+++ b/components/camel-etcd3/pom.xml
@@ -94,17 +94,26 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <endpoint>${endpoint}</endpoint>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <endpoint>${endpoint}</endpoint>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-facebook/pom.xml b/components/camel-facebook/pom.xml
index e9f9da65b30..df54cfd9e2d 100644
--- a/components/camel-facebook/pom.xml
+++ b/components/camel-facebook/pom.xml
@@ -58,20 +58,28 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index a0b641542f4..6319d948b83 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -64,7 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 8e567e21e67..ae12024cc08 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -112,9 +112,11 @@
</dependencies>
<profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
@@ -127,6 +129,6 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
</project>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 39c41114f03..cda89d0edfd 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -169,51 +169,61 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <argLine>-XX:+ExitOnOutOfMemoryError -Xmx3G</argLine>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <excludedGroups>not-parallel</excludedGroups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <systemProperties>
- <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
- <junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
- <junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
- <junit.jupiter.execution.parallel.config.strategy>dynamic</junit.jupiter.execution.parallel.config.strategy>
- <junit.jupiter.execution.parallel.config.dynamic.factor>${camel.failsafe.parallel.factor}</junit.jupiter.execution.parallel.config.dynamic.factor>
- </systemProperties>
+ <argLine>-XX:+ExitOnOutOfMemoryError -Xmx3G</argLine>
</configuration>
- </execution>
- <execution>
- <id>serials-test</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <forkCount>4</forkCount>
- <reuseForks>true</reuseForks>
- <groups>not-parallel</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludedGroups>not-parallel</excludedGroups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ <systemProperties>
+ <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+ <junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
+ <junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
+ <junit.jupiter.execution.parallel.config.strategy>dynamic</junit.jupiter.execution.parallel.config.strategy>
+ <junit.jupiter.execution.parallel.config.dynamic.factor>${camel.failsafe.parallel.factor}</junit.jupiter.execution.parallel.config.dynamic.factor>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>serials-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
+ <groups>not-parallel</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-google/camel-google-functions/pom.xml b/components/camel-google/camel-google-functions/pom.xml
index 3d21e6239bb..2a1174433dc 100644
--- a/components/camel-google/camel-google-functions/pom.xml
+++ b/components/camel-google/camel-google-functions/pom.xml
@@ -119,18 +119,28 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 5193d6d7145..946d1f82d17 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -153,19 +153,9 @@
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
<!-- generate Component source and test source -->
<plugin>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-google/camel-google-secret-manager/pom.xml b/components/camel-google/camel-google-secret-manager/pom.xml
index 5dd2b6829f6..93932062b46 100644
--- a/components/camel-google/camel-google-secret-manager/pom.xml
+++ b/components/camel-google/camel-google-secret-manager/pom.xml
@@ -124,18 +124,28 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-google/camel-google-storage/pom.xml b/components/camel-google/camel-google-storage/pom.xml
index c49eef7fde5..758475958b0 100644
--- a/components/camel-google/camel-google-storage/pom.xml
+++ b/components/camel-google/camel-google-storage/pom.xml
@@ -93,18 +93,28 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 806ca8701a9..941ec9b5dde 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -241,13 +241,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- </configuration>
- </plugin>
<!-- Force the version of guava to camel-package-maven-plugin to prevent build failure due to the
usage of an old/incompatible version of guava -->
<plugin>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index a3861d2b10c..23754626ba9 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -81,24 +81,33 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
-<!-- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>-->
- <systemProperties>
- <property>
- <name>hazelcast.logging.type</name>
- <value>slf4j</value>
- </property>
- </systemProperties>
- <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <!-- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds> -->
+ <systemProperties>
+ <property>
+ <name>hazelcast.logging.type</name>
+ <value>slf4j</value>
+ </property>
+ </systemProperties>
+ <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index f5bac1e4af8..e4a10b3a49b 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -94,9 +94,11 @@
<profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
diff --git a/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
index fa4fbd6691b..0b046f97f8e 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
@@ -124,19 +124,29 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>infinispan.test.jgroups.protocol</name>
- <value>tcp</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>infinispan.test.jgroups.protocol</name>
+ <value>tcp</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml
index 1d576f8f876..33bf52bb3a5 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -163,29 +163,18 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 5b9de8419a8..89452231ddb 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -72,28 +72,6 @@
<build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<!-- add main class and classpath to the MANIFEST.MF file -->
<plugin>
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index 65460cb4459..1aca912f9b9 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -69,16 +69,26 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-jgroups-raft/pom.xml b/components/camel-jgroups-raft/pom.xml
index fdd772e7577..207f6053102 100644
--- a/components/camel-jgroups-raft/pom.xml
+++ b/components/camel-jgroups-raft/pom.xml
@@ -68,17 +68,27 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </systemPropertyVariables>
- <argLine>${camel.surefire.fork.vmargs} -Djava.net.preferIPv4Stack=true</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </systemPropertyVariables>
+ <argLine>${camel.surefire.fork.vmargs} -Djava.net.preferIPv4Stack=true</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 3f6964ea64e..96bfba32b09 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -74,17 +74,27 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </systemPropertyVariables>
- <argLine>${camel.surefire.fork.vmargs} -Djava.net.preferIPv4Stack=true</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </systemPropertyVariables>
+ <argLine>${camel.surefire.fork.vmargs} -Djava.net.preferIPv4Stack=true</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 57dca006914..82e046b71d6 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -158,39 +158,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <excludedGroups>not-parallel</excludedGroups>
- </configuration>
- </execution>
- <execution>
- <id>serials-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <forkCount>4</forkCount>
- <reuseForks>true</reuseForks>
- <groups>not-parallel</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </execution>
- </executions>
-
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -204,4 +171,50 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludedGroups>not-parallel</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>serials-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
+ <groups>not-parallel</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index 7deb9f51abe..20a419859a2 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -109,7 +109,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>${properties-maven-plugin-version}</version>
<executions>
<execution>
<phase>initialize</phase>
@@ -213,7 +212,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<id>add-test-source</id>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index c7a867edec6..02f4f0f97b0 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -115,51 +115,13 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa-version}</version>
- <classifier>jakarta</classifier>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}-jakarta.jar -Xmx3G
- ${camel.surefire.fork.vmargs}
- </argLine>
- <forkedProcessTimeoutInSeconds>240</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>openjpa</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!hibernate</name>
+ </property>
</activation>
<build>
<pluginManagement>
@@ -245,6 +207,11 @@
</profile>
<profile>
<id>hibernate</id>
+ <activation>
+ <property>
+ <name>hibernate</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -280,5 +247,52 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa-version}</version>
+ <classifier>jakarta</classifier>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}-jakarta.jar -Xmx3G
+ ${camel.surefire.fork.vmargs}
+ </argLine>
+ <forkedProcessTimeoutInSeconds>240</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 9a957a9b48c..750da92fe29 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -144,49 +144,15 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipITs>${skipITs}</skipITs>
- <skipTests>${skipTests}</skipTests>
- <reuseForks>true</reuseForks>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <skipITs>${skipITs}</skipITs>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <excludedGroups>health,idempotent</excludedGroups>
- </configuration>
- </execution>
- <execution>
- <id>serials-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <reuseForks>false</reuseForks>
- <groups>health,idempotent</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
- <!-- Ensures camel-kafka does not run any tests during the release -->
<profile>
- <id>release</id>
+ <!-- This is needed only for camel-kafka to skip itests selected in the backwards-compatibility profile -->
+ <id>quickly</id>
+ <activation>
+ <property>
+ <name>quickly</name>
+ </property>
+ </activation>
<properties>
<skipITs>true</skipITs>
<skipTests>true</skipTests>
@@ -199,7 +165,6 @@
<arch>amd64</arch>
</os>
</activation>
-
<build>
<plugins>
<plugin>
@@ -221,9 +186,57 @@
<reportNameSuffix>kafka-2</reportNameSuffix>
<excludedGroups>non-abstract,health,idempotent</excludedGroups>
</configuration>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipITs>${skipITs}</skipITs>
+ <skipTests>${skipTests}</skipTests>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <skipITs>${skipITs}</skipITs>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludedGroups>health,idempotent</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>serials-test</id>
<goals>
<goal>integration-test</goal>
</goals>
+ <configuration>
+ <reuseForks>false</reuseForks>
+ <groups>health,idempotent</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/components/camel-kudu/pom.xml b/components/camel-kudu/pom.xml
index 9cbbf34fbb4..092d312f4e3 100644
--- a/components/camel-kudu/pom.xml
+++ b/components/camel-kudu/pom.xml
@@ -33,9 +33,11 @@
<profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 90fd76acfbd..6fe66ed376f 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -107,7 +107,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>unpack</id>
@@ -133,14 +132,29 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding -->
- <argLine>-Dfile.encoding=UTF-8</argLine>
- </configuration>
- </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding -->
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-mapstruct/pom.xml b/components/camel-mapstruct/pom.xml
index d12d2b1caaf..b09404f15a3 100644
--- a/components/camel-mapstruct/pom.xml
+++ b/components/camel-mapstruct/pom.xml
@@ -72,7 +72,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
<configuration>
<annotationProcessorPaths>
<path>
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index d86fea56363..25804ac1827 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -55,18 +55,28 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index fc2c0f93899..bdb68593cd7 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -83,29 +83,38 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <excludes>
- <!-- This test just show the shutdown error -->
- <exclude>**/MinaProducerShutdownTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <!-- allows the special unittest to be ran via 'mvn compile exec:java' -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <mainClass>org.apache.camel.component.mina.MinaProducerShutdownManualIT</mainClass>
- <includePluginDependencies>false</includePluginDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <excludes>
+ <!-- This test just show the shutdown error -->
+ <exclude>**/MinaProducerShutdownTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- allows the special unittest to be ran via 'mvn compile exec:java' -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.camel.component.mina.MinaProducerShutdownManualIT</mainClass>
+ <includePluginDependencies>false</includePluginDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 7ada1fb2731..54add0b8b60 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -81,19 +81,28 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 5da6ac059c2..4c3756f335d 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -119,19 +119,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <io.netty.leakDetection.level>${io.netty.leakDetection.level}</io.netty.leakDetection.level>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>leaks</id>
@@ -140,6 +127,26 @@
<io.netty.leakDetection.level>PARANOID</io.netty.leakDetection.level>
</properties>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <io.netty.leakDetection.level>${io.netty.leakDetection.level}</io.netty.leakDetection.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-observation/pom.xml b/components/camel-observation/pom.xml
index b598ef0f7cb..fe3e54a142c 100644
--- a/components/camel-observation/pom.xml
+++ b/components/camel-observation/pom.xml
@@ -85,42 +85,50 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <excludedGroups>not-parallel</excludedGroups>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
</configuration>
- </execution>
- <execution>
- <id>serials-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <forkCount>4</forkCount>
- <reuseForks>true</reuseForks>
- <groups>not-parallel</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </execution>
- </executions>
-
- </plugin>
- </plugins>
- </build>
-
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludedGroups>not-parallel</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>serials-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
+ <groups>not-parallel</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 4c403561054..0902da12047 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -76,7 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 6c9018d5a19..7a59c0913ab 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -311,17 +311,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>fastinstall</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>skipTests</name>
- </property>
- </activation>
- <properties>
- <invoker.skip>true</invoker.skip>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 0098c92787e..108537fc48a 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -91,7 +91,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/components/camel-opentelemetry/pom.xml b/components/camel-opentelemetry/pom.xml
index 4c2e3c89f15..284c7f172ca 100644
--- a/components/camel-opentelemetry/pom.xml
+++ b/components/camel-opentelemetry/pom.xml
@@ -93,41 +93,50 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <excludedGroups>not-parallel</excludedGroups>
+ <argLine>${camel.surefire.fork.vmargs} -Xmx1024m</argLine>
</configuration>
- </execution>
- <execution>
- <id>serials-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <forkCount>4</forkCount>
- <reuseForks>true</reuseForks>
- <groups>not-parallel</groups>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludedGroups>not-parallel</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>serials-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
+ <groups>not-parallel</groups>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 781fa5dd05e..1f04cf19cc2 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -162,13 +162,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 49a3f8664cc..b1797a1f004 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -91,30 +91,39 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <systemProperties>
- <pulsar.container>apachepulsar/pulsar:${pulsar-version}</pulsar.container>
- </systemProperties>
- <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ <systemProperties>
+ <pulsar.container>apachepulsar/pulsar:${pulsar-version}</pulsar.container>
+ </systemProperties>
+ <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.net=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-robotframework/pom.xml b/components/camel-robotframework/pom.xml
index 168d8336f6b..f9d18243cf3 100644
--- a/components/camel-robotframework/pom.xml
+++ b/components/camel-robotframework/pom.xml
@@ -17,57 +17,61 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-robotframework</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: RobotFramework</name>
- <description>Camel RobotFramework Support</description>
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.robotframework</groupId>
- <artifactId>robotframework</artifactId>
- <version>${robotframework-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython</artifactId>
- <version>${jython-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython-standalone</artifactId>
- <version>${jython-standalone-version}</version>
- </dependency>
+ <artifactId>camel-robotframework</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: RobotFramework</name>
+ <description>Camel RobotFramework Support</description>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.robotframework</groupId>
+ <artifactId>robotframework</artifactId>
+ <version>${robotframework-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <version>${jython-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>${jython-standalone-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
diff --git a/components/camel-rocketmq/pom.xml b/components/camel-rocketmq/pom.xml
index ca1692a8229..23c76230808 100644
--- a/components/camel-rocketmq/pom.xml
+++ b/components/camel-rocketmq/pom.xml
@@ -7,9 +7,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,18 +19,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>camel-rocketmq</artifactId>
<packaging>jar</packaging>
<name>Camel :: RocketMQ</name>
<description>Camel RocketMQ Component</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -46,7 +46,7 @@
<artifactId>rocketmq-acl</artifactId>
<version>${rocketmq-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
@@ -77,15 +77,25 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-rxjava/pom.xml b/components/camel-rxjava/pom.xml
index 51be1e921af..9dc0663b947 100644
--- a/components/camel-rxjava/pom.xml
+++ b/components/camel-rxjava/pom.xml
@@ -73,17 +73,26 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xmx2G ${camel.surefire.fork.vmargs}
- </argLine>
- <forkedProcessTimeoutInSeconds>120</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx2G ${camel.surefire.fork.vmargs}
+ </argLine>
+ <forkedProcessTimeoutInSeconds>120</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 60e1f57ff5a..595bc4c6046 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -253,7 +253,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.8</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml
index 7cb8d399cca..cd80cbe492d 100644
--- a/components/camel-service/pom.xml
+++ b/components/camel-service/pom.xml
@@ -51,18 +51,28 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
index 8081f9ab4bb..6cdea1e802c 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
@@ -229,6 +229,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
@@ -239,20 +240,9 @@
</systemPropertyVariables>
</configuration>
</plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>plugin-itest</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.8</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index c4e57905c96..3dc9b15902e 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -78,12 +78,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -98,4 +92,24 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index 73f0d0ef893..27249c31836 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -82,12 +82,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@@ -102,4 +96,24 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index b819b5fa6d4..5e944f4c845 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -257,9 +257,11 @@
<profiles>
<profile>
- <id>jdk17-build</id>
+ <id>full</id>
<activation>
- <jdk>[17,)</jdk>
+ <property>
+ <name>!quickly</name>
+ </property>
</activation>
<build>
<plugins>
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index 8b27adf5e79..6314994312b 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -286,44 +286,10 @@
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>${platform.skip.tests}</exclude>
- <exclude>**/*IntegrationTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <reuseForks>true</reuseForks>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- <excludes>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- unpack sources which are needed for the scheme generator -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.2</version>
<executions>
<execution>
<id>process-sources</id>
@@ -556,7 +522,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -681,5 +646,49 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>${platform.skip.tests}</exclude>
+ <exclude>**/*IntegrationTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <reuseForks>true</reuseForks>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>${platform.skip.tests}</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index ec5b20770c9..41a1706021b 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -158,16 +158,25 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs} -Dio.undertow.client.https.disableEndpointIdentification=true</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs} -Dio.undertow.client.https.disableEndpointIdentification=true</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index e5b43ebdaf7..3e7c04b6ff6 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -92,20 +92,30 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <!-- Something on the tests generate a lot of bogus output-->
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <!-- Something on the tests generate a lot of bogus output-->
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml
index 58752f5c6e3..e93c60d0c30 100644
--- a/components/camel-zendesk/pom.xml
+++ b/components/camel-zendesk/pom.xml
@@ -61,7 +61,6 @@
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index e3e21fa3d31..abaa1629dd9 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -131,22 +131,32 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index d39afd13029..35adf3759f7 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -194,23 +194,32 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/components/pom.xml b/components/pom.xml
index 56b8b7b701a..77da6aea578 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -336,8 +336,8 @@
<skipTests.s390x />
<skipITs.s390x />
</properties>
-
- <dependencies>
+
+ <dependencies>
<!-- logging for testing -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -352,33 +352,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin-version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>verify</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>${camel.failsafe.forkTimeout}</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.camel</groupId>
@@ -447,10 +420,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- </plugin>
</plugins>
</build>
@@ -472,7 +441,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin-version}</version>
<configuration>
<skipTests>${skipTests.aarch64}</skipTests>
</configuration>
@@ -480,7 +448,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin-version}</version>
<configuration>
<skipITs>${skipITs.aarch64}</skipITs>
</configuration>
@@ -544,6 +511,40 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+ <forkedProcessTimeoutInSeconds>${camel.failsafe.forkTimeout}</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 63bffdf8725..0c372afaea3 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -289,26 +289,39 @@
</excludes>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- skip file stress tests as they are intended to run manually -->
+ <argLine>${camel.surefire.fork.vmargs} -Xmx2G</argLine>
+ <excludes>
+ <exclude>org/apache/camel/component/file/stress/**.java</exclude>
+ <exclude>**/DistributedCompletionIntervalTest.java</exclude>
+ <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
+ <exclude>${platform.skip.tests}</exclude>
+ </excludes>
+ <!-- needed for testing the properties component -->
+ <environmentVariables>
+ <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
+ <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index 78cc7b5909f..027cd06f6a1 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -146,21 +146,6 @@
</plugins>
</reporting>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
- <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>release</id>
@@ -247,5 +232,27 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- needed for testing the properties component -->
+ <environmentVariables>
+ <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
+ <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 265ffb1fc92..dbf6f20183a 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -178,7 +178,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+ "|\\Qwebhookverifytoken\\E"
+ "|\\Qzookeeperpassword\\E"
- // SENSITIVE-PATTERN: END
+ // SENSITIVE-PATTERN: END
;
private SensitiveUtils() {
diff --git a/core/pom.xml b/core/pom.xml
index 8b5ab07ec5f..61051e773d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -106,7 +106,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/docs/pom.xml b/docs/pom.xml
index ef9185c72c5..ac81ec4f60c 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -44,77 +44,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- we want to copy some adoc files from tooling -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-maven-plugin-doc</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/user-manual/modules/ROOT/pages</outputDirectory>
- <resources>
- <resource>
- <directory>../tooling/maven/camel-maven-plugin/src/main/docs</directory>
- </resource>
- <resource>
- <directory>../catalog/camel-report-maven-plugin/src/main/docs</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.12.1</version>
- <executions>
- <execution>
- <id>install node and yarn</id>
- <goals>
- <goal>install-node-and-yarn</goal>
- </goals>
- <configuration>
- <nodeVersion>v16.17.1</nodeVersion>
- <yarnVersion>v1.22.19</yarnVersion>
- </configuration>
- </execution>
- <execution>
- <id>yarn-gulp</id>
- <goals>
- <goal>yarn</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>gulp</arguments>
- <skip>${skipOnUnsupported}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>xref-check</id>
- <goals>
- <goal>xref-check</goal>
- </goals>
- <phase>generate-resources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>x86</id>
@@ -149,6 +78,84 @@
<skipOnUnsupported>false</skipOnUnsupported>
</properties>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!-- we want to copy some adoc files from tooling -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-maven-plugin-doc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/user-manual/modules/ROOT/pages</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../tooling/maven/camel-maven-plugin/src/main/docs</directory>
+ </resource>
+ <resource>
+ <directory>../catalog/camel-report-maven-plugin/src/main/docs</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.12.1</version>
+ <executions>
+ <execution>
+ <id>install node and yarn</id>
+ <goals>
+ <goal>install-node-and-yarn</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>v16.17.1</nodeVersion>
+ <yarnVersion>v1.22.19</yarnVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>yarn-gulp</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <arguments>gulp</arguments>
+ <skip>${skipOnUnsupported}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>xref-check</id>
+ <goals>
+ <goal>xref-check</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/dsl/camel-componentdsl/pom.xml b/dsl/camel-componentdsl/pom.xml
index ccd0cfba20b..70c667f56d1 100644
--- a/dsl/camel-componentdsl/pom.xml
+++ b/dsl/camel-componentdsl/pom.xml
@@ -116,20 +116,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-component-dsl</id>
- <goals>
- <goal>generate-component-dsl</goal>
- <goal>generate-others-list</goal>
- </goals>
- <phase>generate-sources</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -164,11 +150,40 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-component-dsl</id>
+ <goals>
+ <goal>generate-component-dsl</goal>
+ <goal>generate-others-list</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index 0bee47d8ee3..272da97074f 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -130,20 +130,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-endpoint-dsl</id>
- <goals>
- <goal>generate-endpoint-dsl</goal>
- <goal>generate-others-list</goal>
- </goals>
- <phase>generate-sources</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -181,11 +167,39 @@
<maxmem>1024M</maxmem>
</configuration>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-endpoint-dsl</id>
+ <goals>
+ <goal>generate-endpoint-dsl</goal>
+ <goal>generate-others-list</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/dsl/camel-kotlin-dsl/pom.xml b/dsl/camel-kotlin-dsl/pom.xml
index a46b4019184..04ce959ab89 100644
--- a/dsl/camel-kotlin-dsl/pom.xml
+++ b/dsl/camel-kotlin-dsl/pom.xml
@@ -214,15 +214,29 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
index d722e300a20..11080c2083c 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml
@@ -258,7 +258,6 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-yaml-dsl-maven-plugin</artifactId>
- <version>${project.version}</version>
<executions>
<!-- camelCase -->
<execution>
diff --git a/dsl/pom.xml b/dsl/pom.xml
index 5a0bc2153b7..858dac81e23 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -99,7 +99,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/parent/pom.xml b/parent/pom.xml
index 76a121bf7e2..3a652c86eb9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -340,7 +340,6 @@
<maven-plugin-plugin-version>3.9.0</maven-plugin-plugin-version>
<maven-plugin-annotations-version>3.9.0</maven-plugin-annotations-version>
<maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-version>
- <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
<!-- resources plugin needed by Camel maven archetypes -->
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
@@ -3175,107 +3174,8 @@
</execution>
</executions>
</plugin>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>${maven-remote-resources-plugin-version}</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin-version}</version>
- </plugin>
</plugins>
</pluginManagement>
- <plugins>
- <!-- skip site-plugin as we dont use Maven site (inherited from Apache BOM) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <phase />
- </execution>
- </executions>
- </plugin>
- <!-- skip enforcer-plugin to speedup building (inherited from Apache BOM) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven-version</id>
- <phase />
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin-version}</version>
- <configuration>
- <argLine>${camel.surefire.fork.vmargs}</argLine>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <failIfNoTests>false</failIfNoTests>
- <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
- <runOrder>alphabetical</runOrder>
- <!-- lets re-run the failed test one more time, just to be sure -->
- <rerunFailingTestsCount>0</rerunFailingTestsCount>
- <systemPropertyVariables>
- <javax.xml.accessExternalSchema>file,http,https</javax.xml.accessExternalSchema>
- <javax.xml.accessExternalDTD>file,http</javax.xml.accessExternalDTD>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- <java.awt.headless>${java.awt.headless}</java.awt.headless>
- <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties
- </java.util.logging.config.file>
- <org.apache.activemq.default.directory.prefix>target/
- </org.apache.activemq.default.directory.prefix>
- </systemPropertyVariables>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/*IntegrationTest.java</exclude>
- <exclude>**/*XXXTest.*</exclude>
- </excludes>
- <forkCount>${camel.surefire.forkCount}</forkCount>
- <reuseForks>${camel.surefire.reuseForks}</reuseForks>
- <forkedProcessTimeoutInSeconds>${camel.surefire.forkTimeout}</forkedProcessTimeoutInSeconds>
- <properties>
- <configurationParameters>
- junit.jupiter.execution.parallel.enabled = ${camel.surefire.parallel}
- junit.jupiter.execution.parallel.mode.default = same_thread
- junit.jupiter.execution.parallel.mode.classes.default = concurrent
- junit.jupiter.execution.parallel.config.strategy = ${camel.surefire.parallel.strategy}
- junit.jupiter.execution.parallel.config.dynamic.factor = ${camel.surefire.parallel.factor}
- </configurationParameters>
- </properties>
- </configuration>
- </plugin>
- </plugins>
</build>
<reporting>
@@ -3341,11 +3241,7 @@
</property>
</activation>
<properties>
- <skipTests>true</skipTests>
<archetype.test.skip>true</archetype.test.skip>
- <assembly.skipAssembly>true</assembly.skipAssembly>
- <fastinstall>true</fastinstall>
- <noassembly>true</noassembly>
</properties>
</profile>
@@ -3378,7 +3274,7 @@
<executions>
<execution>
<id>format</id>
- <phase />
+ <phase>none</phase>
</execution>
<execution>
<id>validate</id>
@@ -3395,7 +3291,7 @@
<executions>
<execution>
<id>sort-imports</id>
- <phase />
+ <phase>none</phase>
</execution>
<execution>
<id>check</id>
@@ -3503,5 +3399,60 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs}</argLine>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <failIfNoTests>false</failIfNoTests>
+ <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
+ <runOrder>alphabetical</runOrder>
+ <!-- lets re-run the failed test one more time, just to be sure -->
+ <rerunFailingTestsCount>0</rerunFailingTestsCount>
+ <systemPropertyVariables>
+ <javax.xml.accessExternalSchema>file,http,https</javax.xml.accessExternalSchema>
+ <javax.xml.accessExternalDTD>file,http</javax.xml.accessExternalDTD>
+ <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+ <java.awt.headless>${java.awt.headless}</java.awt.headless>
+ <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties
+ </java.util.logging.config.file>
+ <org.apache.activemq.default.directory.prefix>target/
+ </org.apache.activemq.default.directory.prefix>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*IntegrationTest.java</exclude>
+ <exclude>**/*XXXTest.*</exclude>
+ </excludes>
+ <forkCount>${camel.surefire.forkCount}</forkCount>
+ <reuseForks>${camel.surefire.reuseForks}</reuseForks>
+ <forkedProcessTimeoutInSeconds>${camel.surefire.forkTimeout}</forkedProcessTimeoutInSeconds>
+ <properties>
+ <configurationParameters>
+ junit.jupiter.execution.parallel.enabled = ${camel.surefire.parallel}
+ junit.jupiter.execution.parallel.mode.default = same_thread
+ junit.jupiter.execution.parallel.mode.classes.default = concurrent
+ junit.jupiter.execution.parallel.config.strategy = ${camel.surefire.parallel.strategy}
+ junit.jupiter.execution.parallel.config.dynamic.factor = ${camel.surefire.parallel.factor}
+ </configurationParameters>
+ </properties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index d7931e632ca..b2d6b9eba61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <project.build.outputTimestamp>1980-01-01T00:00:02Z</project.build.outputTimestamp>
<maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
@@ -126,7 +126,8 @@
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<java-diff-utils-version>4.7</java-diff-utils-version>
<maven-enforcer-plugin-version>3.3.0</maven-enforcer-plugin-version>
- <maven-dependency-plugin-version>3.5.0</maven-dependency-plugin-version>
+ <maven-dependency-plugin-version>3.6.0</maven-dependency-plugin-version>
+ <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
@@ -200,24 +201,48 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin-version}</version>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>3.5.0</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <phase>none</phase><!-- unbound here to speedup -Dquickly build; bound to a phase in the full profile -->
+ </execution>
+ <execution>
+ <id>enforce-java-version</id>
+ <phase>none</phase><!-- unbound here to speedup -Dquickly build; bound to a phase in the full profile -->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <phase>none</phase><!-- unbound here to speedup -Dquickly build; bound to a phase in the full profile -->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>none</phase><!-- unbound here to speedup -Dquickly build; bound to a phase in the full profile -->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <phase>none</phase><!-- skip to save time -->
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -232,8 +257,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin-version}</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -251,6 +281,31 @@
<downloadJavadocs>false</downloadJavadocs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin-version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -378,17 +433,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-resource-bundles</id>
- <phase>disabled</phase>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
@@ -426,7 +470,9 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>1.8</version>
<configuration>
<skipInstallation>${invoker.skip}</skipInstallation>
<skipInvocation>${invoker.skip}</skipInvocation>
@@ -440,18 +486,6 @@
</build>
<profiles>
- <profile>
- <id>assembly</id>
- <activation>
- <property>
- <name>!noassembly</name>
- </property>
- </activation>
- <modules>
- <module>apache-camel</module>
- </modules>
- </profile>
-
<profile>
<!-- When not on the Mac, we need to add tools.jar to the antrun plugin
for schemagen to work -->
@@ -761,5 +795,50 @@
</repository>
</repositories>
</profile>
+ <profile>
+ <!-- The full profile contains mojos *not* essential for the quick build. -->
+ <!-- These are typically various source checks and code generations whose result is stored in git anyway. -->
+ <!-- Pass -Dquickly to skip these non-essential plugin executions. -->
+ <!-- -Dquickly suits primarily the situation when building from a state that passed all checks on the CI. -->
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.5.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/test-infra/camel-test-infra-arangodb/pom.xml b/test-infra/camel-test-infra-arangodb/pom.xml
index bf03ff9fb79..bc762e10c71 100644
--- a/test-infra/camel-test-infra-arangodb/pom.xml
+++ b/test-infra/camel-test-infra-arangodb/pom.xml
@@ -45,14 +45,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-
</project>
diff --git a/test-infra/camel-test-infra-artemis/pom.xml b/test-infra/camel-test-infra-artemis/pom.xml
index 2f150956689..673ef99c8e2 100644
--- a/test-infra/camel-test-infra-artemis/pom.xml
+++ b/test-infra/camel-test-infra-artemis/pom.xml
@@ -75,13 +75,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-aws-common/pom.xml b/test-infra/camel-test-infra-aws-common/pom.xml
index 25da9a7a179..b9f95044616 100644
--- a/test-infra/camel-test-infra-aws-common/pom.xml
+++ b/test-infra/camel-test-infra-aws-common/pom.xml
@@ -39,13 +39,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/test-infra/camel-test-infra-aws-v2/pom.xml b/test-infra/camel-test-infra-aws-v2/pom.xml
index 372569571f3..9fa1f26385f 100644
--- a/test-infra/camel-test-infra-aws-v2/pom.xml
+++ b/test-infra/camel-test-infra-aws-v2/pom.xml
@@ -136,14 +136,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-
</project>
diff --git a/test-infra/camel-test-infra-azure-common/pom.xml b/test-infra/camel-test-infra-azure-common/pom.xml
index 0d43d2631de..de5f8abfdad 100644
--- a/test-infra/camel-test-infra-azure-common/pom.xml
+++ b/test-infra/camel-test-infra-azure-common/pom.xml
@@ -38,14 +38,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-
</project>
\ No newline at end of file
diff --git a/test-infra/camel-test-infra-azure-storage-blob/pom.xml b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
index 3543639d4f7..545c9f8394b 100644
--- a/test-infra/camel-test-infra-azure-storage-blob/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
@@ -69,13 +69,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
index fb1d2aff674..dc23344caba 100644
--- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
@@ -63,13 +63,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-azure-storage-queue/pom.xml b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
index 7fdff93d624..578c3d0c347 100644
--- a/test-infra/camel-test-infra-azure-storage-queue/pom.xml
+++ b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
@@ -69,13 +69,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-cassandra/pom.xml b/test-infra/camel-test-infra-cassandra/pom.xml
index 36231ea85f2..56854e05ff0 100644
--- a/test-infra/camel-test-infra-cassandra/pom.xml
+++ b/test-infra/camel-test-infra-cassandra/pom.xml
@@ -50,12 +50,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-chatscript/pom.xml b/test-infra/camel-test-infra-chatscript/pom.xml
index cac38abefd9..f576001df87 100644
--- a/test-infra/camel-test-infra-chatscript/pom.xml
+++ b/test-infra/camel-test-infra-chatscript/pom.xml
@@ -45,14 +45,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-
</project>
diff --git a/test-infra/camel-test-infra-common/pom.xml b/test-infra/camel-test-infra-common/pom.xml
index bf13bdd994b..1bed1f290e9 100644
--- a/test-infra/camel-test-infra-common/pom.xml
+++ b/test-infra/camel-test-infra-common/pom.xml
@@ -31,15 +31,6 @@
<name>Camel :: Test Infra :: Common</name>
<description>Common test infrastructure code for Camel</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/test-infra/camel-test-infra-consul/pom.xml b/test-infra/camel-test-infra-consul/pom.xml
index 19f8416415d..af843b64155 100644
--- a/test-infra/camel-test-infra-consul/pom.xml
+++ b/test-infra/camel-test-infra-consul/pom.xml
@@ -51,14 +51,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-couchbase/pom.xml b/test-infra/camel-test-infra-couchbase/pom.xml
index ac1034b25f5..92f0fcedc90 100644
--- a/test-infra/camel-test-infra-couchbase/pom.xml
+++ b/test-infra/camel-test-infra-couchbase/pom.xml
@@ -50,14 +50,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-couchdb/pom.xml b/test-infra/camel-test-infra-couchdb/pom.xml
index a427b3b8149..672dac7798a 100644
--- a/test-infra/camel-test-infra-couchdb/pom.xml
+++ b/test-infra/camel-test-infra-couchdb/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-dispatch-router/pom.xml b/test-infra/camel-test-infra-dispatch-router/pom.xml
index ec5bf9d649b..7f525a68d97 100644
--- a/test-infra/camel-test-infra-dispatch-router/pom.xml
+++ b/test-infra/camel-test-infra-dispatch-router/pom.xml
@@ -52,13 +52,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml b/test-infra/camel-test-infra-elasticsearch/pom.xml
index a6a32dca4b5..69581606dc2 100644
--- a/test-infra/camel-test-infra-elasticsearch/pom.xml
+++ b/test-infra/camel-test-infra-elasticsearch/pom.xml
@@ -50,14 +50,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-etcd3/pom.xml b/test-infra/camel-test-infra-etcd3/pom.xml
index 7b662a81031..a242205d302 100644
--- a/test-infra/camel-test-infra-etcd3/pom.xml
+++ b/test-infra/camel-test-infra-etcd3/pom.xml
@@ -50,14 +50,5 @@
<version>${jetcd-version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-fhir/pom.xml b/test-infra/camel-test-infra-fhir/pom.xml
index 199500db7e4..065d6591a66 100644
--- a/test-infra/camel-test-infra-fhir/pom.xml
+++ b/test-infra/camel-test-infra-fhir/pom.xml
@@ -46,13 +46,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-ftp/pom.xml b/test-infra/camel-test-infra-ftp/pom.xml
index d458c94eea5..e90310e7879 100644
--- a/test-infra/camel-test-infra-ftp/pom.xml
+++ b/test-infra/camel-test-infra-ftp/pom.xml
@@ -64,14 +64,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-google-pubsub/pom.xml b/test-infra/camel-test-infra-google-pubsub/pom.xml
index 52ba6b85037..fc932701d33 100644
--- a/test-infra/camel-test-infra-google-pubsub/pom.xml
+++ b/test-infra/camel-test-infra-google-pubsub/pom.xml
@@ -51,13 +51,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-hashicorp-vault/pom.xml b/test-infra/camel-test-infra-hashicorp-vault/pom.xml
index d526d152fbf..67b1e738f49 100644
--- a/test-infra/camel-test-infra-hashicorp-vault/pom.xml
+++ b/test-infra/camel-test-infra-hashicorp-vault/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-hdfs/pom.xml b/test-infra/camel-test-infra-hdfs/pom.xml
index 816d91be0a8..6cb33deabf0 100644
--- a/test-infra/camel-test-infra-hdfs/pom.xml
+++ b/test-infra/camel-test-infra-hdfs/pom.xml
@@ -74,13 +74,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-ignite/pom.xml b/test-infra/camel-test-infra-ignite/pom.xml
index f4d38bd8ac7..f6b40db7ef0 100644
--- a/test-infra/camel-test-infra-ignite/pom.xml
+++ b/test-infra/camel-test-infra-ignite/pom.xml
@@ -50,13 +50,4 @@
<version>${ignite-version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-infinispan/pom.xml b/test-infra/camel-test-infra-infinispan/pom.xml
index b5f4b2f3524..d4552f2f7e5 100644
--- a/test-infra/camel-test-infra-infinispan/pom.xml
+++ b/test-infra/camel-test-infra-infinispan/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-jdbc/pom.xml b/test-infra/camel-test-infra-jdbc/pom.xml
index c9bc116cfab..57d0ad5c7e6 100644
--- a/test-infra/camel-test-infra-jdbc/pom.xml
+++ b/test-infra/camel-test-infra-jdbc/pom.xml
@@ -50,13 +50,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-jetty/pom.xml b/test-infra/camel-test-infra-jetty/pom.xml
index 3eaee2c7cc2..a72eb830983 100644
--- a/test-infra/camel-test-infra-jetty/pom.xml
+++ b/test-infra/camel-test-infra-jetty/pom.xml
@@ -79,14 +79,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-kafka/pom.xml b/test-infra/camel-test-infra-kafka/pom.xml
index 02b2812bc19..1fc4f4f0ecc 100644
--- a/test-infra/camel-test-infra-kafka/pom.xml
+++ b/test-infra/camel-test-infra-kafka/pom.xml
@@ -56,13 +56,4 @@
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-messaging-common/pom.xml b/test-infra/camel-test-infra-messaging-common/pom.xml
index 73c1ab293aa..6e69102a9b5 100644
--- a/test-infra/camel-test-infra-messaging-common/pom.xml
+++ b/test-infra/camel-test-infra-messaging-common/pom.xml
@@ -51,13 +51,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/test-infra/camel-test-infra-microprofile-lra/pom.xml b/test-infra/camel-test-infra-microprofile-lra/pom.xml
index 81db28ab2d5..f13b21dccce 100644
--- a/test-infra/camel-test-infra-microprofile-lra/pom.xml
+++ b/test-infra/camel-test-infra-microprofile-lra/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-minio/pom.xml b/test-infra/camel-test-infra-minio/pom.xml
index 39bc6b243f6..4cd96d48cec 100644
--- a/test-infra/camel-test-infra-minio/pom.xml
+++ b/test-infra/camel-test-infra-minio/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-mongodb/pom.xml b/test-infra/camel-test-infra-mongodb/pom.xml
index a92b2bc4264..5e6045b7f42 100644
--- a/test-infra/camel-test-infra-mongodb/pom.xml
+++ b/test-infra/camel-test-infra-mongodb/pom.xml
@@ -51,14 +51,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-mosquitto/pom.xml b/test-infra/camel-test-infra-mosquitto/pom.xml
index 37b71d2bbd6..8583931004a 100644
--- a/test-infra/camel-test-infra-mosquitto/pom.xml
+++ b/test-infra/camel-test-infra-mosquitto/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-nats/pom.xml b/test-infra/camel-test-infra-nats/pom.xml
index 7cc1cf7e534..8a645dea7c9 100644
--- a/test-infra/camel-test-infra-nats/pom.xml
+++ b/test-infra/camel-test-infra-nats/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-openldap/pom.xml b/test-infra/camel-test-infra-openldap/pom.xml
index 02c0aaaa528..f483d092832 100644
--- a/test-infra/camel-test-infra-openldap/pom.xml
+++ b/test-infra/camel-test-infra-openldap/pom.xml
@@ -18,39 +18,30 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>camel-test-infra-parent</artifactId>
- <groupId>org.apache.camel</groupId>
- <relativePath>../camel-test-infra-parent/pom.xml</relativePath>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-test-infra-openldap</artifactId>
- <name>Camel :: Test Infra :: Openladp</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-infra-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>${testcontainers-version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <artifactId>camel-test-infra-parent</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <relativePath>../camel-test-infra-parent/pom.xml</relativePath>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-test-infra-openldap</artifactId>
+ <name>Camel :: Test Infra :: Openladp</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>${testcontainers-version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/test-infra/camel-test-infra-postgres/pom.xml b/test-infra/camel-test-infra-postgres/pom.xml
index 2f440eef3bd..e39450f092a 100644
--- a/test-infra/camel-test-infra-postgres/pom.xml
+++ b/test-infra/camel-test-infra-postgres/pom.xml
@@ -51,14 +51,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-pulsar/pom.xml b/test-infra/camel-test-infra-pulsar/pom.xml
index 6f18151158c..1aa3121aa46 100644
--- a/test-infra/camel-test-infra-pulsar/pom.xml
+++ b/test-infra/camel-test-infra-pulsar/pom.xml
@@ -51,14 +51,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-rabbitmq/pom.xml b/test-infra/camel-test-infra-rabbitmq/pom.xml
index 88fdfe13406..84bfc934184 100644
--- a/test-infra/camel-test-infra-rabbitmq/pom.xml
+++ b/test-infra/camel-test-infra-rabbitmq/pom.xml
@@ -50,13 +50,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-redis/pom.xml b/test-infra/camel-test-infra-redis/pom.xml
index 5d8dcebf608..3bd1dc748a5 100644
--- a/test-infra/camel-test-infra-redis/pom.xml
+++ b/test-infra/camel-test-infra-redis/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-xmpp/pom.xml b/test-infra/camel-test-infra-xmpp/pom.xml
index c19b744c211..2bd6bde5c55 100644
--- a/test-infra/camel-test-infra-xmpp/pom.xml
+++ b/test-infra/camel-test-infra-xmpp/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/test-infra/camel-test-infra-zookeeper/pom.xml b/test-infra/camel-test-infra-zookeeper/pom.xml
index ee21fd01ac5..dbca6bb8375 100644
--- a/test-infra/camel-test-infra-zookeeper/pom.xml
+++ b/test-infra/camel-test-infra-zookeeper/pom.xml
@@ -45,14 +45,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 25a15e2b974..aafa8033dd2 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -402,18 +402,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- </systemPropertyVariables>
- <excludes>
- <!-- exclude doc tests as they dont work on CI server -->
- <exclude>**/*DocumentationTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
@@ -449,4 +437,30 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+ </systemPropertyVariables>
+ <excludes>
+ <!-- exclude doc tests as they dont work on CI server -->
+ <exclude>**/*DocumentationTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index 299ff520f60..4610b104baf 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -105,7 +105,7 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -166,16 +166,28 @@
</plugin>
</plugins>
</pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens java.base/java.io=ALL-UNNAMED --add-opens
- java.base/java.lang=ALL-UNNAMED
- </argLine>
- </configuration>
- </plugin>
- </plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-opens java.base/java.io=ALL-UNNAMED --add-opens
+ java.base/java.lang=ALL-UNNAMED
+ </argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml
index a5437dd3097..4f2ee24764a 100644
--- a/tooling/maven/camel-maven-plugin/pom.xml
+++ b/tooling/maven/camel-maven-plugin/pom.xml
@@ -105,18 +105,28 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <mojoDependencies>
- <dep>org.codehaus.mojo:exec-maven-plugin</dep>
- <dep>org.apache.maven:maven-plugin-api</dep>
- </mojoDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <mojoDependencies>
+ <dep>org.codehaus.mojo:exec-maven-plugin</dep>
+ <dep>org.apache.maven:maven-plugin-api</dep>
+ </mojoDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 718f94d3fbe..7009dfbe106 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -211,7 +211,12 @@
<profiles>
<profile>
- <id>plugin-itest</id>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 783328ce7fe..efced93f41c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -135,49 +135,49 @@ public class PrepareCatalogMojo extends AbstractMojo {
/**
* The components directory where all the Apache Camel components are
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../components")
+ @Parameter(defaultValue = "${project.basedir}/../../components")
protected File componentsDir;
/**
* The camel-core directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/")
+ @Parameter(defaultValue = "${project.basedir}/../../core/")
protected File coreDir;
/**
* The camel-model directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-model")
+ @Parameter(defaultValue = "${project.basedir}/../../core/camel-core-model")
protected File modelDir;
/**
* The DSL directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../dsl/")
+ @Parameter(defaultValue = "${project.basedir}/../../dsl")
protected File dslDir;
/**
* The camel-core-languages directory
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-languages")
+ @Parameter(defaultValue = "${project.basedir}/../../core/camel-core-languages")
protected File languagesDir;
/**
* The directory where the camel-spring XML models are
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../components/camel-spring-xml")
+ @Parameter(defaultValue = "${project.basedir}/../../components/camel-spring-xml")
protected File springDir;
/**
* The directory where the camel-spring XML schema are
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../components/camel-spring-xml/target/schema")
+ @Parameter(defaultValue = "${project.basedir}/../../components/camel-spring-xml/target/schema")
protected File springSchemaDir;
/**
* The directory where the camel-main metadata are
*/
- @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-main/target/classes/META-INF")
+ @Parameter(defaultValue = "${project.basedir}/../../core/camel-main/target/classes/META-INF")
protected File mainDir;
/**
@@ -1195,7 +1195,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
private Path getModule(Path p) {
Path parent = p;
- while (!parent.endsWith("target")) {
+ while (!parent.endsWith("target") && !parent.endsWith("src")) {
parent = parent.getParent();
}
return parent.getParent();
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index 784af502542..61b7ee1bc17 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -93,58 +93,53 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <goals>
- <goal>clean</goal>
- <goal>verify</goal>
- </goals>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
- <id>fastinstall</id>
+ <id>full</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
- <name>skipTests</name>
+ <name>!quickly</name>
</property>
</activation>
- <properties>
- <invoker.skip>true</invoker.skip>
- </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <goals>
+ <goal>clean</goal>
+ <goal>verify</goal>
+ </goals>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 4556d103807..481371a154e 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -68,7 +68,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- </plugins>
</build>
</project>
[camel] 18/18: Adapt CI scripts to new fast profile and the fact that source formatting happens during the default build
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a3b58b09816e3aa73fe387012cd57d7bbdbe67e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 14:38:45 2023 +0200
Adapt CI scripts to new fast profile and the fact that source formatting happens during the default build
---
.github/actions/component-test/component-test.sh | 2 +-
.github/actions/incremental-build/action.yaml | 2 +-
.../actions/incremental-build/incremental-build.sh | 19 +++----
.github/pull_request_template.md | 8 +--
.github/workflows/alternative-os-build-main.yml | 6 ++-
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-build-main.yml | 60 ++--------------------
.github/workflows/push-build-main.yml | 2 +-
8 files changed, 24 insertions(+), 77 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh b/.github/actions/component-test/component-test.sh
index e591505702b..68efe60e73a 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -43,7 +43,7 @@ function main() {
if [[ ${fastBuild} = "true" ]] ; then
echo "Launching a fast build against the projects ${pl} and their dependencies"
- $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -am
+ $mavenBinary -l $log $MVND_OPTS -Dquickly install -pl "$pl" -am
else
echo "Launching tests of the projects ${pl}"
$mavenBinary -l $log $MVND_OPTS install -pl "$pl"
diff --git a/.github/actions/incremental-build/action.yaml b/.github/actions/incremental-build/action.yaml
index 99e941d2da7..8a001774371 100644
--- a/.github/actions/incremental-build/action.yaml
+++ b/.github/actions/incremental-build/action.yaml
@@ -19,7 +19,7 @@ name: "Incremental Build Runner"
description: "Build only affected projects"
inputs:
mode:
- description: 'The mode to launch, it can be build, checkstyle or test'
+ description: 'The mode to launch, it can be build or test'
required: true
pr-id:
description: 'Id of the pull request'
diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh
index c76d04b6969..0b64fcd62ce 100755
--- a/.github/actions/incremental-build/incremental-build.sh
+++ b/.github/actions/incremental-build/incremental-build.sh
@@ -75,15 +75,7 @@ function main() {
fi
pl="${pl:1}"
- if [[ ${mode} = "checkstyle" ]] ; then
- if [[ ${buildAll} = "true" ]] ; then
- echo "Launching checkstyle command against all projects"
- $mavenBinary -l $log $MVND_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle
- else
- echo "Launching checkstyle command against the projects ${pl}"
- $mavenBinary -l $log $MVND_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle -pl "$pl"
- fi
- elif [[ ${mode} = "build" ]] ; then
+ if [[ ${mode} = "build" ]] ; then
local mustBuildAll
mustBuildAll=$(hasLabel ${prId} "build-all")
if [[ ${mustBuildAll} = "1" ]] ; then
@@ -91,8 +83,8 @@ function main() {
buildAll=true
fi
if [[ ${buildAll} = "true" ]] ; then
- echo "Launching fast build command against all projects"
- $mavenBinary -l $log $MVND_OPTS -Pfastinstall install
+ echo "Building all projects"
+ $mavenBinary -l $log $MVND_OPTS -DskipTests install
else
local buildDependents
buildDependents=$(hasLabel ${prId} "build-dependents")
@@ -105,12 +97,13 @@ function main() {
fi
if [[ ${totalTestableProjects} -gt ${maxNumberOfTestableProjects} ]] ; then
echo "Launching fast build command against the projects ${pl}, their dependencies and the projects that depend on them"
- $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -amd -am
+ $mavenBinary -l $log $MVND_OPTS -DskipTests install -pl "$pl" -amd -am
else
echo "Launching fast build command against the projects ${pl} and their dependencies"
- $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -am
+ $mavenBinary -l $log $MVND_OPTS -DskipTests install -pl "$pl" -am
fi
fi
+ [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
else
local mustSkipTests
mustSkipTests=$(hasLabel ${prId} "skip-tests")
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e057a589e7c..0344f0a1136 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,14 +19,14 @@
- [ ] I checked that each commit in the pull request has a meaningful subject line and body.
-<!--
+<!--
If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue.
-->
-- [ ] I formatted the code using `mvn -Pformat,fastinstall install && mvn -Psourcecheck`
+- [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes
-<!--
-You can run the aforementioned command in your module so that the build auto-formats your code and the source check verifies that is complies with our coding style. This will also be verified as part of the checks and your PR may be rejected if the checkstyle does not pass.
+<!--
+You can run the aforementioned command in your module so that the build auto-formats your code. This will also be verified as part of the checks and your PR may be rejected if if there are uncommited changes after running `mvn clean install -DskipTests`.
You can learn more about the contribution guidelines at https://github.com/apache/camel/blob/main/CONTRIBUTING.md
-->
diff --git a/.github/workflows/alternative-os-build-main.yml b/.github/workflows/alternative-os-build-main.yml
index ab26d7f7367..0dbc7c25b42 100644
--- a/.github/workflows/alternative-os-build-main.yml
+++ b/.github/workflows/alternative-os-build-main.yml
@@ -46,7 +46,7 @@ jobs:
java-version: 17
cache: 'maven'
- name: mvn sourcecheck ${{ matrix.os }}
- run: ./mvnw -B -V -D'http.keepAlive=false' -l build.log -D'maven.wagon.http.pool=false' -D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress -P'format,fastinstall' -DskipTests verify
+ run: ./mvnw -B -V -D'http.keepAlive=false' -l build.log -D'maven.wagon.http.pool=false' -D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress -DskipTests verify
- name: Archive logs ${{ matrix.os }}
uses: actions/upload-artifact@v3
if: always()
@@ -54,3 +54,7 @@ jobs:
name: build-${{ matrix.os }}
path: build.log
retention-days: 2
+ - name: Fail if there are uncommitted changes
+ shell: bash
+ run: |
+ [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
index 49b9201d3eb..da441ca2a3d 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -48,7 +48,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn build and sbom generation
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Psbom,fastinstall -DskipTests verify
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Psbom -Dquickly verify
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 0db23f12425..53bd23546d2 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -29,39 +29,6 @@ on:
- NOTICE.txt
jobs:
- checkstyle:
- if: github.repository == 'apache/camel'
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- with:
- persist-credentials: false
- - id: install-mvnd
- uses: ./.github/actions/install-mvnd
- - name: Set up JDK
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: 17
- cache: 'maven'
- - name: mvn checkstyle
- run: ./mvnw -l checkstyle.log $MVND_OPTS -e checkstyle:checkstyle
- - name: archive logs
- uses: actions/upload-artifact@v3
- if: always()
- with:
- name: checkstyle.log
- path: checkstyle.log
- - name: Generate failure checkstyle summary
- if: failure()
- run: |
- echo ":x: Checkstyle failed" >> $GITHUB_STEP_SUMMARY
- echo "" >> $GITHUB_STEP_SUMMARY
- - name: Generate successful checkstyle summary
- if: success()
- run: |
- echo ":white_check_mark: Checkstyle passed" >> $GITHUB_STEP_SUMMARY
- echo "" >> $GITHUB_STEP_SUMMARY
build:
if: github.repository == 'apache/camel'
permissions:
@@ -86,13 +53,17 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- run: ./mvnw -l build.log $MVND_OPTS -Pfastinstall -DskipTests install
+ run: ./mvnw -l build.log $MVND_OPTS -DskipTests install
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
with:
name: build.log
path: build.log
+ - name: Fail if there are uncommitted changes
+ shell: bash
+ run: |
+ [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
- id: test
name: Quick test execution for affected components
uses: ./.github/actions/quick-test
@@ -100,27 +71,6 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
start-commit: ${{ github.event.pull_request.base.sha }}
end-commit: ${{ github.event.after }}
- incremental-checkstyle:
- if: github.repository == 'apache/camel'
- # Mark as optional since it is experimental
- continue-on-error: true
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- with:
- persist-credentials: false
- - name: Set up JDK
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: 17
- cache: 'maven'
- - name: mvn checkstyle
- uses: ./.github/actions/incremental-build
- with:
- mode: checkstyle
- log: incremental-checkstyle.log
- pr-id: ${{ github.event.number }}
incremental-build:
if: github.repository == 'apache/camel'
# Mark as optional since it is experimental
diff --git a/.github/workflows/push-build-main.yml b/.github/workflows/push-build-main.yml
index 770a758921b..ad4e8bbde4e 100644
--- a/.github/workflows/push-build-main.yml
+++ b/.github/workflows/push-build-main.yml
@@ -54,7 +54,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn formatter and build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pformat,fastinstall -DskipTests verify
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -DskipTests package
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
[camel] 03/18: Build with compiler.fork=false by default
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a1f5a26682b82499f789ef7e90e2cd8c28462c0b
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 22:12:14 2023 +0200
Build with compiler.fork=false by default
---
camel-dependencies/pom.xml | 1 -
parent/pom.xml | 2 --
pom.xml | 1 -
3 files changed, 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 7d82a7e0fb6..29032c87b21 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -39,7 +39,6 @@
<!-- sync properties here from parent/pom.xml -->
<properties>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
- <compiler.fork>true</compiler.fork>
<cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs />
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
diff --git a/parent/pom.xml b/parent/pom.xml
index d8abe6c309c..e201dff0a42 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,6 @@
<properties>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
- <compiler.fork>true</compiler.fork>
<cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs />
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
@@ -2961,7 +2960,6 @@
<configuration>
<release>${jdk.version}</release>
<maxmem>512M</maxmem>
- <fork>${compiler.fork}</fork>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<compilerArgs>
diff --git a/pom.xml b/pom.xml
index 440a1350c03..d7931e632ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,6 @@
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
<jdk.version>17</jdk.version>
- <compiler.fork>false</compiler.fork>
<!-- These two are here only to prevent the versions for the Apache parent pom from leaking-->
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
[camel] 15/18: CAMEL-19461 - Make Cassandra tests aware of license headers in .cql files
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a82031306d540630b96b9ee52da63487bd78ac4
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 22 22:31:34 2023 +0200
CAMEL-19461 - Make Cassandra tests aware of license headers in .cql
files
---
.../camel/component/cassandra/integration/BaseCassandra.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/BaseCassandra.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/BaseCassandra.java
index ec8f76b9e4c..7132a731f8d 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/BaseCassandra.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/BaseCassandra.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cassandra.integration;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.nio.file.Paths;
import java.time.Duration;
import com.datastax.oss.driver.api.core.CqlSession;
@@ -31,11 +32,11 @@ import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.camel.test.infra.core.api.CamelTestSupportHelper;
import org.apache.camel.test.infra.core.api.ConfigurableRoute;
+import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
public abstract class BaseCassandra implements ConfigurableRoute, CamelTestSupportHelper {
@@ -68,10 +69,10 @@ public abstract class BaseCassandra implements ConfigurableRoute, CamelTestSuppo
}
public void executeScript(String pathToScript) throws IOException {
- String s = IOUtils.toString(getClass().getResourceAsStream("/" + pathToScript), "UTF-8");
+ String s = IOHelper.stripLineComments(Paths.get("src/test/resources/" + pathToScript), "--", true);
String[] statements = s.split(";");
for (int i = 0; i < statements.length; i++) {
- if (!statements[i].isEmpty()) {
+ if (!statements[i].isBlank()) {
executeCql(statements[i]);
}
}
[camel] 17/18: Workaround INFRA-24713 in the deploy script rather than for all possible builds
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 576e47727626a0ae635a64454054ed65a738ec2a
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 13:56:43 2023 +0200
Workaround INFRA-24713 in the deploy script rather than for all possible builds
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
Jenkinsfile.deploy | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 70f4f50fc39..3c6fda8c6e4 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index d30ac9c0965..376a5ba63a7 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -66,6 +66,10 @@ pipeline {
}
}
steps {
+ // Workaround https://issues.apache.org/jira/browse/INFRA-24713
+ def text = readFile ".mvn/wrapper/maven-wrapper.properties"
+ text.replaceAll("distributionUrl=.*", "https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip")
+
sh "./mvnw $MAVEN_PARAMS -Pdeploy,apache-snapshots -Dmaven.test.skip.exec=true clean deploy"
}
}