From 9c9f9e2663d0a1adbb00553a4c32f9fb9f0befd2 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Mon, 20 May 2019 13:58:08 +0200 Subject: [PATCH] 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 --- 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 @@ 1.2.0-SNAPSHOT dcaegen2-services-sdk - Common SDK repo for all DCAE Services (R4) + Common SDK repo for all DCAE Services pom @@ -39,7 +39,6 @@ 1.6 16.0.3 3.6.0.2 - 2.21.0 @@ -50,12 +49,44 @@ + + + maven-javadoc-plugin + + + true + false + false + + + + aggregate + site + + aggregate + + + + attach-javadoc + + jar + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.1.0 ${project.build.sourceEncoding} @@ -102,46 +133,8 @@ - - - maven-javadoc-plugin - - - true - false - false - - - - aggregate - site - - aggregate - - - - attach-javadoc - - jar - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - - integration-test - verify - - - - - + 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 26b79d77fae7bd728f37a222b38f59ea25a039ab..3105cc9c46c10dd413320865b0f03bb2d98ce437 100644 GIT binary patch delta 5029 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 delta 5029 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 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 169ecf3403d00c696bfef4e387da4e2a9c63e69e..6f5c81e517a51b7a347658b6ff84d7c0692038b2 100644 GIT binary patch delta 5029 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 Qhn>P1sUSOX0s{etpe~cvUH||9 literal 2303 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 RFRS$hKUv`phJfM={{pnIH5&i` -- 2.16.6