X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=ansible-server%2Fpom.xml;h=2def387287ed4f1c0dcdbbe983eec7eba32ed367;hp=5cbc3ec253b99d72f81eb93e5a29c1dc72f06697;hb=refs%2Fheads%2Fmaster;hpb=18c809d6bae7340825dc58871a871074fd02ce22

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 5cbc3ec2..2def3872 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -1,35 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0</version>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-root</artifactId>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>ansible-server</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>1.6.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>ccsdk :: distribution :: ${project.artifactId}</name>
+    <name>ccsdk-distribution :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/ccsdk-ansible-server-image</image.name>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-	<ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
-        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+		<ccsdk.project.version>${project.version}</ccsdk.project.version>
+		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+		<ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <docker.verbose>true</docker.verbose>
+        <docker.skip.push>false</docker.skip.push>
     </properties>
 
-
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -37,22 +42,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                println project.properties['ccsdk.project.version'];
-                                def versionArray;
-                                if ( project.properties['ccsdk.project.version'] != null ) {
-                                versionArray = project.properties['ccsdk.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-                                {
-                                project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                } else {
-                                project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                }
-
-                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-                            </source>
+                            <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -72,49 +62,29 @@
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/docker</directory>
-                                    <includes>
-                                        <include>Dockerfile</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>copy-scripts</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts</directory>
+                                    <directory>src/main</directory>
                                     <includes>
-                                        <include>*</include>
+                                        <include>**/*</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
-                        <id>copy-yml</id>
+                        <id>copy-certificates</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/yml</directory>
+                                    <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>*</include>
+                                        <include>*.pem</include>
+                                        <include>*.md</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -123,52 +93,28 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.5.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>change python permissions</id>
+                        <id>change-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>*.py</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
+                            <target>
+                                <chmod perm="+x" type="file">
+                                    <fileset dir="${basedir}/target/docker-stage/ansible-server">
+                                        <include name="**/*.py"/>
+                                        <include name="**/*.sh"/>
+                                    </fileset>
+                                </chmod>
+                            </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>
-						</configuration>
-					</execution>
                 </executions>
             </plugin>
         </plugins>
@@ -182,7 +128,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -190,29 +136,23 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>generate-images</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
+                                <id>build-push-images</id>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
@@ -224,7 +164,4 @@
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>