From dc856bba284798fa8f1484abf8fc8140008ececb Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 13 Aug 2018 13:27:52 +0300 Subject: [PATCH] maven improvements and clean up update plugging to latest available versions, remove un needed files from source control clean up commented sections. disable verbose for docker plug in. add logback file for tests to disable out put by default. update logging calls to new api. disable logging on debug level. update docker run to include simulator on demand Change-Id: Icc0fb7add6dd4fe65f5f3d8dd309fd8dae2681fc Issue-ID: SDC-1639 Signed-off-by: Michael Lando --- .gitignore | 1 - asdctool/pom.xml | 10 +- catalog-be/pom.xml | 56 +------ catalog-dao/pom.xml | 8 - catalog-fe/pom.xml | 12 +- catalog-fe/src/test/resources/logback-test.xml | 13 +- catalog-model/pom.xml | 1 - catalog-ui/npm-debug.log.2241131429 | 0 catalog-ui/npm-debug.log.3178739070 | 0 catalog-ui/pom.xml | 183 +-------------------- common-app-api/pom.xml | 1 - .../org/openecomp/sdc/be/config/Configuration.java | 1 + .../sdc/be/monitoring/BeMonitoringService.java | 5 +- .../sdc/common/impl/ConfigFileChangeListener.java | 8 +- .../impl/validator/RequestHeadersValidator.java | 3 +- .../sdc/common/util/YamlToObjectConverter.java | 13 +- .../sdc/exception/AbstractSdncException.java | 5 +- .../sdc/common/datastructure/WrapperTest.java | 2 +- common-be/pom.xml | 16 +- .../notifications-fe/pom.xml | 1 + .../artifacts/logback.xml | 4 +- .../dist/sdc-onboard-backend-docker/pom.xml | 3 - .../dist/sdc-onboard-db-init-docker/pom.xml | 2 - openecomp-ui/yarn.lock | 6 +- pom.xml | 172 +++++++++---------- sdc-os-chef/pom.xml | 20 +-- sdc-os-chef/scripts/docker_run.sh | 64 +++++-- .../activity-spec-api-docs/pom.xml | 1 + .../activity-spec-web/activity-spec-war/pom.xml | 2 + services/activity-spec/activity-spec-web/pom.xml | 1 + services/activity-spec/pom.xml | 1 - test-apis-ci/pom.xml | 60 +------ ui-ci/pom.xml | 57 +------ utils/webseal-simulator/pom.xml | 20 --- 34 files changed, 203 insertions(+), 549 deletions(-) delete mode 100644 catalog-ui/npm-debug.log.2241131429 delete mode 100644 catalog-ui/npm-debug.log.3178739070 diff --git a/.gitignore b/.gitignore index a1b4c0f8dc..4d30906ad9 100644 --- a/.gitignore +++ b/.gitignore @@ -74,7 +74,6 @@ settings.gradle #------------------------------------------------------------ #------------------------------------------------------------ catalog-ui/app/dist/* -catalog-ui/package-lock.json catalog-ui/dist catalog-ui/*.tmp.txt catalog-ui/tests/Coverage/* diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 09e2e186a8..9a6ef22d82 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -512,8 +512,8 @@ ${project.artifactId}-${project.version}-jar-with-dependencies + org.apache.maven.plugins maven-clean-plugin - 3.0.0 clean-static-files @@ -555,7 +555,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true @@ -585,7 +584,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.0 package @@ -619,7 +617,6 @@ ru.yaal.maven write-text-files-maven-plugin - 1.1 UTF-8 @@ -646,7 +643,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-tosca-folder @@ -678,8 +674,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-sdctool @@ -704,9 +700,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - true 1.23 nexus3.onap.org:10001 diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 3a360f7f8d..068eecf53b 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -619,7 +619,6 @@ org.apache.maven.plugins maven-war-plugin - 2.6 WEB-INF\lib\slf4j-log4j*.jar, WEB-INF/classes/elasticsearch.yml, @@ -644,46 +643,10 @@ true - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - compile - - - - copy-installed - install - - copy - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - - - ${project.parent.basedir}/sdc-os-chef/sdc-backend/ - - - - - com.jcabi jcabi-maven-plugin - ${jcabi.plugin.version} + ${jcabi.maven.plugin.version} @@ -714,8 +677,8 @@ + org.apache.maven.plugins maven-clean-plugin - 3.0.0 clean.sdc.backend.folder @@ -782,8 +745,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-static-configuration-files @@ -870,14 +833,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - true - - @@ -900,8 +855,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-resources-apidocs @@ -973,10 +928,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index c6b0e41db1..596278e4b4 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -301,14 +301,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - true - - diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index a5ebc4b719..66f718a111 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -298,7 +298,6 @@ org.apache.maven.plugins maven-war-plugin - 2.6 @@ -318,7 +317,6 @@ org.eclipse.jetty jetty-maven-plugin ${jetty.version} - / @@ -331,7 +329,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true @@ -340,7 +337,7 @@ com.jcabi jcabi-maven-plugin - ${jcabi.plugin.version} + ${jcabi.maven.plugin.version} @@ -350,8 +347,8 @@ + org.apache.maven.plugins maven-clean-plugin - 3.0.0 clean.catalog.fe.folder @@ -446,8 +443,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-resources-fe @@ -478,10 +475,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 diff --git a/catalog-fe/src/test/resources/logback-test.xml b/catalog-fe/src/test/resources/logback-test.xml index 9fc1778eba..d2b9bff23f 100644 --- a/catalog-fe/src/test/resources/logback-test.xml +++ b/catalog-fe/src/test/resources/logback-test.xml @@ -1,2 +1,13 @@ - \ No newline at end of file + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 63f8d12b4f..e1193980b3 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -252,7 +252,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true diff --git a/catalog-ui/npm-debug.log.2241131429 b/catalog-ui/npm-debug.log.2241131429 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/catalog-ui/npm-debug.log.3178739070 b/catalog-ui/npm-debug.log.3178739070 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index c7add36a13..14b3267209 100644 --- a/catalog-ui/pom.xml +++ b/catalog-ui/pom.xml @@ -17,13 +17,9 @@ - - - - + org.apache.maven.plugins maven-clean-plugin - 2.6.1 clean.fe.webapp.folder @@ -49,30 +45,13 @@ - + org.apache.maven.plugins maven-resources-plugin - 2.7 copy-resources @@ -95,8 +74,6 @@ com.github.eirslett frontend-maven-plugin - 1.4 - ${project.parent.basedir} @@ -131,7 +108,7 @@ - install + install --registry ${npm.registry} @@ -149,159 +126,5 @@ - - - - - - CI - - false - - - - - - maven-resources-plugin - 2.7 - - - copy-resources - package - - copy-resources - - - - ${project.parent.basedir}/catalog-fe/src/main/webapp - - - ${project.basedir}/dist - false - - - - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.4.0 - - - - - set.script.permissions - generate-sources - - exec - - - - ${project.basedir} - /bin/chmod - - 755 - ./build_catalog_ui.sh - - - - - - - execute grant build - generate-sources - - exec - - - - ${project.basedir} - ./build_catalog_ui.sh - - - - - - undo.checkout.script - generate-sources - - exec - - - - ${project.basedir} - /usr/bin/git - - checkout - -- - ./build_catalog_ui.sh - - - - - - - - - - - - not-minified - - false - - - - - - maven-resources-plugin - 2.7 - - - copy-resources - package - - copy-resources - - - ${project.parent.basedir}/catalog-fe/src/main/webapp - - - ${project.basedir}/app - - languages/** - scripts/** - styles/** - third-party/** - index.html - robots.txt - favicon.png - - false - - - ${project.basedir} - - bower_components/** - - false - - - - - - - - - - diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 3ad76f376d..7a8077ec7d 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -203,7 +203,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java index b0c377c778..383325c368 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java @@ -1574,6 +1574,7 @@ public class Configuration extends BasicConfiguration { this.resourcesForUpgrade = resourcesForUpgrade; } + @SuppressWarnings("unchecked") public static Map safeGetCapsInsensitiveMap(Map map) { return map == null ? emptyMap() : new CaseInsensitiveMap(map); } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java b/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java index 73358136b5..c29574dd1b 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java @@ -33,6 +33,7 @@ import org.openecomp.sdc.common.http.client.api.HttpRequest; import org.openecomp.sdc.common.http.client.api.HttpResponse; import org.openecomp.sdc.common.http.config.HttpClientConfig; import org.openecomp.sdc.common.http.config.Timeouts; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.monitoring.MonitoringEvent; import org.openecomp.sdc.common.monitoring.MonitoringMetricsFetcher; @@ -99,10 +100,10 @@ public class BeMonitoringService { HttpResponse httpResponse = HttpRequest.post(redirectedUrl, myEntity, new HttpClientConfig(new Timeouts(timeout, timeout))); int beResponseStatus = httpResponse.getStatusCode(); if (beResponseStatus != HttpStatus.SC_OK) { - monitoringLogger.error("Unexpected HTTP response from BE : {}", beResponseStatus); + monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Unexpected HTTP response from BE : {}", beResponseStatus); } } catch (Exception e) { - monitoringLogger.error("Monitoring BE failed with exception ", e); + monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Monitoring BE failed with exception ", e); } } } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java index 3a7ccd774a..e243bac730 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java @@ -23,6 +23,7 @@ package org.openecomp.sdc.common.impl; import org.apache.commons.jci.listeners.FileChangeListener; import org.openecomp.sdc.common.api.BasicConfiguration; import org.openecomp.sdc.common.api.ConfigurationListener; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.YamlToObjectConverter; @@ -64,12 +65,11 @@ public class ConfigFileChangeListener extends FileChangeListener { BasicConfiguration basicConfiguration = yamlToObjectConverter.convert(pFile.getAbsolutePath(), configClass); if (basicConfiguration == null) { - log.warn("Cannot update the listeners for file Change since the file content is invalid"); + log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot update the listeners for file Change since the file content is invalid"); continue; } log.debug("Loaded configuration after converting is {}", basicConfiguration); - // System.out.println("New configuration is " + - // basicConfiguration); + configurationListener.getCallBack().reconfigure(basicConfiguration); @@ -77,7 +77,7 @@ public class ConfigFileChangeListener extends FileChangeListener { } } else { - log.warn("Cannot calculate id from file {}", pFile.getName()); + log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot calculate id from file {}", pFile.getName()); } } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java b/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java index fb9fb1c037..6703b91a60 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java @@ -22,6 +22,7 @@ package org.openecomp.sdc.common.rest.impl.validator; import org.apache.commons.codec.binary.Base64; import org.openecomp.sdc.common.api.Constants; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import javax.servlet.http.HttpServletRequest; @@ -58,7 +59,7 @@ public class RequestHeadersValidator { headersMap.put(requiredHeader, headerVal); log.debug("found header - {} : {}", requiredHeader, headerVal); } else { - log.error("missing identification header: {}", requiredHeader); + log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","missing identification header: {}", requiredHeader); throw new RestRequestValidationException("missing identification header: " + requiredHeader); } } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java index 93160330fd..af46140fc1 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java @@ -29,6 +29,7 @@ import org.openecomp.sdc.be.config.DistributionEngineConfiguration.CreateTopicCo import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionNotificationTopicConfig; import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig; import org.openecomp.sdc.be.config.validation.DeploymentArtifactHeatConfiguration; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.fe.config.Configuration.FeMonitoringConfig; import org.yaml.snakeyaml.TypeDescription; @@ -149,7 +150,7 @@ public class YamlToObjectConverter { config = convert(fullFileName, className); } catch (Exception e) { - log.error("Failed to convert yaml file {} to object.", configFileName,e); + log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", configFileName,e); } return config; @@ -196,7 +197,7 @@ public class YamlToObjectConverter { File f = new File(fullFileName); if (!f.exists()) { - log.warn("The file " + fullFileName + " cannot be found. Ignore reading configuration."); + log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","The file {} cannot be found. Ignore reading configuration.",fullFileName); return null; } in = Files.newInputStream(Paths.get(fullFileName)); @@ -205,7 +206,7 @@ public class YamlToObjectConverter { // System.out.println(config.toString()); } catch (Exception e) { - log.error("Failed to convert yaml file {} to object.", fullFileName, e); + log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", fullFileName, e); } finally { if (in != null) { try { @@ -233,7 +234,7 @@ public class YamlToObjectConverter { config = yaml.loadAs(in, className); } catch (Exception e) { - log.error("Failed to convert yaml file to object", e); + log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object", e); } finally { if (in != null) { try { @@ -253,7 +254,7 @@ public class YamlToObjectConverter { return isValidYaml(decodedFileContents); } - + @SuppressWarnings("unchecked") public boolean isValidYaml(byte[] fileContents) { try { @@ -265,7 +266,7 @@ public class YamlToObjectConverter { } } catch (Exception e) { - log.error("Failed to convert yaml file to object - yaml is invalid", e); + log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object - yaml is invalid", e); return false; } return true; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java b/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java index fada7193ed..e8af079f22 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java @@ -20,6 +20,7 @@ package org.openecomp.sdc.exception; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import java.util.Arrays; @@ -58,11 +59,11 @@ public abstract class AbstractSdncException { } int actualParamsNum = (variables != null) ? variables.length : 0; if (actualParamsNum < expectedParamsNum) { - log.warn( + log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","", "Received less parameters than expected for error with messageId {}, expected: {}, actual: {}. Missing parameters are padded with null values.", messageId, expectedParamsNum, actualParamsNum); } else if (actualParamsNum > expectedParamsNum) { - log.warn( + log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","", "Received more parameters than expected for error with messageId {}, expected: {}, actual: {}. Extra parameters are ignored.", messageId, expectedParamsNum, actualParamsNum); } diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java index 9c18861d40..5f80470b9b 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java @@ -6,7 +6,7 @@ import org.junit.Test; public class WrapperTest { private Wrapper createTestSubject() { - return new Wrapper(null); + return new Wrapper("test"); } diff --git a/common-be/pom.xml b/common-be/pom.xml index 8bae6805de..1b0dcd05b3 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -62,19 +62,5 @@ - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - true - - - - - + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index 12c68237dc..b55be0b47d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -150,6 +150,7 @@ + org.apache.maven.plugins maven-war-plugin 3.0.0 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml index 3ec6e45f3e..b803298bba 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml @@ -4,7 +4,7 @@ - + @@ -331,5 +331,5 @@ - + \ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index 3fb26669cc..e9cbabae74 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -74,10 +74,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index 5101cd0e57..a3da6049cb 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -51,10 +51,8 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - true 1.23 nexus3.onap.org:10001 diff --git a/openecomp-ui/yarn.lock b/openecomp-ui/yarn.lock index 339d84959b..e3dd7fab33 100644 --- a/openecomp-ui/yarn.lock +++ b/openecomp-ui/yarn.lock @@ -9286,9 +9286,9 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -sdc-ui@1.6.53: - version "1.6.53" - resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.53.tgz#acb6faba9a7d5f64702f4a19c4efbc5fae331f63" +sdc-ui@1.6.57: + version "1.6.57" + resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.57.tgz#9250faa279163e13f36bb91c835b8fe78f77ebaf" dependencies: "@angular/common" "~2.4.8" "@angular/core" "~2.4.8" diff --git a/pom.xml b/pom.xml index 5a370f43fe..80246c16c4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,16 +8,7 @@ pom sdc - - 1.8 - 1.8 - - - - - -SNAPSHOT UTF-8 - 74 3.3.2 @@ -62,7 +53,7 @@ 0.20.1 1.8.4 1.7.4 - 0.13.2 + 0.13.2 @@ -78,7 +69,7 @@ 2.18.3 - 1.33 + 1.33 4.12 3.10.0 6.9.10 @@ -102,16 +93,16 @@ nexus + https://registry.npmjs.org/ + https://nexus.onap.org /content/sites/site/org/openecomp/sdc/${project.version} 176c31dfe190a yyyyMMdd'T'HHmmss'Z' - - 0.23.0 ${project.version}-${maven.build.timestamp} - + @@ -179,7 +170,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.0.1 false org.umlgraph.doclet.UmlGraphDoc @@ -203,20 +194,6 @@ jacoco-maven-plugin 0.8.1 - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - org.apache.maven.plugins maven-assembly-plugin @@ -226,12 +203,77 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + 1.6.0 org.sonarsource.scanner.maven sonar-maven-plugin - 3.0.2 + 3.4.1.1168 + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + ru.yaal.maven + write-text-files-maven-plugin + 1.1 + + + org.codehaus.gmaven + gmaven-plugin + 1.5 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + io.fabric8 + docker-maven-plugin + 0.26.0 + + + org.apache.maven.plugins + maven-war-plugin + 3.2.2 + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 @@ -242,7 +284,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 true ${nexus.proxy} @@ -255,10 +296,10 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 parse-version + pre-clean parse-version @@ -289,11 +330,12 @@ org.apache.maven.plugins maven-site-plugin + 3.7.1 org.apache.maven.wagon wagon-webdav-jackrabbit - 2.10 + 3.0.0 @@ -302,7 +344,6 @@ org.codehaus.gmaven gmaven-plugin - 1.4 false @@ -324,55 +365,20 @@ - - - org.codehaus.mojo - license-maven-plugin - 1.10 + org.apache.maven.plugins + maven-compiler-plugin - false - ============LICENSE_START======================================================= - ============LICENSE_END========================================================= - ================================================================================ - ================================================================================ - apache_v2 - 2017 - AT&T Intellectual Property. All rights - reserved. - - SDC - true - true - true - true - false - - **/*.java - **/*.ts - - - **/*.d.ts - - - src - app - server-mock - typings - - - java - + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + + false - - - first - - update-file-header - - - - @@ -384,10 +390,10 @@ true - security-utils - common-app-api onboarding services/activity-spec + security-utils + common-app-api common-be catalog-dao catalog-model diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index ac28c26f1f..a5d69f1697 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -17,8 +17,8 @@ + org.apache.maven.plugins maven-clean-plugin - 3.0.0 clean.tosca.chef.os.folder @@ -56,7 +56,6 @@ ru.yaal.maven write-text-files-maven-plugin - 1.1 UTF-8 @@ -84,14 +83,6 @@ - - - - - - - - docker @@ -99,19 +90,10 @@ - - maven-resources-plugin - 3.0.2 - - - io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index f1a6ee4939..bb6d6005d3 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -45,8 +45,12 @@ fi function usage { - echo "usage: docker_run.sh [ -r|--release ] [ -e|--environment ] [ -p|--port ] [ -l|--local ] [ -t|--runTests ] [ -dcae|--dcae ][ -h|--help ]" - echo "example: sudo bash docker_run.sh -e AUTO -r 1.2-STAGING-latest -dcae" + echo "usage: docker_run.sh [ -r|--release ] [ -e|--environment ] [ -p|--port ] [ -l|--local ] [ -t|--runTests ] [ -sim|--simulator ] [ -ta ] [ -tu ] [ -ta ] [ -tu ] [ -tad ] [ -tu ] [ -dcae|--dcae ][ -h|--help ]" + echo "start dockers built locally example: docker_run.sh -l" + echo "start dockers built locally and simulator example: docker_run.sh -l -sim" + echo "start dockers, pull from onap nexus according to release and simulator example: docker_run.sh -r 1.3-STAGING-latest -sim" + echo "start dockers built locally and run api tests docker example: docker_run.sh -l -tad" + echo "start dockers built locally and run only the catalog be example: docker_run.sh -l -d sdc-BE " } # @@ -180,6 +184,18 @@ function probe_dcae_tools { } # +# check simulator status +function probe_sim { + if lsof -Pi :8285 -sTCP:LISTEN -t >/dev/null ; then + echo "running" + sim_stat=true + else + echo "not running" + sim_stat=false + fi +} +# + function monitor_docker { DOCKER_NAME=$1 @@ -538,7 +554,7 @@ function sdc-ui-tests { if [ ${LOCAL} = false ]; then docker pull ${PREFIX}/sdc-ui-tests:${RELEASE} fi - + RUN_SIMULATOR=true; sdc-sim docker run --detach --name sdc-ui-tests --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${UI_TESTS_JAVA_OPTIONS}" --env SUITE_NAME=${UI_SUITE} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/sdc-ui-tests/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-ui-tests/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5901:5901 --publish 6901:6901 ${PREFIX}/sdc-ui-tests:${RELEASE} echo "please wait while SDC-UI-TESTS is starting....." @@ -551,16 +567,29 @@ function sdc-ui-tests { # SDC-Simulator function sdc-sim { - echo "docker run sdc-webSimulator..." - if [ ${LOCAL} = false ]; then - docker pull ${PREFIX}/sdc-simulator:${RELEASE} - fi + if [ ${RUN_SIMULATOR} = true ]; then + echo "docker run sdc-webSimulator..." + if [ ${LOCAL} = false ]; then + docker pull ${PREFIX}/sdc-simulator:${RELEASE} + fi - probe_sim - if [ sim_stat=false ]; then - docker run --detach --name sdc-sim --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" --env ENVNAME="${DEP_ENV}" ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8285:8080 --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE} - echo "please wait while SDC-WEB-SIMULATOR is starting....." - monitor_docker sdc-sim + probe_sim + sim_stat=$? + if [ sim_stat=1 ]; then + docker run \ + --detach \ + --name sdc-sim \ + --env FE_URL="${FE_URL}" \ + --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" \ + --env ENVNAME="${DEP_ENV}" \ + ${LOCAL_TIME_MOUNT_CMD} \ + --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs \ + --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments \ + --publish 8285:8080 \ + --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE} + echo "please wait while SDC-WEB-SIMULATOR is starting....." + monitor_docker sdc-sim + fi fi } # @@ -628,7 +657,15 @@ while [ $# -gt 0 ]; do shift 1 ; DOCKER=$1; shift 1 ;; - + # -sim | --simulator run the simulator + -sim | --simulator ) + RUN_SIMULATOR=true; + shift 1 ;; + # -sim | --simulator run the simulator + -u | --fe_url ) + shift 1 ; + FE_URL=$1; + shift 1 ;; # -dcae | --dcae - Use this to deploy DCAE upon SDC -dcae | --dcae ) shift 1 ; @@ -684,6 +721,7 @@ if [ -z "${DOCKER}" ]; then dcae-tools dcae-fe healthCheck + sdc-sim sdc-api-tests sdc-ui-tests else diff --git a/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml index a0551cbc49..5ab1458892 100644 --- a/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml +++ b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml @@ -24,6 +24,7 @@ + org.apache.maven.plugins maven-antrun-plugin diff --git a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml index 43fa19f7e1..1102810db9 100644 --- a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml +++ b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml @@ -25,6 +25,7 @@ + org.apache.maven.plugins maven-compiler-plugin @@ -33,6 +34,7 @@ + org.apache.maven.plugins maven-war-plugin ${mvn.war.version} diff --git a/services/activity-spec/activity-spec-web/pom.xml b/services/activity-spec/activity-spec-web/pom.xml index 256e4fb220..c4226b973b 100644 --- a/services/activity-spec/activity-spec-web/pom.xml +++ b/services/activity-spec/activity-spec-web/pom.xml @@ -27,6 +27,7 @@ + org.apache.maven.plugins maven-resources-plugin 3.0.2 diff --git a/services/activity-spec/pom.xml b/services/activity-spec/pom.xml index 2b4aa6cd0f..c39b8f265c 100644 --- a/services/activity-spec/pom.xml +++ b/services/activity-spec/pom.xml @@ -63,7 +63,6 @@ docker-maven-plugin ${mvn.docker.version} - false nexus3.onap.org:10001 diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index d6176342ce..ac3cdd731d 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -34,18 +34,7 @@ org.assertj assertj-core - + org.hamcrest hamcrest-all @@ -93,13 +82,6 @@ compile - - org.openecomp.sdc common-app-api @@ -390,48 +372,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + org.apache.maven.plugins maven-clean-plugin - 3.0.0 - clean.tosca.chef.os.folder + clean.testsuit.folder clean clean - ${project.basedir}/sdc-api-tests @@ -454,7 +406,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true @@ -497,8 +448,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-tests-suites @@ -543,10 +494,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 8efd502391..3295b3bcea 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -240,53 +240,21 @@ compile - - - - - - com.google.inject guice 4.1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - + org.apache.maven.plugins maven-clean-plugin - 3.0.0 clean.tosca.chef.os.folder @@ -318,15 +286,10 @@ org.apache.maven.plugins maven-deploy-plugin - 2.7 true - - - - org.apache.maven.plugins maven-assembly-plugin @@ -350,7 +313,6 @@ - @@ -362,8 +324,8 @@ + org.apache.maven.plugins maven-resources-plugin - 3.0.2 copy-tests-suites @@ -427,10 +389,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 @@ -492,18 +451,6 @@ - - - - - - - - - - - - diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 75eab58366..dbdd1d9581 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -87,22 +87,6 @@ WSSimulator-${project.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - true - - 1.8 - 1.8 - - - - @@ -166,7 +150,6 @@ maven-resources-plugin - 3.0.2 copy-resources-simulator @@ -212,10 +195,7 @@ io.fabric8 docker-maven-plugin - ${fabric8.version} - - true 1.23 nexus3.onap.org:10001 -- 2.16.6