From 02ab6515cd2a2f38aa548d9c64753067a0b1daed Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Thu, 5 Apr 2018 23:32:27 +0300
Subject: update maven-assembly-plugin

update version to 3.1.0

should fix issue in downloading the depandencys twice
Issue-ID: SDC-1191

Change-Id: I83da786e04c161634ae8aed592501ef73834ab1d
Signed-off-by: Michael Lando <ml636r@att.com>
---
 asdctool/pom.xml   | 4 +++-
 catalog-be/pom.xml | 4 +++-
 pom.xml            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 9a1a0e59ab..b429e61bff 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -570,7 +570,9 @@
 						<configuration>
 							<finalName>sdctool</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
-							<descriptor>${project.basedir}/tarball.xml</descriptor>
+							<descriptors>
+								<descriptor>${project.basedir}/tarball.xml</descriptor>
+							</descriptors>
 						</configuration>
 						<id>assemble-file</id>
 						<phase>verify</phase>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index da0df1270a..e99789d08c 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -769,7 +769,9 @@
                         <configuration>
                             <finalName>normatives</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <descriptor>${project.basedir}/normatives.xml</descriptor>
+                            <descriptors>
+                                <descriptor>${project.basedir}/normatives.xml</descriptor>
+                            </descriptors>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 9c8ab1f5fb..2d946e8d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.1.0</version>
 				</plugin>
 
 				<plugin>
-- 
cgit 1.2.3-korg