diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-04-13 12:04:33 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2017-07-12 18:12:21 +0000 |
| commit | e0dad2e0147ead960f34ddb8252ddd1cb550bfc4 (patch) | |
| tree | c534531030fd8259efb81c10c73b93375d8639f4 /openecomp-be/tools | |
| parent | dd60339b06d252fcb1382aa97ab3d65b37dad021 (diff) | |
Fix assembly xmls for maven-assembly-plugin v2.2+
Starting in version 2.2, maven-assembly-plugin
requires an id tag in the assembly descriptor xmls.
This patch allows the project to be built in
environments that use newer versions of
maven-assembly-plugin.
For details, see:
https://issues.apache.org/jira/browse/MASSEMBLY-517
Change-Id: I65d79aa4b24759f6b9a3fe8118b888e1672fdf60
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'openecomp-be/tools')
| -rw-r--r-- | openecomp-be/tools/swagger-ui/assembly/swagger.xml | 3 | ||||
| -rw-r--r-- | openecomp-be/tools/swagger-ui/pom.xml | 1 |
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> |