X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fpom.xml;h=da068c33fcb58891ad3d484b886e12eabd78c89b;hb=49aa3b9d1f754af2ff9c11510c00a875c9c3e7d7;hp=19d5ed670ce1c3be504a87846ebe352c5e342363;hpb=3d12536915834869d4b68f101cd3724a54d0dc2a;p=so.git

diff --git a/packages/pom.xml b/packages/pom.xml
index 19d5ed670c..da068c33fc 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,47 +1,37 @@
-<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.so</groupId>
-		<artifactId>so-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.openecomp.so</groupId>
-	<artifactId>packages</artifactId>
-	<packaging>pom</packaging>
-	<name>MSO Packages</name>
-
-
-	<profiles>
-		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
-
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>deliveries</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>docker</id>
-			<modules>
-				<module>deliveries</module>
-				<module>docker</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>with-integration-tests</id>
-			<modules>
-				<module>deliveries</module>
-				<module>docker</module>
-				<module>arquillian-unit-tests</module>
-			</modules>
-		</profile>
-
-	</profiles>
-</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.so</groupId>
+		<artifactId>so</artifactId>
+		<version>1.4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>packages</artifactId>
+	<packaging>pom</packaging>
+	<name>MSO Packages</name>
+
+
+	<profiles>
+		<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
+
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+
+    <!-- Those profile are exclusive, choose docker or with-integration-tests -->
+		<profile>
+			<id>docker</id>
+			<modules>				
+				<module>docker</module>
+			</modules>
+			<properties>
+					<!-- For this profile we probably don't want to skip the docker push (if deploy goal is specified) -->
+					<docker.skip.push>false</docker.skip.push>
+			</properties>
+		</profile>
+	</profiles>
+</project>