From 9a699253cf15450615b3df93ed38a492cbd33d3f Mon Sep 17 00:00:00 2001 From: shrikantawachar Date: Fri, 6 Apr 2018 11:07:00 +0530 Subject: [PATCH] Reducing onboarding backend maven build time Reducing onboarding backend maven build time Change-Id: I3fe5f8d6d9b21591018243d16809451c6b8c2d14 Issue-ID: SDC-1189 Signed-off-by: shrikantawachar --- .../pom.xml | 19 --------- .../openecomp-sdc-artifact-generator-core/pom.xml | 10 ----- .../openecomp-sdc-artifact-generator-test/pom.xml | 8 ---- onboarding/pom.xml | 47 +++++++++++++++++++++- .../action-library-rest-services/pom.xml | 22 ---------- .../onboarding-rest-war/pom.xml | 20 --------- .../validation-rest-services/pom.xml | 20 --------- .../vendor-license-rest-services/pom.xml | 9 +---- .../vendor-software-products-rest-services/pom.xml | 20 +-------- .../backend/openecomp-sdc-action-manager/pom.xml | 12 +----- .../pom.xml | 12 ------ .../openecomp-sdc-vendor-license-manager/pom.xml | 12 +----- .../pom.xml | 14 +------ .../impl/ProcessManagerImplTest.java | 1 + .../openecomp-config-lib/pom.xml | 12 +----- .../openecomp-nosqldb-core/pom.xml | 12 +----- openecomp-be/lib/openecomp-heat-lib/pom.xml | 14 +------ .../openecomp-sdc-enrichment-core/pom.xml | 14 +------ .../openecomp-sdc-enrichment-impl/pom.xml | 14 +------ .../openecomp-sdc-orchesrtation-api/pom.xml | 12 ------ .../openecomp-sdc-orchesrtation-core/pom.xml | 12 ------ .../openecomp-sdc-tosca-generator-core/pom.xml | 14 +------ .../openecomp-sdc-translator-core/pom.xml | 14 +------ .../BaseFullTranslationTest.java | 4 +- .../BaseResourceTranslationTest.java | 4 +- .../openecomp-sdc-translator-impl/pom.xml | 16 +------- .../openecomp-sdc-validation-core/pom.xml | 14 +------ .../pom.xml | 14 +------ openecomp-be/lib/openecomp-tosca-lib/pom.xml | 14 +------ .../impl/ToscaFileOutputServiceCsarImplTest.java | 15 +++---- openecomp-be/tools/zusammen-tools/pom.xml | 25 ------------ pom.xml | 2 +- 32 files changed, 74 insertions(+), 378 deletions(-) diff --git a/common/openecomp-common-configuration-management/pom.xml b/common/openecomp-common-configuration-management/pom.xml index 001b719ef1..24b8ded023 100644 --- a/common/openecomp-common-configuration-management/pom.xml +++ b/common/openecomp-common-configuration-management/pom.xml @@ -27,23 +27,4 @@ - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${mvn.compiler.version} - true - - ${java.source} - ${java.target} - - - - - diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml index 43fb6f1648..0830fa6b92 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/pom.xml @@ -87,16 +87,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - - ${project.basedir}/src/test/resources/config/Artifact-Generator.properties - - - org.codehaus.mojo diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml index cd7515a7a1..202028269f 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-test/pom.xml @@ -15,14 +15,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - org.apache.maven.plugins diff --git a/onboarding/pom.xml b/onboarding/pom.xml index f2569a0649..afc452e3a1 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -22,7 +22,7 @@ 0.7.9 2.1 - 2.5.1 + 3.7.0 2.4 1.4.0 2.3.1 @@ -127,6 +127,8 @@ maven-pmd-plugin 3.8 + true + ${project.build.directory}/pmd/pmd.cache false true false @@ -163,7 +165,50 @@ + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + true + + + ${project.build.directory} + + test-classes/** + pmd/** + maven-status/** + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${mvn.surefire.version} + + 0 + true + + ${project.build.directory}/../src/test/resources + + + src/test/resources/logback-test.xml + ${project.basedir}/src/test/resources/config/Artifact-Generator.properties + ${project.basedir}/configuration + + + + + + src/test/resources + + **/* + + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index b275c1a3d0..1a5360f6e0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -116,26 +116,4 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - test/core/unittest/offline/** - - - - - - - - - - - diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index be85dc579d..b95f0715ab 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -191,26 +191,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - test/core/unittest/offline/** - - - - buildNumber - ${buildNumber} - - - - maven-war-plugin ${mvn.war.version} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index 5da8179240..c336b27490 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -121,24 +121,4 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - test/core/unittest/offline/** - - - - - - - - diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 7934900e5d..430fcea705 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -113,14 +113,7 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 0d67b1b1ec..e54e34bdde 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -130,23 +130,5 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - test/core/unittest/offline/** - - - - - - - - + diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml index e61821fd46..c5a59693be 100644 --- a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml @@ -13,17 +13,7 @@ .. - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - - - + diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml index dd690436c4..ccdbbd654a 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml @@ -14,18 +14,6 @@ .. - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - - - - org.openecomp.sdc.core diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 127907f029..3f6ee7a0b4 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -11,17 +11,7 @@ 1.2.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - - - + diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index 659a5ab097..22004c2808 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -214,18 +214,6 @@ 1.2.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImplTest.java index 1df437ef7b..cb2ff421f2 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImplTest.java @@ -267,6 +267,7 @@ public class ProcessManagerImplTest { File actual = processManager.getProcessArtifact(VSP_ID, VERSION, COMPONENT_ID, PROCESS1_ID); Assert.assertNotNull(actual); + actual.delete(); } @Test diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml index 4f9364dabb..bfb42323f5 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml @@ -11,17 +11,7 @@ 1.2.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - - - + diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 99696392d3..9ceba92f7f 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -13,17 +13,7 @@ ../../.. - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - - - + diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 4ba08e925b..ad5cfd74d7 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -64,18 +64,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 37cb38fe09..af1b8fceb7 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -81,17 +81,5 @@ ${project.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index ae308a0241..0e6015236b 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -107,18 +107,6 @@ ${project.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-api/pom.xml b/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-api/pom.xml index dac2e04643..f3ee4de5ff 100644 --- a/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-api/pom.xml @@ -3,18 +3,6 @@ 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"> 4.0.0 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-core/pom.xml index 0779e6219b..695b929543 100644 --- a/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-orchestration-lib/openecomp-sdc-orchesrtation-core/pom.xml @@ -3,18 +3,6 @@ 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"> 4.0.0 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.openecomp.sdc diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml index 8f5afc2d39..6aef2ede47 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml @@ -47,17 +47,5 @@ 2.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - false - true - - - - + \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index f5c8fb0e9e..795d64de64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -69,17 +69,5 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java index 0533961d23..c4a83e01d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java @@ -127,6 +127,7 @@ public class BaseFullTranslationTest { } } assertEquals(0, expectedResultFileNameSet.size()); + translatedZipFile.delete(); } private File translateZipFile(String basePath, HeatToToscaTranslator heatToToscaTranslator) throws IOException { @@ -143,8 +144,7 @@ public class BaseFullTranslationTest { .withId("Validation Error").withCategory(ErrorCategory.APPLICATION).build()); } - File file = new File(path + "/VSP.zip"); - file.createNewFile(); + File file = File.createTempFile("VSP", "zip"); try (FileOutputStream fos = new FileOutputStream(file)) { ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl(); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index e784f94df9..ddc13427a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -158,6 +158,7 @@ public class BaseResourceTranslationTest { } } assertEquals(0, expectedResultFileNameSet.size()); + translatedZipFile.delete(); } private File translateZipFile() throws IOException { @@ -173,8 +174,7 @@ public class BaseResourceTranslationTest { "Error in validation " + getErrorAsString(translatorOutput.getErrorMessages())) .withId("Validation Error").withCategory(ErrorCategory.APPLICATION).build()); } - File file = new File(path + "/" + zipFilename); - file.createNewFile(); + File file = File.createTempFile("VSP", "zip"); try (FileOutputStream fos = new FileOutputStream(file)) { ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl(); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-impl/pom.xml index e89c04c6b0..8b59f02f95 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-impl/pom.xml @@ -48,19 +48,5 @@ ${project.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - - ${project.basedir}/configuration - - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index b483bb477f..01fce0153d 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -83,17 +83,5 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index 8df2c9dfb2..05715e4751 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -121,18 +121,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 8880c2bd07..5138f62899 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -80,18 +80,6 @@ ${sdc-tosca-parser.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - false - true - - - - + diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java index 0910684f3a..445915f4f8 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaFileOutputServiceCsarImplTest.java @@ -111,13 +111,12 @@ public class ToscaFileOutputServiceCsarImplTest { new ToscaServiceModel(heatFiles, definitionsInput, ToscaUtil.getServiceTemplateFileName(mainServiceTemplate)), licenseArtifactsFiles); - String resultFileName = "resultFile.zip"; - File file = new File(resultFileName); + File file = File.createTempFile("resultFile", "zip"); try (FileOutputStream fos = new FileOutputStream(file)) { fos.write(csarFile); } - try (ZipFile zipFile = new ZipFile(resultFileName)) { + try (ZipFile zipFile = new ZipFile(file)) { Enumeration entries = zipFile.entries(); @@ -126,10 +125,9 @@ public class ToscaFileOutputServiceCsarImplTest { count++; entries.nextElement(); } - Assert.assertEquals(7, count); } - Files.delete(Paths.get(file.getPath())); + Files.delete(Paths.get(file.getAbsolutePath())); } @Test @@ -152,13 +150,12 @@ public class ToscaFileOutputServiceCsarImplTest { null); - String resultFileName = "resultFile.zip"; - File file = new File(resultFileName); + File file = File.createTempFile("resultFile", "zip"); try (FileOutputStream fos = new FileOutputStream(file)) { fos.write(csarFile); } - try (ZipFile zipFile = new ZipFile(resultFileName)) { + try (ZipFile zipFile = new ZipFile(file)) { Enumeration entries = zipFile.entries(); @@ -170,6 +167,6 @@ public class ToscaFileOutputServiceCsarImplTest { Assert.assertEquals(2, count); } - Files.delete(Paths.get(file.getPath())); + Files.delete(Paths.get(file.getAbsolutePath())); } } diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 1d7d66ed10..aef0eb73ad 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -82,20 +82,6 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - true - - 1.8 - 1.8 - - - org.codehaus.mojo license-maven-plugin @@ -194,17 +180,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - false - true - - - - org.apache.maven.plugins maven-antrun-plugin diff --git a/pom.xml b/pom.xml index 348ffcc4e9..d1104a16fd 100644 --- a/pom.xml +++ b/pom.xml @@ -383,7 +383,6 @@ build-tools - onboarding security-utils common-app-api common-be @@ -397,6 +396,7 @@ ui-ci sdc-os-chef utils/webseal-simulator + onboarding -- 2.16.6