From 8c25e9c22ceda7cfaf01c76142dc4d168132c1ee Mon Sep 17 00:00:00 2001
From: Gareth Healy <garethahealy@gmail.com>
Date: Thu, 7 Sep 2017 19:40:48 +0100
Subject: [PATCH] Updated checkstyle rules (#510)

---
 .../camel-checkstyle-suppressions.xml         |  70 ----
 .../src/main/resources/camel-checkstyle.xml   | 361 -----------------
 .../resources/checkstyle-suppressions.xml     |  45 +++
 .../src/main/resources/loose-checkstyle.xml   |  56 +++
 .../src/main/resources/strict-checkstyle.xml  | 211 ++++++++++
 .../resources/upstream-camel-checkstyle.xml   | 367 ------------------
 core/pom.xml                                  |   7 +-
 plugins-parent/pom.xml                        |  19 +-
 .../dozermapper/protobuf/util/ProtoUtils.java |  44 +--
 9 files changed, 353 insertions(+), 827 deletions(-)
 delete mode 100644 building-tools/src/main/resources/camel-checkstyle-suppressions.xml
 delete mode 100644 building-tools/src/main/resources/camel-checkstyle.xml
 create mode 100644 building-tools/src/main/resources/checkstyle-suppressions.xml
 create mode 100644 building-tools/src/main/resources/loose-checkstyle.xml
 create mode 100644 building-tools/src/main/resources/strict-checkstyle.xml
 delete mode 100644 building-tools/src/main/resources/upstream-camel-checkstyle.xml

diff --git a/building-tools/src/main/resources/camel-checkstyle-suppressions.xml b/building-tools/src/main/resources/camel-checkstyle-suppressions.xml
deleted file mode 100644
index eec46582f..000000000
--- a/building-tools/src/main/resources/camel-checkstyle-suppressions.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Copyright 2005-2017 Dozer Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-<!--
-  Licensed to the Apache 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.
--->
-<suppressions>
-    <suppress checks=".*"
-              files=".+[\\\/]generated[\\\/].+\.java"/>
-
-    <suppress checks=".*"
-              files=".+[\\\/]build[\\\/]src[\\\/].+\.java"/>
-
-    <suppress checks=".*"
-              files=".+[\\\/]target[\\\/].+\.java"/>
-
-    <suppress checks=".*"
-              files=".+[\\\/]contrib[\\\/].+\.java"/>
-
-    <suppress checks=".*"
-              files=".+[\\\/]proto[\\\/]ProtoTestObjects.java"/>
-
-    <suppress checks=".*"
-              files=".+[\\\/]mockito[\\\/].+\.java"/>
-
-    <suppress checks="JavadocMethod"
-              files=".+[\\\/]test[\\\/].+\.java"/>
-
-    <suppress checks="JavadocType"
-              files=".+[\\\/]test[\\\/].+\.java"/>
-
-    <suppress checks="JavadocVariable"
-              files=".+[\\\/]test[\\\/].+\.java"/>
-
-    <suppress checks="JavadocPackage"
-              files=".+[\\\/]test[\\\/].+\.java"/>
-</suppressions>
diff --git a/building-tools/src/main/resources/camel-checkstyle.xml b/building-tools/src/main/resources/camel-checkstyle.xml
deleted file mode 100644
index 85271f73d..000000000
--- a/building-tools/src/main/resources/camel-checkstyle.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2005-2017 Dozer Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<!--
-  Licensed to the Apache 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.
--->
-<!--
-Checks to make sure the code meets the ActiveMQ coding guidelines which
-
-It also enforces a bunch of other "BestPractices like method
-lengths, if/try depths, etc...
--->
-
-<module name="Checker">
-    <!-- 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="StrictDuplicateCode"/>-->
-
-    <!-- Header checks
-    <module name="Header">
-        <property name="header"
-                  value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the &quot;License&quot;); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an &quot;AS IS&quot; 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"/>
-    </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="3600"/>
-    </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="TreeWalker">
-
-        <!-- 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="LocalVariableName"/>
-
-
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-
-
-        <!-- <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"/>
-        </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,javax,org.w3c,org.xml,junit"/>
-            <property name="ordered" 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="MethodLength">
-            <property name="max" value="200"/>
-            <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="TypecastParenPad"/>
-
-
-        
-
-
-
-
-
-        <!--
-        <module name="GenericWhitespace"/>
-         -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- 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="25"/>
-        </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="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="TodoComment">
-            <property name="format" value="WARNING"/>
-        </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="RequiredRegexp">-->
-    </module>
-    <module name="SuppressionCommentFilter"/>
-</module>
diff --git a/building-tools/src/main/resources/checkstyle-suppressions.xml b/building-tools/src/main/resources/checkstyle-suppressions.xml
new file mode 100644
index 000000000..46271d323
--- /dev/null
+++ b/building-tools/src/main/resources/checkstyle-suppressions.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+
+    Copyright 2005-2017 Dozer Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!DOCTYPE suppressions PUBLIC
+        "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+        "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+    <suppress checks=".*" files=".+[\\\/]target[\\\/].+\.java"/>
+    <suppress checks=".*" files=".+[\\\/]proto[\\\/]ProtoTestObjects.java"/>
+    <suppress checks=".*" files=".+[\\\/]mockito[\\\/].+\.java"/>
+
+    <!-- Disable javadoc for tests -->
+    <suppress checks="JavadocMethod" files=".+[\\\/]test[\\\/].+\.java"/>
+    <suppress checks="JavadocType" files=".+[\\\/]test[\\\/].+\.java"/>
+    <suppress checks="JavadocVariable" files=".+[\\\/]test[\\\/].+\.java"/>
+    <suppress checks="JavadocPackage" files=".+[\\\/]test[\\\/].+\.java"/>
+
+    <!-- Disable javadoc for OSGi test model -->
+    <suppress checks="JavadocMethod" files=".+[\\\/]osgitestsmodel[\\\/].+\.java"/>
+    <suppress checks="JavadocType" files=".+[\\\/]osgitestsmodel[\\\/].+\.java"/>
+    <suppress checks="JavadocVariable" files=".+[\\\/]osgitestsmodel[\\\/].+\.java"/>
+    <suppress checks="JavadocPackage" files=".+[\\\/]osgitestsmodel[\\\/].+\.java"/>
+
+    <!-- Disable javadoc for JMH tests -->
+    <suppress checks="JavadocMethod" files=".+[\\\/]jmh[\\\/].+\.java"/>
+    <suppress checks="JavadocType" files=".+[\\\/]jmh[\\\/].+\.java"/>
+    <suppress checks="JavadocVariable" files=".+[\\\/]jmh[\\\/].+\.java"/>
+    <suppress checks="JavadocPackage" files=".+[\\\/]jmh[\\\/].+\.java"/>
+</suppressions>
diff --git a/building-tools/src/main/resources/loose-checkstyle.xml b/building-tools/src/main/resources/loose-checkstyle.xml
new file mode 100644
index 000000000..3ff475803
--- /dev/null
+++ b/building-tools/src/main/resources/loose-checkstyle.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005-2017 Dozer Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- See http://checkstyle.sourceforge.net/checks.html for documentation on available checks -->
+<module name="Checker">
+    <!-- Checks to see if a file contains a tab character. -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <module name="TreeWalker">
+
+        <!-- Checks for imports -->
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <!-- Modifier Checks -->
+        <module name="ModifierOrder"/>
+
+        <!-- Checks for common coding problems -->
+        <module name="EmptyStatement"/>
+        <!-- Checks for illegal instantiations where a factory method is preferred. -->
+        <module name="IllegalInstantiation"/>
+
+        <!-- Checks that long constants are defined with an upper ell. -->
+        <module name="UpperEll"/>
+        <!-- This check makes sure that all package annotations are in the package-info.java file. -->
+        <module name="PackageAnnotation"/>
+        <!-- Checks that if a class defines a covariant method equals, then it defines method equals(java.lang.Object). -->
+        <module name="CovariantEquals"/>
+
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="junit.framework"/>
+        </module>
+    </module>
+</module>
diff --git a/building-tools/src/main/resources/strict-checkstyle.xml b/building-tools/src/main/resources/strict-checkstyle.xml
new file mode 100644
index 000000000..8d9724629
--- /dev/null
+++ b/building-tools/src/main/resources/strict-checkstyle.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005-2017 Dozer Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- See http://checkstyle.sourceforge.net/checks.html for documentation on available checks -->
+<module name="Checker">
+    <!-- Checks to see if a file contains a tab character. -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <!-- Checks for trailing whitespace. -->
+    <module name="RegexpSingleline">
+        <!-- \s matches whitespace character, $ matches end of line. -->
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
+
+    <module name="FileLength"/>
+    <module name="JavadocPackage"/>
+
+    <module name="TreeWalker">
+
+        <!-- Checks for Javadoc comments. -->
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="validateThrows" value="true"/>
+        </module>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable">
+            <property name="scope" value="public"/>
+        </module>
+        <module name="JavadocStyle">
+            <property name="checkFirstSentence" value="false"/>
+            <property name="checkEmptyJavadoc" value="true"/>
+        </module>
+
+        <!-- Checks for Naming Conventions. -->
+        <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"/>
+
+        <!-- Checks for imports -->
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="java,javax,org.w3c,org.xml"/>
+            <property name="ordered" value="true"/>
+        </module>
+
+        <!-- Modifier Checks -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+        <!-- Checks for Size Violations. -->
+        <module name="AnonInnerLength">
+            <property name="max" value="200"/>
+        </module>
+        <module name="ExecutableStatementCount">
+            <property name="max" value="100"/>
+        </module>
+        <module name="LineLength">
+            <property name="max" value="200"/>
+        </module>
+        <module name="MethodLength">
+            <property name="max" value="200"/>
+            <property name="countEmpty" value="false"/>
+        </module>
+
+        <!-- Checks for common coding problems -->
+        <module name="EmptyStatement"/>
+
+        <!-- Checks that classes that override equals() also override hashCode(). -->
+        <module name="EqualsHashCode"/>
+
+        <!-- Checks for illegal instantiations where a factory method is preferred. -->
+        <module name="IllegalInstantiation"/>
+
+        <!-- Checks that long constants are defined with an upper ell. -->
+        <module name="UpperEll"/>
+
+        <!-- This check makes sure that all package annotations are in the package-info.java file. -->
+        <module name="PackageAnnotation"/>
+
+        <!-- Checks that if a class defines a covariant method equals, then it defines method equals(java.lang.Object). -->
+        <module name="CovariantEquals"/>
+
+        <!-- Checks the style of array type definitions. -->
+        <module name="ArrayTypeStyle"/>
+
+        <!-- Make sure left curly braces are on the same line. -->
+        <module name="LeftCurly">
+            <property name="maxLineLength" value="100"/>
+        </module>
+
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+        </module>
+
+        <module name="NeedBraces"/>
+
+        <!-- Checks that there is no whitespace after certain tokens; e.g. "." and "!". -->
+        <module name="NoWhitespaceAfter"/>
+
+        <!-- Checks that there is no whitespace before certain tokens; e.g. "++" and ";". -->
+        <module name="NoWhitespaceBefore"/>
+
+        <!-- Checks that most tokens are surrounded by whitespace. RCURLY is omitted so we can do stuff like "new Thread(){...}.start()". -->
+        <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_EXTENSION_AND"/>
+        </module>
+
+        <!-- Ensure there is no space between the identifier of a method definition, constructor definition, method call, or constructor invocation and the left parenthesis of the parameter list. -->
+        <module name="MethodParamPad"/>
+
+        <module name="EmptyForIteratorPad"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+
+        <!-- Ensure proper indentation. -->
+        <module name="Indentation"/>
+
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="junit.framework"/>
+        </module>
+
+        <module name="WriteTag">
+            <property name="tag" value="@author"/>
+            <property name="tagSeverity" value="error"/>
+            <property name="severity" value="ignore"/>
+        </module>
+
+        <module name="MissingSwitchDefault"/>
+        <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="SuperFinalize"/>
+
+        <module name="IllegalThrows">
+            <property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
+        </module>
+
+        <module name="PackageDeclaration"/>
+        <module name="ReturnCount">
+            <property name="max" value="10"/>
+        </module>
+
+        <module name="DeclarationOrder"/>
+        <module name="ExplicitInitialization"/>
+
+        <module name="BooleanExpressionComplexity"/>
+        <module name="DefaultComesLast"/>
+        <module name="FallThrough"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="UnnecessaryParentheses"/>
+
+        <!-- Checks for class design -->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+
+        <module name="MutableException">
+            <property name="format" value="^.*Exception$"/>
+        </module>
+        <module name="ThrowsCount">
+            <property name="max" value="5"/>
+        </module>
+
+        <!-- Sevntu checks, http://sevntu-checkstyle.github.io/sevntu.checkstyle/ -->
+        <module name="DiamondOperatorForVariableDefinition"/>
+        <module name="RequiredParameterForAnnotation">
+            <property name="annotationName" value="Parameterized.Parameters"/>
+            <property name="requiredParameters" value="name"/>
+        </module>
+
+    </module>
+</module>
diff --git a/building-tools/src/main/resources/upstream-camel-checkstyle.xml b/building-tools/src/main/resources/upstream-camel-checkstyle.xml
deleted file mode 100644
index cada29542..000000000
--- a/building-tools/src/main/resources/upstream-camel-checkstyle.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2005-2017 Dozer Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<!--
-  Licensed to the Apache 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.
--->
-<!--
-Checks to make sure the code meets the ActiveMQ coding guidelines which
-
-It also enforces a bunch of other "BestPractices like method
-lengths, if/try depths, etc...
--->
-
-<module name="Checker">
-    <!-- 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="StrictDuplicateCode"/>-->
-
-    <!-- Header checks
-    <module name="Header">
-        <property name="header"
-                  value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the &quot;License&quot;); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an &quot;AS IS&quot; 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"/>
-    </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="3600"/>
-    </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="JavadocPackage"/>
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <!--
-        <module name="PackageHtml"/>
-        -->
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="validateThrows" value="true"/>
-        </module>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable">
-            <property name="scope" value="public"/>
-        </module>
-        <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"/>
-        </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,javax,org.w3c,org.xml,junit"/>
-            <property name="ordered" 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="100"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="200"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-            <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_EXTENSION_AND"/>
-            <!-- <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, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
-        </module>
-
-        <!--
-        <module name="GenericWhitespace"/>
-         -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- 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="25"/>
-        </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="TodoComment">
-            <property name="format" value="WARNING"/>
-        </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="caseIndent" value="0"/>
-        </module>
-        <!--<module name="RequiredRegexp">-->
-    </module>
-    <module name="SuppressionCommentFilter"/>
-</module>
diff --git a/core/pom.xml b/core/pom.xml
index 8aadbd7b2..4485c3163 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -190,6 +190,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <inherited>false</inherited>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.dozermapper</groupId>
@@ -202,9 +203,9 @@
                     <execution>
                         <id>validate</id>
                         <phase>validate</phase>
-                        <configuration>
-                            <configLocation>camel-checkstyle.xml</configLocation>
-                            <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
+                        <configuration combine.self="override">
+                            <configLocation>loose-checkstyle.xml</configLocation>
+                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
                             <consoleOutput>true</consoleOutput>
                             <failOnViolation>true</failOnViolation>
                             <failsOnError>true</failsOnError>
diff --git a/plugins-parent/pom.xml b/plugins-parent/pom.xml
index 9c2d38ef3..d4a6eb809 100644
--- a/plugins-parent/pom.xml
+++ b/plugins-parent/pom.xml
@@ -352,23 +352,34 @@
                 <dependencies>
                     <dependency>
                         <groupId>com.github.dozermapper</groupId>
-                        <artifactId>building-tools</artifactId>
+                        <artifactId>dozer-building-tools</artifactId>
                         <version>${building-tools.version}</version>
                         <scope>compile</scope>
                     </dependency>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>8.0</version>
+                        <scope>compile</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.github.sevntu-checkstyle</groupId>
+                        <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
+                        <version>1.24.2</version>
+                        <scope>compile</scope>
+                    </dependency>
                 </dependencies>
                 <executions>
                     <execution>
                         <id>validate</id>
                         <phase>validate</phase>
                         <configuration>
-                            <configLocation>upstream-camel-checkstyle.xml</configLocation>
-                            <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
+                            <configLocation>strict-checkstyle.xml</configLocation>
+                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
                             <consoleOutput>true</consoleOutput>
                             <failOnViolation>true</failOnViolation>
                             <failsOnError>true</failsOnError>
                             <encoding>UTF-8</encoding>
-                            <sourceDirectory>${basedir}/src</sourceDirectory>
                         </configuration>
                         <goals>
                             <goal>check</goal>
diff --git a/proto/src/main/java/com/github/dozermapper/protobuf/util/ProtoUtils.java b/proto/src/main/java/com/github/dozermapper/protobuf/util/ProtoUtils.java
index 76a922327..8649e0ba6 100644
--- a/proto/src/main/java/com/github/dozermapper/protobuf/util/ProtoUtils.java
+++ b/proto/src/main/java/com/github/dozermapper/protobuf/util/ProtoUtils.java
@@ -191,28 +191,28 @@ public static Class<?> getJavaGenericClassForCollection(final Descriptors.FieldD
 
     private static Class<?> getJavaClassIgnoreRepeated(final Descriptors.FieldDescriptor descriptor, BeanContainer beanContainer) {
         switch (descriptor.getJavaType()) {
-        case INT:
-            return Integer.class;
-        case LONG:
-            return Long.class;
-        case FLOAT:
-            return Float.class;
-        case DOUBLE:
-            return Double.class;
-        case BOOLEAN:
-            return Boolean.class;
-        case STRING:
-            return String.class;
-        case BYTE_STRING:
-            return ByteString.class;
-        //code duplicate, but GenericDescriptor interface is private in protobuf
-        case ENUM:
-            return getEnumClassByEnumDescriptor(descriptor.getEnumType(), beanContainer);
-        case MESSAGE:
-            return MappingUtils.loadClass(StringUtils.join(
-                    getFullyQualifiedClassName(descriptor.getMessageType().getFile().getOptions(), descriptor.getMessageType().getName()), '.'), beanContainer);
-        default:
-            throw new RuntimeException();
+            case INT:
+                return Integer.class;
+            case LONG:
+                return Long.class;
+            case FLOAT:
+                return Float.class;
+            case DOUBLE:
+                return Double.class;
+            case BOOLEAN:
+                return Boolean.class;
+            case STRING:
+                return String.class;
+            case BYTE_STRING:
+                return ByteString.class;
+            //code duplicate, but GenericDescriptor interface is private in protobuf
+            case ENUM:
+                return getEnumClassByEnumDescriptor(descriptor.getEnumType(), beanContainer);
+            case MESSAGE:
+                return MappingUtils.loadClass(StringUtils.join(
+                        getFullyQualifiedClassName(descriptor.getMessageType().getFile().getOptions(), descriptor.getMessageType().getName()), '.'), beanContainer);
+            default:
+                throw new RuntimeException();
         }
     }