diff options
| -rw-r--r-- | checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml | 14 | ||||
| -rw-r--r-- | oparent/pom.xml | 20 |
2 files changed, 25 insertions, 9 deletions
diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml index 77ef3ae..e6b249d 100644 --- a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml +++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!-- Copyright (c) 2016 Huawei Technologies Co., Ltd. + Modifications Copyright (C) 2019 Nordix Foundation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -48,6 +49,11 @@ <property name="eachLine" value="true"/> </module> + <module name="LineLength"> + <property name="max" value="120"/> + <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> + </module> + <module name="TreeWalker"> <module name="OuterTypeFilename"/> <module name="IllegalTokenText"> @@ -60,10 +66,6 @@ <property name="allowByTailComment" value="true"/> <property name="allowNonPrintableEscapes" value="true"/> </module> - <module name="LineLength"> - <property name="max" value="120"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> <module name="AvoidStarImport"/> <module name="OneTopLevelClass"/> <module name="NoLineWrap"/> @@ -199,10 +201,12 @@ <property name="allowMissingParamTags" value="true"/> <property name="allowMissingThrowsTags" value="true"/> <property name="allowMissingReturnTag" value="true"/> - <property name="minLineCount" value="2"/> <property name="allowedAnnotations" value="Override, Test"/> <property name="allowThrowsTagsForSubclasses" value="true"/> </module> + <module name="MissingJavadocMethod"> + <property name="minLineCount" value="2"/> + </module> <module name="MethodName"> <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> <message key="name.invalidPattern" diff --git a/oparent/pom.xml b/oparent/pom.xml index ec1c865..7e5f274 100644 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -2,6 +2,7 @@ <!-- Copyright (c) 2016-2017 Huawei Technologies Co., Ltd. Modifications copyright (C) 2019 AT&T Intellectual Property + Modifications Copyright (C) 2019 Nordix Foundation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -415,12 +416,23 @@ <artifactId>sonar-maven-plugin</artifactId> <version>3.2</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>3.1.0</version> + <dependencies> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>8.27</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> <dependencies> <dependency> <groupId>org.onap.oparent</groupId> @@ -440,7 +452,7 @@ <includeResources>false</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>false</includeTestResources> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <excludes> </excludes> <consoleOutput>true</consoleOutput> @@ -458,8 +470,8 @@ https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> - <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <!-- <sourceDirectories> is needed so that checkstyle ignores the generated sources directory --> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> |