X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=1f61700bd7323231b6956508b47c6ba38db6a2b6;hb=af0fbf9edb92544380d40ab2cffb87c89831944f;hp=8bcd5ef130b21b6069fbc88798be81de1b843ed5;hpb=2af0691f0691ec96711103f5456bcea22ba76e36;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 8bcd5ef1..1f61700b 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>
@@ -431,6 +441,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 +660,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 +715,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 +726,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>
@@ -823,8 +886,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>