Reformat the JSON and fix checkstyle issue

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c1ec0e2..1f61700 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,10 @@
        <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>
+       <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
                <version>1.0.0-SNAPSHOT</version>
@@ -57,6 +57,9 @@
     </description>
 
        <properties>
+               <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
+               <clamp.project.version>${project.version}</clamp.project.version>
+               <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -313,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>
@@ -339,7 +348,7 @@
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>PolicyEngineAPI</artifactId>
-                       <version>1.1.0-SNAPSHOT</version>
+                       <version>1.1.0</version>
                        <exclusions>
                                <exclusion>
                                        <artifactId>log4j</artifactId>
@@ -357,12 +366,16 @@
                                        <artifactId>jackson-databind</artifactId>
                                        <groupId>com.fasterxml.jackson.core</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>mysql</groupId>
+                                       <artifactId>mysql-connector-java</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.common</groupId>
                        <artifactId>ONAP-Logging</artifactId>
-                       <version>1.1.0-SNAPSHOT</version>
+                       <version>1.1.0</version>
                        <exclusions>
                                <exclusion>
                                        <artifactId>log4j</artifactId>
@@ -428,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>
@@ -465,6 +484,22 @@
                </resources>
 
                <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.groovy.maven</groupId>
+                               <artifactId>gmaven-plugin</artifactId>
+                               <version>1.0</version>
+                               <executions>
+                                       <execution>
+                                               <phase>validate</phase>
+                                               <goals>
+                                                       <goal>execute</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
@@ -587,8 +622,9 @@
                                        <dockerDirectory>src/main/docker</dockerDirectory>
                                        <serverId>docker-hub</serverId>
                                        <imageTags>
-                                               <imageTag>${project.version}</imageTag>
                                                <imageTag>latest</imageTag>
+                                               <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
+                                               <imageTag>${project.docker.latesttag.version}</imageTag>
                                        </imageTags>
                                        <forceTags>true</forceTags>
                                        <resources>
@@ -624,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>
@@ -632,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>
@@ -643,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>
@@ -770,22 +853,22 @@
                                                </configuration>
                                        </execution>
                                        <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
+                                               <goals>
+                                                       <goal>merge</goal>
+                                               </goals>
+                                               <phase>post-integration-test</phase>
+                                               <configuration>
+                                                       <fileSets>
+                                                               <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                                                       <directory>${project.build.directory}/coverage-reports</directory>
+                                                                       <includes>
+                                                                               <include>*.exec</include>
+                                                                       </includes>
+                                                               </fileSet>
+                                                       </fileSets>
+                                                       <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                                               </configuration>
+                                       </execution>
                                </executions>
                        </plugin>