From 6f2b2081f589c56f61941edeb58dfbcba0885110 Mon Sep 17 00:00:00 2001
From: biniek <lukasz.biniek@nokia.com>
Date: Mon, 17 Dec 2018 11:18:05 +0100
Subject: pom.xml cleanup

Change-Id: I7622437fbd6d4d4a0b09782c8a6fa2d6016f90ab
Issue-ID: VID-368
Signed-off-by: biniek <lukasz.biniek@nokia.com>
---
 deliveries/pom.xml | 180 ++++++++++++++++++++++++++---------------------------
 1 file changed, 89 insertions(+), 91 deletions(-)

(limited to 'deliveries')

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index f096c2b62..48b588ec5 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,106 +1,104 @@
 <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>
+         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>4.0.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.vid</groupId>
+        <artifactId>vid-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
 
-	<packaging>pom</packaging>
-	<groupId>org.onap.vid</groupId>
-	<artifactId>vid-deliveries</artifactId>
+    <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>
-	</properties>
+    <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>
+    </properties>
 
-	<profiles>
+    <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>
+        <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>
+    </profiles>
 
-	<build>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.16.5</version>
 
-				<configuration>
-					<verbose>true</verbose>
+                <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>4.0-STAGING-latest</tag>
+                                    <tag>latest</tag>
+                                </tags>
 
-					<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>4.0-STAGING-latest</tag>
-								  <tag>latest</tag>
-								</tags>
-								    
-							</build>
-						</image>
-					</images>
-				</configuration>
+                            </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>
+                <executions>
+                    <execution>
+                        <id>generate-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
 
-			</plugin>
+                    <execution>
+                        <id>push-image</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-- 
cgit 1.2.3-korg