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:43 UTC

[camel] 02/18: CAMEL-19461 - Remove Checkstyle

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="^&lt;\?xml.*&gt;\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() {