From: Thomas Nelson <nelson24@att.com>
Date: Wed, 29 Jan 2020 19:47:22 +0000 (+0000)
Subject: Merge "Bug fixes, syncronization, and clean up daemon"
X-Git-Tag: 3.2.38~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=music.git;a=commitdiff_plain;h=a40b03fe9039d247dcc5a366f9778155a92c947b;hp=25d19ed4c6285b419e6ea7b9f0003c60668d4218

Merge "Bug fixes, syncronization, and clean up daemon"
---

diff --git a/pom.xml b/pom.xml
index c3895add..0f15cc38 100755
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,8 @@
         <docker.latest.tag>${project.version}-latest</docker.latest.tag>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- Default Sonar configuration -->
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <repositories>
@@ -139,9 +141,6 @@
                                             <tag>${docker.latest.tag}</tag>
                                         </tags>
                                         <dockerFileDir>${project.basedir}/distribution/music</dockerFileDir>
-<!--                                    <assembly>
-                                            <descriptorRef>artifact</descriptorRef>
-                                        </assembly>  -->
                                     </build>
                                 </image>
                                 <!-- Cassandra -->
@@ -170,11 +169,6 @@
                                         <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
                                     </build>
                                 </image>
-                                <!-- tomcat 8.5 -->
-                                <!-- <image> <name>onap/music/tomcat_music</name>
-                                    <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>
-                                    <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir>
-                                    </build> </image>\ -->
                             </images>
                         </configuration>
                         <executions>