From 9c9f9e2663d0a1adbb00553a4c32f9fb9f0befd2 Mon Sep 17 00:00:00 2001
From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Mon, 20 May 2019 13:58:08 +0200
Subject: Enable integration tests

Due to overriding oparent's configuration in "build/plugins" section
it seems we disabled resolving dependencies and integration-tests couldn't
find junit-jupiter-engine on classpath (test files were found, however
@Test annotation did not mean anything to failsafe plugin).

- also moved plugins-management section lower in build-tree to
follow convention
- prelonged hvves-client-producer test certificates

Change-Id: Iaddd26735e489180eaa0153fdd1322f95bcff36a
Issue-ID: DCAEGEN2-1423
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---
 pom.xml                                            |  77 ++++++++++-----------
 .../producer/ct/src/test/resources/client.p12      | Bin 5175 -> 5175 bytes
 .../producer/ct/src/test/resources/server.p12      | Bin 5175 -> 5175 bytes
 .../producer/ct/src/test/resources/trust.p12       | Bin 2303 -> 1514 bytes
 4 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index f04612d0..d043e132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
   <version>1.2.0-SNAPSHOT</version>
 
   <name>dcaegen2-services-sdk</name>
-  <description>Common SDK repo for all DCAE Services (R4)</description>
+  <description>Common SDK repo for all DCAE Services</description>
   <packaging>pom</packaging>
 
   <licenses>
@@ -39,7 +39,6 @@
     <commons-text.version>1.6</commons-text.version>
     <jetbrains-annotations.version>16.0.3</jetbrains-annotations.version>
     <protoc-jar-maven-plugin.version>3.6.0.2</protoc-jar-maven-plugin.version>
-    <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
   </properties>
 
   <modules>
@@ -50,12 +49,44 @@
   </modules>
 
   <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <!-- minimize console output messages -->
+          <quiet>true</quiet>
+          <verbose>false</verbose>
+          <useStandardDocletOptions>false</useStandardDocletOptions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>aggregate</id>
+            <phase>site</phase>
+            <goals>
+              <goal>aggregate</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>attach-javadoc</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!-- configuration taken intact from oparent -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+    </plugins>
+
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version> 
+          <version>3.1.0</version>
           <configuration>
             <encoding>${project.build.sourceEncoding}</encoding>
           </configuration>
@@ -102,46 +133,8 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- minimize console output messages -->
-          <quiet>true</quiet>
-          <verbose>false</verbose>
-          <useStandardDocletOptions>false</useStandardDocletOptions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>aggregate</id>
-            <phase>site</phase>
-            <goals>
-              <goal>aggregate</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>attach-javadoc</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
+
   <reporting>
     <plugins>
       <plugin>
diff --git a/services/hv-ves-client/producer/ct/src/test/resources/client.p12 b/services/hv-ves-client/producer/ct/src/test/resources/client.p12
index 26b79d77..3105cc9c 100644
Binary files a/services/hv-ves-client/producer/ct/src/test/resources/client.p12 and b/services/hv-ves-client/producer/ct/src/test/resources/client.p12 differ
diff --git a/services/hv-ves-client/producer/ct/src/test/resources/server.p12 b/services/hv-ves-client/producer/ct/src/test/resources/server.p12
index 169ecf34..6f5c81e5 100644
Binary files a/services/hv-ves-client/producer/ct/src/test/resources/server.p12 and b/services/hv-ves-client/producer/ct/src/test/resources/server.p12 differ
diff --git a/services/hv-ves-client/producer/ct/src/test/resources/trust.p12 b/services/hv-ves-client/producer/ct/src/test/resources/trust.p12
index 1ca2f651..bc4ba269 100644
Binary files a/services/hv-ves-client/producer/ct/src/test/resources/trust.p12 and b/services/hv-ves-client/producer/ct/src/test/resources/trust.p12 differ
-- 
cgit 1.2.3-korg