From cdad1f3c519c14fe99c390c78f60b883294e307e Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 7 Feb 2019 11:26:06 -0500
Subject: Fix checkstyle build and xml

The XML for onap-java-code style has a bug identified by Eclipse. The
maxLineLength field is not allowed.

In addition, not sure how any jobs work already, the sourceDirectory
appends and extra "src/main/java" to the path so some builds don't
always find the correct source files to generate warnings. The plugin
is a bit flaky and sometimes seems to find the java files, while other
times it does not. So some checkstyle warnings are not generated.

Change-Id: Ia07065a0d0df1429643680cb5bd70b5ec13bebde
Issue-ID: TSC-71
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml | 1 -
 oparent/pom.xml                                                   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
index 32439e2..77ef3ae 100644
--- a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
+++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
@@ -73,7 +73,6 @@
         </module>
         <module name="NeedBraces"/>
         <module name="LeftCurly">
-            <property name="maxLineLength" value="120"/>
         </module>
         <module name="RightCurly">
             <property name="option" value="alone"/>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 9441404..e678fc1 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -458,7 +458,7 @@
                    with minor changes -->
               <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
               <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-              <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
               <includeResources>true</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>true</includeTestResources>
-- 
cgit 1.2.3-korg