X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fdb776bd1438a059fa9d517260cb64765324252f;hb=49b246be830cbd35125fb9eb2054ed60139f996c;hp=f6b6288be4fdbc570590a9545b9fcd44a7b5fe39;hpb=0db1ea358fdc74daf7b2039f7364ca0fff08bc77;p=music.git

diff --git a/pom.xml b/pom.xml
index f6b6288b..fdb776bd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,14 @@
                 </includes>
             </resource>
         </resources>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+            </testResource>
+            <!-- <testResource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </testResource> -->
+        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -141,7 +149,7 @@
                     <mainClass>org.onap.music.MusicApplication</mainClass>
                     <outputDirectory>./distribution/music/</outputDirectory>
                     <addResources>true</addResources>
-                 </configuration>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -206,7 +214,7 @@
 
     <dependencies>
         <!-- Springboot -->
-         <dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
@@ -228,11 +236,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-actuator</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework/spring-webmvc -->
-         <dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
             <scope>compile</scope>
@@ -328,16 +336,16 @@
         <artifactId>cassandra-driver-core</artifactId>
         <version>3.6.0</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
             <version>${cassandra.version}</version>
-           <exclusions>
+            <exclusions>
         <!-- <exclusion>
         <groupId>io.netty</groupId>
         <artifactId>*</artifactId>
         </exclusion> -->
-    </exclusions>
+            </exclusions>
         </dependency> 
         <!-- /Cassandra -->
         <!-- Jersey -->
@@ -591,19 +599,6 @@
                                         <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
                                     </build>
                                 </image>
-                                <!-- Trigger -->
-                                <image>
-                                    <name>onap/music/musictrigger</name>
-                                    <alias>docker_trigger</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/trigger</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>