Cleanup: Checkstyle does NOT require dependency to odl-license

The license check STILL WORKS with this clean-up, because that is done
using odlparent.checkstyle/src/main/resources/LICENSE.txt (which is a
REGEXP for Checkstyle). odlparent.odl-license/src/main/resources/LICENSE
on the other hand is a TXT used only by maven-dependency-plugin
unpack-license, and has nothing to do with Checkstyle. While this
doesn't cause any bugs, it's somewhat confusing, and seemed like a good
idea to clean up for the next person coming along and looking at this.

Originally I hoped that this would resolve an Error that occurs in
Eclipse with the Checkstyle Eclipse plugin, where it gets confused
between the REGEXP license for Checkstyle and the TXT. While this does
not solve that - it still seemed like a good idea to clean up.
(org.apache.commons.beanutils.ConversionException: line 83 in header
specification is not a regular expression at
com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.postProcessHeaderLines(RegexpHeaderCheck.java:160)

The removal of pluginManagement in license/pom.xml is unrelated, just
seemed like a good idea too, as that doesn't actually do anything.

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

diff --git a/license/pom.xml b/license/pom.xml
index 44f90893c4902460f36b66136e193ceccc749bff..10e5f3b9e84bd76e13a072a73611adaebfffc528 100644 (file)
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -28,27 +28,5 @@
     </site>
   </distributionManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.18.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
 

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index cf2893644e841683cfaead0ec5e3a489b28ba91f..ff8de2463ae4801898d2f06c5ab0dc35a9c5a590 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -1085,11 +1085,6 @@
               <artifactId>checkstyle</artifactId>
               <version>${odl.checkstyle.version}</version>
             </dependency>
-            <dependency>
-              <groupId>org.opendaylight.odlparent</groupId>
-              <artifactId>odl-license</artifactId>
-              <version>0.1.0-SNAPSHOT</version>
-            </dependency>
           </dependencies>
           <configuration>
             <configLocation>odl_checks.xml</configLocation>