FIx the POM for HTTPS param and jks file in test
There was an error for the HTTPS test because the keystore was filtered
by maven + remove some useless stuffs + add some execution ID as defined
in the oparent
Change-Id: I3a299bd9790ae2e3db8dca82722bad1ad4f8c284
Issue-Id: CLAMP-43
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
diff --git a/pom.xml b/pom.xml
index 7cd9873..99d6e13 100644
--- 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,7 +30,7 @@
<version>1.0.1-SNAPSHOT</version>
<name>ONAP CLAMP</name>
- <parent>
+ <parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -290,6 +313,7 @@
<artifactId>swagger-annotations</artifactId>
<version>1.5.8</version>
</dependency>
+
<!-- Camunda Core -->
<dependency>
<groupId>com.att.ajsc</groupId>
@@ -379,7 +403,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -419,11 +442,19 @@
<testResources>
<testResource>
<directory>src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
+ <excludes>
+ <exclude>**/*.jks</exclude>
+ </excludes>
<filtering>true</filtering>
</testResource>
+ <testResource>
+ <directory>src/test/resources/https</directory>
+ <includes>
+ <include>**.jks</include>
+ </includes>
+ <filtering>false</filtering>
+ <targetPath>https</targetPath>
+ </testResource>
</testResources>
<resources>
<resource>
@@ -437,17 +468,8 @@
</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>
@@ -627,7 +649,7 @@
<goal>push</goal>
</goals>
<configuration>
- <imageName>${docker.push.registry}/onap/clamp</imageName>
+ <imageName>${docker.push.registry}/onap/clamp</imageName>
<skipDockerPush>${skip.docker.push}</skipDockerPush>
</configuration>
</execution>
@@ -650,6 +672,7 @@
<executions>
<execution>
+ <id>integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
@@ -732,7 +755,7 @@
</configuration>
<executions>
<execution>
- <id>jacoco-unit-tests</id>
+ <id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
@@ -742,7 +765,7 @@
</configuration>
</execution>
<execution>
- <id>jacoco-integration-tests</id>
+ <id>pre-integration-test</id>
<phase>pre-integration-test</phase>
<goals>
<goal>prepare-agent</goal>
@@ -753,22 +776,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>