fix pom

Add clean

Change-Id: I0f40bd987fa4941b013092c9cbc1ab332a46b9a2
Issue-ID: SDC-1339
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>

diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml
index c5acbe6..ca5f8dd 100644 (file)
--- 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>
@@ -238,7 +261,7 @@
                                                        </execution>
                                                        <execution>
                                                                <id>generate-images</id>
-                                                               <phase>package</phase>
+                                                               <phase>install</phase>
                                                                <goals>
                                                                        <goal>build</goal>
                                                                </goals>

diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml
index 71009bd..265a150 100644 (file)
--- 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>

diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml
index 66d9a8f..9c639e0 100644 (file)
--- a/dcaedt_validator/checker/pom.xml
+++ b/dcaedt_validator/checker/pom.xml
@@ -78,19 +78,6 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-assembly-plugin</artifactId>
                                <version>2.6</version>
-                               <configuration>
-                                       <descriptorRefs>
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>
-                                       </descriptorRefs>
-                                       <archive>
-                                               <manifest>
-                                                       <mainClass>org.onap.sdc.dcae.checker.Checker</mainClass>
-                                               </manifest>
-                                               <manifestEntries>
-                                                       <Implementation-Build>${buildNumber}</Implementation-Build>
-                                               </manifestEntries>
-                                       </archive>
-                               </configuration>
                                <executions>
                                        <execution>
                                                <id>make-assembly</id>
@@ -100,6 +87,16 @@
                                                <goals>
                                                        <goal>single</goal>
                                                </goals>
+                                               <configuration>
+                                                       <!--<archive>-->
+                                                               <!--<manifest>-->
+                                                                       <!--<mainClass>org.onap.sdc.dcae.checker.Checker</mainClass>-->
+                                                               <!--</manifest>-->
+                                                       <!--</archive>-->
+                                                       <descriptorRefs>
+                                                               <descriptorRef>jar-with-dependencies</descriptorRef>
+                                                       </descriptorRefs>
+                                               </configuration>
                                        </execution>
                                </executions>
                        </plugin>