Bump Checkstyle core from 7.6.1 to 8.2

and Sevntu from 1.21.0 to 1.24.2 (note the required change in groupId)

also includes removal of LeftCurly.maxLineLength = 100, which is not
supported (anymore; or -more likely- never was, probably the validation
just became stricter)

and removal of a duplicate RightCurly, which was always wrong

and required fixes to odlparent Java code showing violations now

Change-Id: I3efc1d2e97c87a9c072b3fe097cf388f5a457cf5
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/checkstyle/src/main/resources/odl_checks.xml b/checkstyle/src/main/resources/odl_checks.xml
index 43485067810cb72601122a98f94a6c4e542108e4..3cd95b4bc251a67c0a8ca5a4cbb1080f5dfb9a1c 100644 (file)
--- a/checkstyle/src/main/resources/odl_checks.xml
+++ b/checkstyle/src/main/resources/odl_checks.xml
@@ -57,10 +57,7 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
-        <module name="RightCurly"/>
+        <module name="LeftCurly" />
         <module name="RightCurly">
             <property name="option" value="alone"/>
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, STATIC_INIT, INSTANCE_INIT"/>

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
index 7e03d2e8b80aca67a7eff742e9b0901f403b49c9..ef89138305ecd92d413602408fab2a199f34ff2d 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
@@ -20,7 +20,7 @@ public final class Util {
 
     /**
      * <p>Convert a Description to a Description that includes information about repoUrl, featureName, and
-     * featureVersion</p>
+     * featureVersion.</p>
      * <p>This is done so that when a test fails, we can get information about which repoUrl, featureName, and
      * featureVersion can come back with the Failure.</p>
      *

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 0d4b6fc851ca6cf8b9f246cd340535e9a46d4192..7441d49b66b0481c67ae15789b714cd476516cc0 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -138,7 +138,7 @@
         <groupId>com.puppycrawl.tools</groupId>
         <artifactId>checkstyle</artifactId>
         <!-- This should match the plugin management on maven-checkstyle-plugin below -->
-        <version>7.6.1</version>
+        <version>8.2</version>
       </dependency>
 
       <!-- Testing Dependencies -->
@@ -1394,7 +1394,7 @@
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
               <!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
-              <version>7.6.1</version>
+              <version>8.2</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
@@ -1407,9 +1407,9 @@
               <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-              <groupId>com.github.sevntu.checkstyle</groupId>
+              <groupId>com.github.sevntu-checkstyle</groupId>
               <artifactId>sevntu-checkstyle-maven-plugin</artifactId>
-              <version>1.21.0</version>
+              <version>1.24.2</version>
             </dependency>
           </dependencies>
           <configuration>