From d8a1b6b034041715459c25c54b47b1174b21bb11 Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Mon, 4 May 2020 22:23:28 +0530
Subject: Fix Build failure

Issue-ID: SO-2775
Change-Id: I92a60c58ad543e276e29684cfaf44890528c3e89
Signed-off-by: ramu.n <ramu.n@huawei.com>
---
 packages/docker/pom.xml | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'packages/docker/pom.xml')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 37e8bab560..1d20e44a87 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -249,30 +249,8 @@
               </build>
             </image>
             <image>
-             <name>${docker.image.prefix}/nssmf-adapter</name>
+              <name>${docker.image.prefix}/nssmf-adapter</name>
               <build>
-               <cleanup>try</cleanup>
-               <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
-               <tags>
-                <tag>${project.version}</tag>
-                <tag>${project.version}-${maven.build.timestamp}</tag>
-                <tag>${project.docker.latesttag.version}</tag>
-               </tags>
-               <assembly>
-                <inline>
-                 <dependencySets>
-                  <dependencySet>
-                   <includes>
-                    <include>org.onap.so.adapters:mso-nssmf-adapter</include>
-                   </includes>
-                   <outputFileNameMapping>app.jar</outputFileNameMapping>
-                 </dependencySet>
-                </dependencySets>
-               </inline>
-              </assembly>
-             </build>
-           </image>
-=======
                 <cleanup>try</cleanup>
                 <dockerFile>docker-files/Dockerfile.so-nssmf-adapter</dockerFile>
                 <tags>
@@ -294,7 +272,6 @@
                 </assembly>
               </build>
             </image>
->>>>>>> CHANGE (2dbccb Docker file for NSSMF-ADAPTER)
             <image>
               <name>${docker.image.prefix}/so-appc-orchestrator</name>
               <build>
-- 
cgit 1.2.3-korg