diff options
author | 2019-06-12 13:18:35 +0000 | |
---|---|---|
committer | 2019-06-12 13:18:35 +0000 | |
commit | cc40e38a3a51322fa3ad60c7bb7045180ad39842 (patch) | |
tree | 48e19bab43b3d82c9863823b8998ad2d775f9599 /controlloop/packages/apps-controlloop | |
parent | 3b90d560d3beafed560b42364d014123375bdb5a (diff) | |
parent | 19cade1c9284316bf15456002db354c894844c96 (diff) |
Merge "Use io.fabric8:docker-maven-plugin to build and push docker images"
Diffstat (limited to 'controlloop/packages/apps-controlloop')
-rw-r--r-- | controlloop/packages/apps-controlloop/pom.xml | 32 | ||||
-rw-r--r-- | controlloop/packages/apps-controlloop/src/assembly/zip.xml | 35 |
2 files changed, 35 insertions, 32 deletions
diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml index 83c96c7ec..d288eb258 100644 --- a/controlloop/packages/apps-controlloop/pom.xml +++ b/controlloop/packages/apps-controlloop/pom.xml @@ -3,6 +3,7 @@ ONAP ================================================================================ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2019 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,21 +37,22 @@ <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/assembly/zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>generate-complete-zip</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/controlloop/packages/apps-controlloop/src/assembly/zip.xml b/controlloop/packages/apps-controlloop/src/assembly/zip.xml index f3392e130..c2d19cb63 100644 --- a/controlloop/packages/apps-controlloop/src/assembly/zip.xml +++ b/controlloop/packages/apps-controlloop/src/assembly/zip.xml @@ -3,6 +3,7 @@ PDP-D APPS Installation Package ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2019 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,22 +20,22 @@ --> <assembly> - <id>zipfile</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/files</directory> - <outputDirectory>.</outputDirectory> - <fileMode>755</fileMode> - </fileSet> - </fileSets> - <dependencySets> - <dependencySet> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - </dependencySets> + <id>zipfile</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/files</directory> + <outputDirectory>.</outputDirectory> + <fileMode>755</fileMode> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + </dependencySets> </assembly> |