Fix for Penetration test _ Session and cookie management

[vid.git] / deliveries / pom.xml

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index e0aa7e0..57b9a49 100755 (executable)
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,88 +1,102 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.openecomp.vid</groupId>\r
-               <artifactId>vid-parent</artifactId>\r
-               <version>1.0.0</version>\r
-       </parent>\r
-\r
-       <packaging>pom</packaging>\r
-       <groupId>org.openecomp.vid</groupId>\r
-       <artifactId>vid-deliveries</artifactId>\r
-\r
-       <name>VID Deliveries</name>\r
-       <description>ECOMP VID Deliveries</description>\r
-       <properties>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <docker.push.registry>${docker_registry}</docker.push.registry>\r
-               <docker.verbose>true</docker.verbose>\r
-       </properties>\r
-\r
-       <build>\r
-               <finalName>${project.artifactId}-${project.version}</finalName>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>io.fabric8</groupId>\r
-                               <artifactId>docker-maven-plugin</artifactId>\r
-                               <version>0.16.5</version>\r
-\r
-                               <configuration>\r
-                                       <verbose>true</verbose>\r
-\r
-                                       <apiVersion>1.23</apiVersion>\r
-                                       <images>\r
-                                               <image>\r
-                                                       <name>openecomp/vid:${project.version}</name>\r
-                                                       <build>\r
-                                                               <cleanup>remove</cleanup>\r
-                                                               <dockerFileDir>docker-files</dockerFileDir>\r
-                                                               <assembly>\r
-                                                                       <basedir>/</basedir>\r
-                                                                       <user>vidadmin:vidadmin:vidadmin</user>\r
-                                                                       <descriptor>assembly/assembly-for-plugin.xml</descriptor>\r
-                                                               </assembly>\r
-                                                               <tags>\r
-                                                                 <tag>1.1-STAGING-latest</tag>\r
-                                                               </tags>\r
-                                                                   \r
-                                                       </build>\r
-                                               </image>\r
-                                       </images>\r
-                               </configuration>\r
-\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>generate-image</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>build</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                                       \r
-                                       <execution>\r
-                                               <id>push-image</id>\r
-                                               <phase>deploy</phase>\r
-                                               <goals>\r
-                                                       <goal>build</goal>\r
-                                                       <goal>push</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-deploy-plugin</artifactId>\r
-                               <version>2.8</version>\r
-                               <configuration>\r
-                                       <skip>true</skip>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-\r
-</project>\r
+<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.vid</groupId>
+        <artifactId>vid-parent</artifactId>
+        <version>8.0.2-SNAPSHOT</version>
+    </parent>
+
+    <packaging>pom</packaging>
+    <artifactId>vid-deliveries</artifactId>
+
+    <name>VID Deliveries</name>
+    <description>ONAP VID Deliveries</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <docker.push.registry>${docker_registry}</docker.push.registry>
+        <docker.verbose>true</docker.verbose>
+        <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
+        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+    </properties>
+
+    <profiles>
+
+        <profile>
+            <id>docker-proxy</id>
+            <!-- activate profile if environment variable `http_proxy` is set -->
+            <activation>
+                <property>
+                    <name>env.http_proxy</name>
+                </property>
+            </activation>
+            <properties>
+                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
+            </properties>
+        </profile>
+
+    </profiles>
+
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.28.0</version>
+
+                <configuration>
+                    <verbose>true</verbose>
+                    <apiVersion>1.23</apiVersion>
+                    <images>
+                        <image>
+                            <name>onap/vid:${project.version}</name>
+                            <build>
+                                <cleanup>remove</cleanup>
+                                <dockerFileDir>docker-files</dockerFileDir>
+                                <assembly>
+                                    <basedir>/</basedir>
+                                    <user>vidadmin:vidadmin:vidadmin</user>
+                                    <descriptor>assembly/assembly-for-plugin.xml</descriptor>
+                                </assembly>
+                                <tags>
+                                    <tag>7.0-STAGING-latest</tag>
+                                    <tag>latest</tag>
+                                    <tag>${docker.tag}</tag>
+                                    <tag>${docker.latest.tag}</tag>
+                                </tags>
+
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>generate-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>push-image</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>