diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-21 13:04:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-21 13:04:01 +0000 |
| commit | b0ca04c744b18b0038ce6f2e7a5e2446c895333f (patch) | |
| tree | 226be2d49e4917e866739d7ccca10af0949db67d | |
| parent | 3bad5ac8d914040ea9d8e853f499da3935113a70 (diff) | |
| parent | a808ee1242564d7237e1dbec9336fd665d517dda (diff) | |
Merge "fix pom"
| -rw-r--r-- | dcaedt_be/pom.xml | 25 | ||||
| -rw-r--r-- | dcaedt_tools/pom.xml | 232 |
2 files changed, 152 insertions, 105 deletions
diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml index 4659006..ca5f8dd 100644 --- a/dcaedt_be/pom.xml +++ b/dcaedt_be/pom.xml @@ -169,13 +169,36 @@ <id>docker</id> <build> <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>delete dcae be war</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.parent.basedir}/docker/docker_be/target</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.0.2</version> <executions> <execution> <id>copy-dcae-be-war</id> - <phase>prepare-package</phase> + <phase>install</phase> <goals> <goal>copy-resources</goal> </goals> diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml index 71009bd..265a150 100644 --- a/dcaedt_tools/pom.xml +++ b/dcaedt_tools/pom.xml @@ -16,110 +16,134 @@ </properties> <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-dcae-tools-jar</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/docker/docker_tools/target</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/target</directory> - <includes> - <include>dcaedt_tools-${project.version}-jar-with-dependencies.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-dcae-config-json</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/src/main/resources/conf</directory> - <includes> - <include>config.json</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.23.0</version> - <configuration> - <verbose>true</verbose> - <apiVersion>1.23</apiVersion> - <images> - <!-- Build tools image --> - <image> - <name>onap/dcae-tools</name> - <alias>dcae-tools</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.parent.basedir}/docker/docker_tools</dockerFileDir> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - <tag>${docker.staging.tag}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - <image>onap/dcae-be</image> - </configuration> - </execution> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - <configuration> - <image>onap/dcae-tools</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>delete dcae tools jar</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.parent.basedir}/docker/docker_tools/target</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.jar</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-dcae-tools-jar</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/docker/docker_tools/target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/target</directory> + <includes> + <include>dcaedt_tools-${project.version}-jar-with-dependencies.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-dcae-config-json</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources/conf</directory> + <includes> + <include>config.json</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.23.0</version> + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <images> + <!-- Build tools image --> + <image> + <name>onap/dcae-tools</name> + <alias>dcae-tools</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.parent.basedir}/docker/docker_tools</dockerFileDir> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + <tag>${docker.staging.tag}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>onap/dcae-be</image> + </configuration> + </execution> + <execution> + <id>generate-images</id> + <phase>install</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>onap/dcae-tools</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <build> <plugins> |