diff options
| author |   Tal Gitelman <tg851x@intl.att.com> | 2018-01-25 15:28:44 +0200 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2018-01-25 14:22:55 +0000 |
| commit | 62ae83d66ecdc04ee722f5219aba687873d76760 (patch) | |
| tree | 40de627aa668c8e02ffbaca3c7e22397833cea11 | |
| parent | 9f25b3b3b57a5673b597a5b344689c31a3628d62 (diff) | |
Fix WS pom clean install and docker creation
Change-Id: Ie488bae56ea01d81b84e8ac2dda5c0ac5bd73444
Issue-ID: SDC-964
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
| -rw-r--r-- | utils/webseal-simulator/pom.xml | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index fa9d3529b3..18e5b32bb9 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -15,6 +15,8 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> <nexus.proxy>https://nexus.onap.org</nexus.proxy> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag> + <docker.latest.tag>${project.version}-latest</docker.latest.tag> </properties> <dependencies> @@ -157,20 +159,50 @@ <plugins> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>clean-static-files</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/sdc-simulator</directory> + <includes> + <include>*.war</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + <fileset> + <directory>${project.basedir}/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default</directory> + <includes>logback.xml</includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.0.2</version> <executions> <execution> <id>copy-resources-simulator</id> - <phase>package</phase> + <phase>verify</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${basedir}/sdc-simulator</outputDirectory> + <outputDirectory>${project.basedir}/sdc-simulator</outputDirectory> <resources> <resource> - <directory>${basedir}/target</directory> + <directory>${project.basedir}/target</directory> <includes> <include>WSSimulator.war</include> </includes> @@ -180,7 +212,7 @@ </execution> <execution> <id>copy-configurations-simulator</id> - <phase>validate</phase> + <phase>verify</phase> <goals> <goal>copy-resources</goal> </goals> @@ -224,7 +256,7 @@ <alias>sdc-simulator</alias> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/sdc-simulator</dockerFileDir> + <dockerFileDir>${basedir}\sdc-simulator</dockerFileDir> <tags> <tag>${docker.tag}</tag> <tag>${docker.latest.tag}</tag> @@ -249,7 +281,7 @@ <execution> <id>generate-images</id> - <phase>package</phase> + <phase>install</phase> <goals> <goal>build</goal> </goals> |