From 9a699253cf15450615b3df93ed38a492cbd33d3f Mon Sep 17 00:00:00 2001 From: shrikantawachar Date: Fri, 6 Apr 2018 11:07:00 +0530 Subject: Reducing onboarding backend maven build time Reducing onboarding backend maven build time Change-Id: I3fe5f8d6d9b21591018243d16809451c6b8c2d14 Issue-ID: SDC-1189 Signed-off-by: shrikantawachar --- .../lib/openecomp-core-lib/openecomp-config-lib/pom.xml | 12 +----------- .../openecomp-nosqldb-lib/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 +------------- .../resourcetranslation/BaseFullTranslationTest.java | 4 ++-- .../resourcetranslation/BaseResourceTranslationTest.java | 4 ++-- .../openecomp-sdc-translator-impl/pom.xml | 16 +--------------- .../openecomp-sdc-validation-core/pom.xml | 14 +------------- .../openecomp-sdc-vendor-software-product-core/pom.xml | 14 +------------- openecomp-be/lib/openecomp-tosca-lib/pom.xml | 14 +------------- .../impl/ToscaFileOutputServiceCsarImplTest.java | 15 ++++++--------- 16 files changed, 21 insertions(+), 178 deletions(-) (limited to 'openecomp-be/lib') 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())); } } -- cgit 1.2.3-korg