X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fpom.xml;h=e36697432f9e8a619807e6aaa3f868185e6140ed;hb=6d50f6aff069772e8302ee626ab19db2d60c9e6c;hp=3dd6666f583891c546f18a9f225fb68454bfc74c;hpb=00e0d25933699f9e39c3f0b86c983165a1e3e330;p=vid.git

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
old mode 100644
new mode 100755
index 3dd6666f5..e36697432
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -1,87 +1,106 @@
-<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.openecomp.vid</groupId>
-		<artifactId>vid-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-
-	<packaging>pom</packaging>
-	<groupId>org.openecomp.vid</groupId>
-	<artifactId>vid-deliveries</artifactId>
-
-	<name>VID Deliveries</name>
-	<description>ECOMP 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>
-
-	<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>
-
-					<apiVersion>1.23</apiVersion>
-					<images>
-						<image>
-							<name>openecomp/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>1.1-STAGING-latest</tag>
-								</tags>
-							</build>
-						</image>
-					</images>
-				</configuration>
-
-				<executions>
-					<execution>
-						<id>generate-image</id>
-						<phase>deploy</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>
-
-			<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>
+<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>1.1.0-SNAPSHOT</version>
+	</parent>
+
+	<packaging>pom</packaging>
+	<groupId>org.onap.vid</groupId>
+	<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>
+
+	<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.16.5</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>4.0-STAGING-latest</tag>
+								  <tag>latest</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>
+
+			<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>