Merge "Fix dep problem"

diff --combined pom.xml
index 17e76f6,61280a8..4d83575
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -84,22 -84,18 +84,22 @@@
  
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 +              <!-- The value below comes from the jacoco maven plugin output, sonar now takes xml only -->
 +              <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/jacoco-html-xml-reports/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
                <!-- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
                <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath> -->
 -              <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco</sonar.coverage.jacoco.xmlReportPaths>
                <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <!-- Enable language to disable javascript analysis -->
                <!-- <sonar.language>java</sonar.language> -->
                <!-- Parameters for Javascript coverage -->
 +              <sonar.log.level>DEBUG</sonar.log.level>
 +        <sonar.nodejs.executable>${project.build.directory}/${ui.react.src}/node/node</sonar.nodejs.executable>
 +        <sonar.verbose>true</sonar.verbose>
                <sonar.sources>src/main,${project.build.directory}/${ui.react.src}/src</sonar.sources>
 -              <sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 -
                <sonar.exclusions>src/main/resources/**</sonar.exclusions>
 +              <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
 +              <sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
                <sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py</sonar.coverage.exclusions>
                <docker.push.registry>localhost:5000</docker.push.registry>
                <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
@@@ -275,11 -271,23 +275,23 @@@
                        <groupId>org.apache.xmlgraphics</groupId>
                        <artifactId>batik-svg-dom</artifactId>
                        <version>1.11</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>xml-apis</groupId>
+                                       <artifactId>xml-apis</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.apache.xmlgraphics</groupId>
                        <artifactId>batik-transcoder</artifactId>
                        <version>1.11</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>xml-apis</groupId>
+                                       <artifactId>xml-apis</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
@@@ -1073,7 -1081,7 +1085,7 @@@
                                        <dumpOnExit>true</dumpOnExit>
                                        <append>true</append>
                                        <includes>
 -                                              <include>org.onap.clamp.*</include>
 +                                              <include>org/onap/clamp/**</include>
                                        </includes>
                                </configuration>
                                <executions>
@@@ -1124,9 -1132,9 +1136,9 @@@
                                                        <goal>report</goal>
                                                </goals>
                                                <configuration>
 -                                                      <includes>
 -                                                              <include>org.onap.clamp.*</include>
 -                                                      </includes>
 +                                                      <!-- Setting explicit path, so that we remember where it picks them up from -->
 +                                                      <dataFile>${project.build.directory}/jacoco.exec</dataFile>
 +                                                      <outputDirectory>${project.build.directory}/jacoco-html-xml-reports</outputDirectory>
                                                </configuration>
                                        </execution>
                                </executions>