Bump maven-checkstyle-plugin to 3.0.0

https://mail-archives.apache.org/mod_mbox/maven-announce/201801.mbox/%3Cop.zchs68akkdkhrr%40desktop-2khsk44.mshome.net%3E

Also removes checkstyle.version property, as noted in its TODO, and
switches from <sourceDirectory/> to <sourceDirectories/>, as
documented on the plugin site on
https://maven.apache.org/plugins/maven-checkstyle-plugin/

Change-Id: I3bffa47a300f314aaefe5181ca92fd0a6c925755
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/karaf-plugin/pom.xml b/karaf-plugin/pom.xml
index 8dd3263cf6ed96c30395b22f2cd4c81b76ffdb82..b76c9b84d8aa4fec0c10464303cb536c5b8957c5 100644 (file)
--- a/karaf-plugin/pom.xml
+++ b/karaf-plugin/pom.xml
@@ -82,7 +82,9 @@
               <configLocation>check-license.xml</configLocation>
               <includeResources>false</includeResources>
               <includeTestResources>false</includeTestResources>
-              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <sourceDirectories>
+                <directory>${project.build.sourceDirectory}</directory>
+              </sourceDirectories>
               <excludes>
                 <!-- Skip Apache Licensed files -->
                 org/opendaylight/odlparent/PopulateLocalRepoMojo.java

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 6448cd85b990af8fa548d3c9d3d6d9ee2decaf70..39c8b0fd3051f2f470e798a065d627eebabb4ce9 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -65,12 +65,6 @@
     <!-- Maven plugin versions, in random formats -->
     <!-- Used in aaa, alto, controller, didm, tsdr; see also affinity, snmp4sdn, toolkit, ttp -->
     <bundle.plugin.version>${maven.bundle.version}</bundle.plugin.version>
-    <!-- TODO rename checkstyle.version to checkstyle.(maven.)plugin.version,
-         or just remove it, incl. all usages of it in a number of pom.xml; because normally,
-         as maven-checkstyle-plugin is in pluginManagement, this should not have to be repeated. -->
-    <!-- Used in alto, controller, lacp, netide, openflowjava, packetcable, snmp4sdn, ttp; see also affinity, opendove,
-         toolkit -->
-    <checkstyle.version>2.17</checkstyle.version>
     <!-- Used in controller, packetcable -->
     <odl.checkstyle.version>3.0.0-SNAPSHOT</odl.checkstyle.version>
     <!-- Used in snmp4sdn; see also toolkit -->
@@ -1117,7 +1111,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle.version}</version>
+          <version>3.0.0</version>
           <dependencies>
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
@@ -1144,9 +1138,11 @@
           <configuration>
             <configLocation>odl_checks.xml</configLocation>
             <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-            <!-- <sourceDirectory> is needed so that checkstyle ignores the
+            <!-- <sourceDirectories> are needed so that checkstyle ignores the
                  generated sources directory -->
-            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+            <sourceDirectories>
+              <directory>${project.build.sourceDirectory}</directory>
+            </sourceDirectories>
             <includeResources>true</includeResources>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <includeTestResources>true</includeTestResources>
@@ -1172,7 +1168,9 @@
                 <includeResources>false</includeResources>
                 <includeTestSourceDirectory>true</includeTestSourceDirectory>
                 <includeTestResources>false</includeTestResources>
-                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                <sourceDirectories>
+                  <directory>${project.build.sourceDirectory}</directory>
+                </sourceDirectories>
                 <excludes>
                   org/opendaylight/yang/gen/**,
                   **/protobuff/messages/**,
@@ -1959,7 +1957,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
+        <version>3.0.0</version>
       </plugin>
 
       <!-- FIXME: activate this