X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=dgbuilder-docker%2Fpom.xml;h=685cd1ecb92c07b2c25dfd2cd15dae04606b5396;hp=3dfbc0e79acd8366f7e81d8cb25aa1fc3f689cf4;hb=refs%2Fheads%2Fmaster;hpb=b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 3dfbc0e7..685cd1ec 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
@@ -20,16 +20,15 @@
 
     <properties>
         <image.name>onap/ccsdk-dgbuilder-image</image.name>
-        <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
     </properties>
 
     <build>
         <plugins>
 
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -67,93 +66,64 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>Make-stage-dir</id>
+                        <id>make-stage-dir</id>
                         <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/bin/mkdir</executable>
-                            <arguments>
-                                <argument>-p</argument>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                            </arguments>
+                            <target>
+                                <mkdir dir="${basedir}/target/docker-stage/opt/onap/ccsdk"/>
+                            </target>
                         </configuration>
-                    </execution>
-                    <execution>
-                        <id>Unzip dgbuilder</id>
-                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>run</goal>
                         </goals>
-                        <configuration>
-                            <executable>/usr/bin/unzip</executable>
-                            <arguments>
-                                <argument>-d</argument>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                <argument>../dgbuilder/target/*.zip</argument>
-                            </arguments>
-                        </configuration>
                     </execution>
                     <execution>
-                        <id>Copy dgbuilder</id>
+                        <id>unzip-dgbuilder</id>
                         <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/bin/cp</executable>
-                            <arguments>
-                                <argument>-r</argument>
-                                <argument>../dgbuilder</argument>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                            </arguments>
+                            <target>
+                                <unzip dest="${basedir}/target/docker-stage/opt/onap/ccsdk">
+                                    <fileset dir="${basedir}/../dgbuilder/target/">
+                                        <include name="**/*.zip"/>
+                                    </fileset>
+                                </unzip>
+                            </target>
                         </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
-
                     <execution>
-                        <id>dgbuilder createReleaseDir</id>
+                        <id>copy-dgbuilder</id>
                         <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/bin/bash</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh</argument>
-                                <argument>1702</argument>
-                                <argument>dguser</argument>
-                                <argument>change_email_id@dgbuilder.com</argument>
-                            </arguments>
+                            <target>
+                                <copy todir="${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder">
+                                    <fileset dir="${basedir}/../dgbuilder" excludes="target/**"/>
+                                </copy>
+                            </target>
                         </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
-
                     <execution>
                         <id>change shell permissions</id>
                         <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                <argument>-name</argument>
-                                <argument>*.sh</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
+                            <target>
+                                <chmod dir="${basedir}/target/docker-stage/opt/onap/ccsdk" perm="+x" includes="**/*.sh"/>
+                            </target>
                         </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -161,6 +131,42 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <!-- TODO: Need to see alternate for below, so that it can execute on Windows Environment -->
+                            <execution>
+                                <id>dgbuilder-createReleaseDir</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>/bin/bash</executable>
+                                    <arguments>
+                                        <argument>${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh</argument>
+                                        <argument>1702</argument>
+                                        <argument>dguser</argument>
+                                        <argument>change_email_id@dgbuilder.com</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>docker</id>
             <build>
@@ -176,21 +182,19 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.snapshot.version}</tag>
                                             <tag>${project.docker.latestfulltag.snapshot.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
-											<tag>${project.docker.uniquedockertag.snapshot.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
                             <verbose>${docker.verbose}</verbose>
-                            <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus -->
-                            <!-- <skipPush>${docker.skip.push}</skipPush> -->
-                            <skipPush>false</skipPush>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>