Add the target resource ID

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6632806..8d0b053 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
        <groupId>org.onap.clamp</groupId>
        <artifactId>clds</artifactId>
        <version>1.1.0</version>
-       <name>ONAP CLAMP</name>
+       <name>clamp</name>
 
        <parent>
                <groupId>org.onap.oparent</groupId>
@@ -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>
@@ -731,6 +794,7 @@
                                                        </run>
                                                </image>
                                        </images>
+                                       <skip>${skipITs}</skip>
                                </configuration>
 
                                <executions>