diff options
| author |   liamfallon <liam.fallon@est.tech> | 2019-12-06 13:21:21 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2019-12-06 13:21:34 +0000 |
| commit | 5a4892d3f1842b80ac5d28f035a6d1e151b9897d (patch) | |
| tree | 9cc1dfe8fc55b149952afb39a44f70c030ee6d7b /oparent/pom.xml | |
| parent | 91f393bedd2707db123895546367f7faa59ebe00 (diff) | |
Upgrade oparent to checkstyle 8.27
Checkstyle 8.27 introduces incompatible changes in the checkstyle rule
definition xml file. The latest Eclipse checkstyle plugin (version 8.26)
uses this new checkstyle xml rule format.
This change brings in the checkstyle 8.27 rule formats into oparent.
Issue-ID: INT-1395
Change-Id: I453120e5cc95fa2e30a5d2f24083fd030e960a01
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'oparent/pom.xml')
| -rw-r--r-- | oparent/pom.xml | 20 |
1 files changed, 16 insertions, 4 deletions
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> |