Relax O-Parent license check requirements

Relax O-Parent license check formatting requirements.
At the same time, violations will now become errors and
will fail builds.

Change-Id: Ie581895796cc06a9f008d7b739583fb44673aa19
Issue-ID: INT-135
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/checkstyle/src/main/resources/onap-checkstyle/check-license.xml b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml
index 2a0acd0..9198c6e 100644 (file)
--- a/checkstyle/src/main/resources/onap-checkstyle/check-license.xml
+++ b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE module PUBLIC
           "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
           "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the license headers
-    expected by Open-O.
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-    <property name="severity" value="warning"/>
-
-    <module name="RegexpHeader">
-        <property name="headerFile" value="${checkstyle.header.file}"/>
-        <property name="multiLines" value="2"/>
-    </module>
+<!-- Checks the license headers expected by ONAP. -->
+<module name="Checker">
+  <property name="charset" value="UTF-8"/>
+  <property name="severity" value="error"/>
+  <module name="RegexpSingleline">
+    <property name="format" value="under the Apache License, Version 2\.0"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="10"/>
+  </module>
+  <module name="RegexpSingleline">
+    <property name="format" value="http://www.apache\.org/licenses/LICENSE-2\.0"/>
+    <property name="minimum" value="1"/>
+    <property name="maximum" value="10"/>
+  </module>
 </module>

diff --git a/oparent/pom.xml b/oparent/pom.xml
index b4bacfc..0c636ba 100644 (file)
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -318,15 +318,14 @@
               <phase>process-sources</phase>
               <configuration>
                 <configLocation>onap-checkstyle/check-license.xml</configLocation>
-                <headerLocation>onap-checkstyle/apache-license-2.regexp.txt</headerLocation>
                 <includeResources>false</includeResources>
                 <includeTestSourceDirectory>true</includeTestSourceDirectory>
                 <includeTestResources>false</includeTestResources>
                 <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                 <excludes>
                 </excludes>
-                <failsOnError>false</failsOnError>
                 <consoleOutput>true</consoleOutput>
+                <failsOnViolation>false</failsOnViolation>
               </configuration>
             </execution>
             <execution>
@@ -346,9 +345,9 @@
                 <includeTestSourceDirectory>true</includeTestSourceDirectory>
                 <includeTestResources>true</includeTestResources>
                 <excludes>
-               </excludes>
-                <failsOnError>false</failsOnError>
+                </excludes>
                 <consoleOutput>true</consoleOutput>
+                <failsOnViolation>false</failsOnViolation>
               </configuration>
             </execution>
           </executions>

diff --git a/version.properties b/version.properties
index fb9d9ca..34fcd9b 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=0
-minor_version=2
-patch_version=0
+minor_version=1
+patch_version=1
 
 base_version=${major_version}.${minor_version}.${patch_version}