From 51e3ffe7805fef609355a2c9c8dd771f62d8eef6 Mon Sep 17 00:00:00 2001
From: liboNet <libo.zhu@intel.com>
Date: Sat, 27 Apr 2019 06:31:47 +0800
Subject: [PATCH] Fix link address of artifact broker package

Change-Id: Id47f4374c201c0a0936e234a428a3a12a2ee843e
Issue-ID: MULTICLOUD-576
Signed-off-by: liboNet <libo.zhu@intel.com>
---
 artifactbroker/docker/Dockerfile | 2 +-
 artifactbroker/packages/pom.xml  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile
index fe6a1df..6a211ce 100644
--- a/artifactbroker/docker/Dockerfile
+++ b/artifactbroker/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc
     chown  -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS}
 
 WORKDIR ${ARTIFACT_DISTRIBUTION_HOME}
-RUN wget -O multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=autorelease-121669&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&v=1.3.0&e=zip" && \
+RUN wget -O multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.3.1-SNAPSHOT" && \
     unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip && \
     rm -f multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip
 COPY artifact-dist.sh  bin/.
diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index d92d555..8e8095c 100644
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -69,11 +69,10 @@
                     <descriptors>
                         <descriptor>src/main/package/assembly.xml</descriptor>
                     </descriptors>
-                    <finalName>${project.artifactId}-${project.version}</finalName>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>generate-complete-tar</id>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
-- 
2.16.6