X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d1b17b75813b6f247627cf9407dc0b6776ecb7b2;hb=c06db6e74139422b874ce0365842624ecde81f8d;hp=8bcd5ef130b21b6069fbc88798be81de1b843ed5;hpb=b1cc5ba4901b76e9cbc05b3a4a53a7485e619c55;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 8bcd5ef1..d1b17b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,14 +27,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
-	<name>ONAP CLAMP</name>
+	<version>1.1.0</version>
+	<name>clamp</name>
 
-<!-- 	<parent> -->
-<!-- 		<groupId>org.onap.oparent</groupId> -->
-<!-- 		<artifactId>oparent</artifactId> -->
-<!-- 		<version>1.0.0-SNAPSHOT</version> -->
-<!-- 	</parent> -->
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 
 	<description>
            This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code.
@@ -316,6 +316,12 @@
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>sdk-java-camunda-core</artifactId>
 			<version>${sdk.camunda.core}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- Spring Mail -->
 		<dependency>
@@ -360,6 +366,10 @@
 					<artifactId>jackson-databind</artifactId>
 					<groupId>com.fasterxml.jackson.core</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -381,25 +391,45 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.engine</groupId>
-			<artifactId>ControlloopPolicy</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+
+    <dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>1.1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apache-log4j-extras</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+		<dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>sdc</artifactId>
+      <version>1.1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apache-log4j-extras</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -431,6 +461,12 @@
 			<version>2.1.7</version>
 		</dependency>
 
+		<!-- Remove the MYSQL connector and replace it by Mariadb -->
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.1.1</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -644,6 +680,53 @@
 							</buildArgs>
 						</configuration>
 					</execution>
+
+					<execution>
+						<id>tag-image-latest-timestamp</id>
+						<phase>package</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/clamp</image>
+							<newName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+					<execution>
+						<id>push-image-latest-timestamp</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+						</configuration>
+					</execution>
+					<execution>
+						<id>tag-image-latest</id>
+						<phase>package</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/clamp</image>
+							<newName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+					<execution>
+						<id>push-image-latest</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+						</configuration>
+					</execution>
 					<execution>
 						<id>tag-image</id>
 						<phase>package</phase>
@@ -652,7 +735,7 @@
 						</goals>
 						<configuration>
 							<image>onap/clamp</image>
-							<newName>${docker.push.registry}/onap/clamp</newName>
+							<newName>${docker.push.registry}/onap/clamp:latest</newName>
 							<skipDockerTag>${skip.docker.push}</skipDockerTag>
 						</configuration>
 					</execution>
@@ -663,7 +746,7 @@
 							<goal>push</goal>
 						</goals>
 						<configuration>
-							<imageName>${docker.push.registry}/onap/clamp</imageName>
+							<imageName>${docker.push.registry}/onap/clamp:latest</imageName>
 							<skipDockerPush>${skip.docker.push}</skipDockerPush>
 						</configuration>
 					</execution>
@@ -731,6 +814,7 @@
 							</run>
 						</image>
 					</images>
+					<skip>${skipITs}</skip>
 				</configuration>
 
 				<executions>
@@ -823,8 +907,8 @@
 			<properties>
 				<skip.staging.artifacts>true</skip.staging.artifacts>
 				<skip.docker.build>false</skip.docker.build>
-				<skip.docker.tag>true</skip.docker.tag>
-				<skip.docker.push>true</skip.docker.push>
+				<skip.docker.tag>false</skip.docker.tag>
+				<skip.docker.push>false</skip.docker.push>
 			</properties>
 		</profile>
 	</profiles>