From: Michael Vorburger Date: Wed, 14 Sep 2016 15:20:20 +0000 (+0200) Subject: Clean up to remove controller/opendaylight/commons/checkstyle X-Git-Tag: release/carbon~454 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c046d016935736db9d80647ca6cfb86a34a4cd06;hp=65482327ec4e76ebce71b572ad69a648fe3ef014 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" & "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 --- diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml deleted file mode 100644 index 4f01529aa5..0000000000 --- a/opendaylight/commons/checkstyle/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - org.opendaylight.controller - checkstyle - 0.4.0-SNAPSHOT - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - HEAD - - - - http://nexus.opendaylight.org/content - opendaylight.release - opendaylight.snapshot - dav:http://nexus.opendaylight.org/content/sites/site - - - - - opendaylight-release - ${nexusproxy}/repositories/${nexus.repository.release}/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ - - - - website - ${sitedeploy} - - - 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 index 0c3699dca2..0000000000 --- a/opendaylight/commons/checkstyle/src/main/resources/controller/checkstyle.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 929a14abcc..cbcf4105cb 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -30,7 +30,6 @@ 3.0.1 - 0.4.0-SNAPSHOT 0.5.0-SNAPSHOT 0.4.0-SNAPSHOT 0.5.0-SNAPSHOT @@ -1028,34 +1027,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - controller/checkstyle.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/,**\/src\/main\/resources\/archetype-resources\/**\/*.java - - - - org.opendaylight.controller - checkstyle - 0.4.0-SNAPSHOT - - - - - - check - - process-sources - - - org.apache.maven.plugins maven-enforcer-plugin @@ -1151,11 +1122,6 @@ ${project.build.directory}/site true - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle.version} - org.apache.maven.plugins maven-javadoc-plugin diff --git a/pom.xml b/pom.xml index 74e1616215..11776c6e85 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ opendaylight/commons/protocol-framework - opendaylight/commons/checkstyle opendaylight/commons/opendaylight opendaylight/commons/logback_settings opendaylight/commons/filter-valve