Merge "Config SDNC to use maven 3.5"

diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index a561615..cb7b69f 100644 (file)
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -49,13 +49,14 @@
       cov-int/build-log.txt
       cov-int/build-timings.txt
       cov-int/cov-import-scm-timings.txt
+      cov-int/coverity-scan-analysed-files.txt
+      cov-int/scm-untracked-files.txt
       cov-int/failed_jsp/*
       cov-int/java-security-da-input.dat
       cov-int/java-security-da-whitelist.dat
       cov-int/jsp-compilation-log.txt
       cov-int/jsp-debug-log.txt
       cov-int/security.log
-      coverity-scan-analysed-files.log
 
     properties:
       - lf-infra-properties:

diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
index 51bd273..5c04183 100644 (file)
--- a/shell/maven-coverity.sh
+++ b/shell/maven-coverity.sh
@@ -159,9 +159,20 @@ cov-manage-emit \
   --invert-match \
   '^Translation unit:$' \
 | sed \
-  's!^[[:digit:]]\+ -> !!' \
+  --regexp-extended \
+  's!^[[:digit:]]+ -> !!' \
 | sort \
-> 'coverity-scan-analysed-files.log'
+> 'cov-int/coverity-scan-analysed-files.txt'
+
+# List all analyzed files that are not tracked by SCM repository
+cov-manage-emit \
+  --dir cov-int \
+  list-scm-unknown \
+| sed \
+  --regexp-extended \
+  's!^[^ ]+ !!' \
+| sort \
+> 'cov-int/scm-untracked-files.txt'
 
 #-----------------------------------------------------------------------------
 # Submit results to Coverity service