Fix critical SONAR issue
[clamp.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 57eb804..a0b5053 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP CLAMP
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+                              reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END============================================
+  ===================================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+-->
+
 <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>
@@ -7,6 +30,12 @@
        <version>1.0.1-SNAPSHOT</version>
        <name>ONAP CLAMP</name>
 
+       <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.
 
@@ -24,7 +53,7 @@
                                - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
                                - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
                                - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
-           
+
     </description>
 
        <properties>
@@ -51,7 +80,6 @@
 
                <docker.push.registry>localhost:5000</docker.push.registry>
                <skip.docker.build>true</skip.docker.build>
-               <skip.docker.tag>true</skip.docker.tag>
                <skip.docker.push>true</skip.docker.push>
                <skip.staging.artifacts>false</skip.staging.artifacts>
 
                        <artifactId>swagger-annotations</artifactId>
                        <version>1.5.8</version>
                </dependency>
+
                <!-- Camunda Core -->
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                                </exclusion>
                        </exclusions>
                </dependency>
-
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
                <testResources>
                        <testResource>
                                <directory>src/test/resources</directory>
+                               <excludes>
+                                       <exclude>**/*.jks</exclude>
+                               </excludes>
+                               <filtering>true</filtering>
+                       </testResource>
+                       <testResource>
+                               <directory>src/test/resources/https</directory>
                                <includes>
-                                       <include>**/*</include>
+                                       <include>**.jks</include>
                                </includes>
-                               <filtering>true</filtering>
+                               <filtering>false</filtering>
+                               <targetPath>https</targetPath>
                        </testResource>
                </testResources>
                <resources>
                                </includes>
                                <filtering>true</filtering>
                        </resource>
-                       <resource>
-                               <directory>src/main/doxygen</directory>
-                               <includes>
-                                       <include>**/*</include>
-                               </includes>
-                               <filtering>true</filtering>
-                       </resource>
                </resources>
 
-
-
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
-                                       <serverId>ossrhajsc</serverId>
-                                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                                       <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
                                        <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
                                </configuration>
                        </plugin>
                        <plugin>
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.4.11</version>
+                               <version>1.0.0</version>
                                <configuration>
                                        <imageName>onap/clamp</imageName>
                                        <dockerDirectory>src/main/docker</dockerDirectory>
                                                        </buildArgs>
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <id>tag-image</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>tag</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <image>onap/clamp</image>
+                                                       <newName>${docker.push.registry}/onap/clamp</newName>
+                                                       <skipDockerTag>${skip.docker.push}</skipDockerTag>
+                                               </configuration>
+                                       </execution>
                                        <execution>
                                                <id>push-image</id>
                                                <phase>deploy</phase>
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                   <imageName>onap/clamp</imageName>
+                                                   <imageName>${docker.push.registry}/onap/clamp</imageName>
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
 
                                <executions>
                                        <execution>
+                                               <id>integration-tests</id>
                                                <goals>
                                                        <goal>integration-test</goal>
                                                        <goal>verify</goal>
                                                                </volumes>
                                                                <wait>
                                                                        <log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
-                                                                       <time>300000</time>
+                                                                       <time>600000</time>
                                                                </wait>
                                                                <ports>
                                                                        <port>${docker.mariadb.port.host}:3306</port>
                                </configuration>
                                <executions>
                                        <execution>
-                                               <id>jacoco-unit-tests</id>
+                                               <id>pre-unit-test</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                </configuration>
                                        </execution>
                                        <execution>
-                                               <id>jacoco-integration-tests</id>
+                                               <id>pre-integration-test</id>
                                                <phase>pre-integration-test</phase>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </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>
 
                        <properties>
                                <skip.staging.artifacts>true</skip.staging.artifacts>
                                <skip.docker.build>false</skip.docker.build>
+                               <skip.docker.tag>false</skip.docker.tag>
+                               <skip.docker.push>false</skip.docker.push>
                        </properties>
                </profile>
        </profiles>