Bump maven-checkstyle-plugin to 3.0.0

[odlparent.git] / odlparent / pom.xml

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