fix clm scan issue

[dcaegen2/analytics/tca-gen2.git] / dcae-analytics / dcae-analytics-tca-web / pom.xml

diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 002edcd..afa7d26 100644 (file)
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ ================================================================================
-  ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -107,7 +107,16 @@
 
     </dependencies>
 
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>5.0.11.RELEASE</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
     <build>
         <resources>
             <resource>
@@ -116,14 +125,6 @@
             <resource>
                 <directory>${project.build.directory}/git</directory>
             </resource>
-            <resource>
-                <directory>docker</directory>
-                <includes>
-                    <include>Dockerfile</include>
-                </includes>
-                <targetPath>${project.basedir}</targetPath>
-                <filtering>true</filtering>
-            </resource>
         </resources>
 
         <plugins>
@@ -138,23 +139,23 @@
             <!-- DOCKER PLUGIN -->
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>docker-push</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                        <skipDocker>false</skipDocker>
+                        <imageName>${docker.repository}/onap/${project.groupId}.${project.artifactId}</imageName>
+                        <dockerDirectory>${project.basedir}</dockerDirectory>
+                        <resources>
+                               <resource>
+                                     <targetPath>${project.basedir}</targetPath>
+                                     <directory>${project.build.directory}</directory>
+                                     <include>${project.build.finalName}.jar</include>
+                              </resource>
+                        </resources>
+                        <imageTags>
+                                     <imageTag>${project.version}</imageTag>
+                                     <imageTag>latest</imageTag>
+                        </imageTags>
+                </configuration>
             </plugin>
         </plugins>
     </build>