Change the Csar installer

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 83bc1d0..4d83575 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -84,17 +84,22 @@
 
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-               <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>
+               <!-- 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.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>
@@ -259,16 +264,34 @@
                        <groupId>org.apache.xmlgraphics</groupId>
                        <artifactId>batik-svggen</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-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>
@@ -601,9 +624,9 @@
 
                <plugins>
                        <plugin>
-                               <groupId>de.jpdigital</groupId>
-                               <artifactId>hibernate52-ddl-maven-plugin</artifactId>
-                               <version>2.2.0</version>
+                                       <groupId>de.jpdigital</groupId>
+                                       <artifactId>hibernate52-ddl-maven-plugin</artifactId>
+                                       <version>2.2.0</version>
                                <dependencies>
                                        <dependency>
                                                <groupId>javax.xml.bind</groupId>
@@ -619,7 +642,7 @@
                                                </goals>
                                                <configuration>
                                                        <packages>
-                                                               <param>org.onap.clamp.dao.model</param>
+                                                               <param>org.onap.clamp</param>
                                                        </packages>
                                                        <dialects>
                                                                <param>MARIADB53</param>
@@ -1062,7 +1085,7 @@
                                        <dumpOnExit>true</dumpOnExit>
                                        <append>true</append>
                                        <includes>
-                                               <include>org.onap.clamp.*</include>
+                                               <include>org/onap/clamp/**</include>
                                        </includes>
                                </configuration>
                                <executions>
@@ -1104,7 +1127,18 @@
                                                                        </includes>
                                                                </fileSet>
                                                        </fileSets>
-                                                       <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                                                       <destFile>${project.build.directory}/jacoco.exec</destFile>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>report-xml</id>
+                                               <goals>
+                                                       <goal>report</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!-- 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>