aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-07-16 18:26:32 +0000
committerGerrit Code Review <gerrit@onap.org>2017-07-16 18:26:32 +0000
commite092947029e4920ab96e9321e1c44be3777d8081 (patch)
tree42697f4322560e79aed7ad0192bbef2cf0dcff28
parent7a56f8d2031e6e8b1976de23b48447beb4133d16 (diff)
parente0dad2e0147ead960f34ddb8252ddd1cb550bfc4 (diff)
Merge "Fix assembly xmls for maven-assembly-plugin v2.2+"
-rw-r--r--openecomp-be/tools/swagger-ui/assembly/swagger.xml3
-rw-r--r--openecomp-be/tools/swagger-ui/pom.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/openecomp-be/tools/swagger-ui/assembly/swagger.xml b/openecomp-be/tools/swagger-ui/assembly/swagger.xml
index 769cc64840..b88714254f 100644
--- a/openecomp-be/tools/swagger-ui/assembly/swagger.xml
+++ b/openecomp-be/tools/swagger-ui/assembly/swagger.xml
@@ -2,6 +2,7 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
<formats>
<format>war</format>
</formats>
@@ -73,4 +74,4 @@
</includes>
</fileSet>
</fileSets>
-</assembly> \ No newline at end of file
+</assembly>
diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index b2b608cd3a..4a354624ee 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -91,6 +91,7 @@
<descriptor>assembly/swagger.xml</descriptor>
<finalName>${plugin.name}</finalName>
<outputDirectory>${package.dir}</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>