X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fueb-listener%2Fpom.xml;h=4f6ec4188a4ee97e257a0ae7d76f62e5360e743d;hb=55378e7480442b8cee46d215a85e194c56b38f36;hp=722840b1cdf0598507c748e1fa6cf778b8d7f3c0;hpb=1259ff85a7be548471f49298959929e3791ca8d1;p=sdnc%2Foam.git

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 722840b1..4f6ec418 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -1,35 +1,37 @@
 <?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.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <artifactId>installation-ueb-listener</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Installation - ueb-listener</name>
+    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
-        <ccsdk.project.version>0.1.0-SNAPSHOT</ccsdk.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
-
-
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -37,30 +39,11 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                println project.properties['sdnc.project.version'];
-                                def versionArray;
-                                if ( project.properties['sdnc.project.version'] != null ) {
-                                    versionArray = project.properties['sdnc.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['sdnc.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}/../TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
@@ -84,7 +67,6 @@
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-scripts</id>
                         <goals>
@@ -99,12 +81,11 @@
                                     <includes>
                                         <include>*.sh</include>
                                     </includes>
-                                    <filtering>false</filtering>
+                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-properties</id>
                         <goals>
@@ -119,12 +100,11 @@
                                     <includes>
                                         <include>*</include>
                                     </includes>
-                                    <filtering>false</filtering>
+                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
-
                 </executions>
             </plugin>
             <plugin>
@@ -139,25 +119,41 @@
                         <phase>initialize</phase>
                         <configuration>
                             <artifactItems>
-                              <artifactItem>
-                                <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                                <artifactId>ueb-listener</artifactId>
-                                <type>zip</type>
-                                <version>${ccsdk.project.version}</version>
-                              </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+                                    <artifactId>ueb-listener</artifactId>
+                                    <type>zip</type>
+                                    <version>${ccsdk.sli.northbound.version}</version>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener</outputDirectory>
-                            <excludes>bin/**</excludes>
+                            <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes>
                             <overWriteReleases>true</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>change-shell-permissions</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <chmod dir="${basedir}/target/docker-stage/opt/onap/sdnc" perm="+x" includes="**/*.sh"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-
     </build>
 
     <profiles>
@@ -168,7 +164,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>
@@ -176,29 +172,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>
@@ -210,7 +200,4 @@
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>