Clean up to remove controller/opendaylight/commons/checkstyle

Main reason for finally doing this longer overdue clean-up now is that
it appears that the odlparent Checkstyle rules are not effective (in-IDE
and likely also on CLI, not tested) for controller projects such as
md-sal/binding-broker (where a number of violations should have shown
but didn't); and I suspect this may because of a precedence conflict
with these (old) Checkstyle rules, which now are not needed anymore.

Unless I'm missing something, normally (hopefully) this should have no
remaining impact anywhere outside of controller; I have done a
(relatively quick) grep for all 3 of "commons.checkstyle.version" &
"<artifactId>checkstyle" & "checkstyle-logging.xml" (all of which this
removes) in all of autorelease, and have found a few references in 3 old
projects (lacp, alto, netconf; note that netide, ttp used to have
dependencies to controller's checkstyle, but those project have
meanwhile cleaned that up themselves), which the linked changes
will have removed, so... should now be OK.

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

diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml
deleted file mode 100644 (file)
index 4f01529..0000000
--- a/opendaylight/commons/checkstyle/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.controller</groupId>
-  <artifactId>checkstyle</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>HEAD</tag>
-  </scm>
-
-  <properties>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <nexus.repository.release>opendaylight.release</nexus.repository.release>
-    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
-    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-  </properties>
-  <distributionManagement>
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
-    </snapshotRepository>
-    <!-- Site deployment -->
-    <site>
-      <id>website</id>
-      <url>${sitedeploy}</url>
-    </site>
-  </distributionManagement>
-</project>

diff --git a/opendaylight/commons/checkstyle/src/main/resources/controller/checkstyle.xml b/opendaylight/commons/checkstyle/src/main/resources/controller/checkstyle.xml
deleted file mode 100644 (file)
index 0c3699d..0000000
--- a/opendaylight/commons/checkstyle/src/main/resources/controller/checkstyle.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
-
-<!--
-     ======================================================================
-        Please do not add new Checkstyle check modules here anymore:
-
-        1. https://git.opendaylight.org/gerrit/#/c/39797/ has aligned
-        odl-parent's common Checkstyle rule set to include these.
-
-        2. As a next step, perhaps you would like to accept odl-parent's
-        Checkstyle definition as errors instead of warnings for Controller?
-        This is possible via violationSeverity=error as documented on
-        https://wiki.opendaylight.org/view/BestPractices/Coding_Guidelines#Checkstyle
-
-        Please contact odlparent-dev@lists.opendaylight.org if you feel
-        a Checkstyle rule is too strict in general and should be reviewed.
-
-        3. Ultimately this entire project (org.opendaylight.controller:checkstyle)
-        should then be deleted, and dependencies to it removed.
-     ======================================================================
- -->
-
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="RegexpSingleline">
-        <!-- \s matches whitespace character, $ matches end of line. -->
-        <property name="format" value="\s+$"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-    <module name="TreeWalker">
-       <module name="RedundantImport"/>
-       <module name="UnusedImports"/>
-       <module name="AvoidStarImport"/>
-       <module name="UpperEll"/>
-       <module name="EmptyStatement"/>
-       <module name="EqualsHashCode"/>
-    </module>
-
-</module>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 929a14abccaaf4159719354e9e606aec15fbbde0..cbcf4105cb4c6baee7a45dc58aab80ff0aa5e25b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -30,7 +30,6 @@
     <!-- Third Party Versions -->
     <codahale.metrics.version>3.0.1</codahale.metrics.version>
 
     <!-- Third Party Versions -->
     <codahale.metrics.version>3.0.1</codahale.metrics.version>
 

-    <commons.checkstyle.version>0.4.0-SNAPSHOT</commons.checkstyle.version>

     <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
     <commons.logback_settings.version>0.4.0-SNAPSHOT</commons.logback_settings.version>
     <commons.opendaylight.commons.httpclient>0.5.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
     <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
     <commons.logback_settings.version>0.4.0-SNAPSHOT</commons.logback_settings.version>
     <commons.opendaylight.commons.httpclient>0.5.0-SNAPSHOT</commons.opendaylight.commons.httpclient>


@@ -1028,34 +1027,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
       </plugins>
     </pluginManagement>
     <plugins>

-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
-          <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/,**\/src\/main\/resources\/archetype-resources\/**\/*.java</excludes>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>process-sources</phase>
-          </execution>
-        </executions>
-      </plugin>

       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>


@@ -1151,11 +1122,6 @@
     <outputDirectory>${project.build.directory}/site</outputDirectory>
     <excludeDefaults>true</excludeDefaults>
     <plugins>
     <outputDirectory>${project.build.directory}/site</outputDirectory>
     <excludeDefaults>true</excludeDefaults>
     <plugins>

-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
-      </plugin>

       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index 74e1616215b5cc55e23ff2ba04e7c7bf35c206d8..11776c6e8577d9d0aa6ff356ae53be1649183320 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
 
     <!-- Parents -->
     <module>opendaylight/commons/protocol-framework</module>
 
     <!-- Parents -->
     <module>opendaylight/commons/protocol-framework</module>

-    <module>opendaylight/commons/checkstyle</module>

     <module>opendaylight/commons/opendaylight</module>
     <module>opendaylight/commons/logback_settings</module>
     <module>opendaylight/commons/filter-valve</module>
     <module>opendaylight/commons/opendaylight</module>
     <module>opendaylight/commons/logback_settings</module>
     <module>opendaylight/commons/filter-valve</module>