X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fadmportal%2Fpom.xml;h=393677033bc62b04d5105ee67c23d05065d97fba;hb=7417a020e0c9bdfe56889d1e9a1c0616e7049fc3;hp=491af9657c6439ff98902d77ee2279d1403c0382;hpb=c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b;p=sdnc%2Foam.git

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 491af965..39367703 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -1,35 +1,52 @@
 <?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/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.openecomp.sdnc.oam</groupId>
-        <artifactId>installation</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.5.10-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.openecomp.sdnc.oam</groupId>
+    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-admportal</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.8.5-SNAPSHOT</version>
 
-    <name>Installation - admportal</name>
+    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates admportal Docker container</description>
 
     <properties>
-        <image.name>openecomp/admportal-sdnc-image</image.name>
+        <image.name>onap/admportal-sdnc-image</image.name>
+        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <ccsdk.docker.version>0.7.3</ccsdk.docker.version>
+        <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>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.16.5</version>
+                <version>0.28.0</version>
                 <inherited>false</inherited>
                 <configuration>
 
@@ -39,10 +56,11 @@
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                <dockerFile>Dockerfile</dockerFile>
                                 <tags>
-                                <tag>${project.version}</tag>
-                                <tag>latest</tag>
+                                    <tag>${project.docker.latestminortag.version}</tag>
+                                    <tag>${project.docker.latestfulltag.version}</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
                                 </tags>
                             </build>
                         </image>
@@ -51,7 +69,7 @@
                 <executions>
                     <execution>
                         <id>generate-images</id>
-                        <phase>generate-sources</phase>
+                        <phase>process-sources</phase>
                         <goals>
                             <goal>build</goal>
                         </goals>
@@ -98,7 +116,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>../src/main/properties</directory>
@@ -111,12 +129,31 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-keystores</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/stores</directory>
+                                    <includes>
+                                        <include>*.p12</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
                 <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
-		<version>1.5.0</version>
+                <version>1.5.0</version>
                 <executions>
                     <execution>
                         <id>Unzip admportal</id>
@@ -128,7 +165,7 @@
                             <executable>/usr/bin/unzip</executable>
                             <arguments>
                                 <argument>-d</argument>
-                                <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
                                 <argument>../../admportal/target/*.zip</argument>
                             </arguments>
                         </configuration>
@@ -144,7 +181,7 @@
                             <executable>/bin/cp</executable>
                             <arguments>
                                 <argument>../../admportal/config/admportal.json</argument>
-                                <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -159,7 +196,7 @@
                             <executable>/bin/cp</executable>
                             <arguments>
                                 <argument>../../admportal/config/admportal.log4js.json</argument>
-                                <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -174,7 +211,7 @@
                         <configuration>
                             <executable>/usr/bin/find</executable>
                             <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
                                 <argument>-name</argument>
                                 <argument>*.sh</argument>
                                 <argument>-exec</argument>