From e9171113772c0c7dc3f7514ffd0660d1e0f8ef02 Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 26 Nov 2021 15:57:50 +0000 Subject: Revert accidentally formatted POMs Change-Id: I17ee875dcc2c63d6014c68345113df76cb2aa9b9 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3757 --- catalog-be/pom.xml | 1208 ++++++++++---------- catalog-fe/pom.xml | 618 +++++----- onboarding/pom.xml | 322 +++--- .../backend/openecomp-sdc-security-util/pom.xml | 44 +- pom.xml | 860 +++++++------- utils/webseal-simulator/pom.xml | 235 ++-- 6 files changed, 1639 insertions(+), 1648 deletions(-) diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 97cd8b6df0..befbad13b2 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -1,748 +1,452 @@ - - catalog-be + 4.0.0 - - catalog-be - - - - - lifecycle-mapping - - - - - - download-maven-plugin - - wget - - com.googlecode.maven-download-plugin - [1.2.1,) - - + catalog-be + war - - - - - - jcabi-maven-plugin - - ajc - - com.jcabi - [0.0,) - - + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + - - - - org.eclipse.m2e - 1.0.0 - - - + + 2.0.0.0 + ${swagger-core-mvn-plugin.version} + 3.25.0 + 3.2.0 + 1.5.3 + - - - maven-surefire-plugin - - 1C - false - - org.apache.maven.plugins - - - - maven-dependency-plugin - - - - - - swagger-ui - org.webjars - ${swagger-ui.version} - - - ${project.build.directory}/swagger-ui - - - unpack - - prepare-package - - - ${maven-dependency-plugin.version} - - - - replacer - - - ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html - - - - https://petstore.swagger.io/v2/swagger.json - /sdc/openapi.json - - - - - - - replace - - prepare-package - - - com.google.code.maven-replacer-plugin - ${replacer.plugin.version} - - - maven-war-plugin - - - - true - true - - - ${project.version} - - - true - WEB-INF\lib\slf4j-log4j*.jar, - WEB-INF/classes/elasticsearch.yml, - WEB-INF/classes/portal.properties - - - - - ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version} - - - **/*.* - - swagger-ui - - - - org.apache.maven.plugins - - - yaml-json-validator-maven-plugin - - - - ${skipYamlJsonValidator} - - - - - src/test/resources/artifacts/pnfSoftwareInformation/** - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - - - validate - - validate - validate - - - com.github.sylvainlaurent.maven - - - jcabi-maven-plugin - - - aspectjtools - org.aspectj - ${aspectj.version} - - - aspectjweaver - org.aspectj - ${aspectj.version} - - - - - - ajc - - - - com.jcabi - ${jcabi.maven.plugin.version} - - - maven-assembly-plugin - - - - false - - src/main/assembly/normatives.xml - - normatives - - - single - - normatives - prepare-package - - - org.apache.maven.plugins - - - maven-clean-plugin - - - - - - - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default - - false - - normatives.tar.gz - - - - - - clean - - clean.sdc.backend.folder - clean - - - org.apache.maven.plugins - - - swagger-maven-plugin - - - - - ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml - - sdce-2-sdce-5 - swagger-sdce-2-sdce-5 - JSON - ${project.build.directory}/generated/swagger - ${swagger.skip} - - - resolve - - sdce-2-sdce-5 - compile - - - - - ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml - - sdce-4 - swagger-sdce-4 - JSON - ${project.build.directory}/generated/swagger - ${swagger.skip} - - - resolve - - sdce-4 - compile - - - - - ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml - - sdce-6 - swagger-sdce-6 - JSON - ${project.build.directory}/generated/swagger - ${swagger.skip} - - - resolve - - sdce-6 - compile - - - - - ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml - - sdce-7 - swagger-sdce-7 - JSON - ${project.build.directory}/generated/swagger - ${swagger.skip} - - - resolve - - sdce-7 - compile - - - io.swagger.core.v3 - ${swagger-core-mvn-plugin.version} - - - - + org.openecomp.sdc togglz-rest-services + ${project.version} - woodstox-core com.fasterxml.woodstox + woodstox-core - org.openecomp.sdc - ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core ${jackson.version} + com.fasterxml.jackson.dataformat jackson-dataformat-yaml + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.dataformat - ${jackson.version} + com.fasterxml.jackson.core jackson-databind + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - ${jackson.version} - onap-generic-artifact-browser-service org.onap.sdc.common - compile + onap-generic-artifact-browser-service ${project.version} + compile + io.swagger.core.v3 swagger-jaxrs2 + ${swagger.version} - jackson-core com.fasterxml.jackson.core + jackson-core - io.swagger.core.v3 - ${swagger.version} - swagger-annotations io.swagger.core.v3 + swagger-annotations ${swagger.version} - hibernate-validator org.hibernate.validator + hibernate-validator ${hibernate.validator.version} + org.openecomp.sdc common-app-api + ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core - org.openecomp.sdc - ${project.version} - javax.ws.rs-api javax.ws.rs + javax.ws.rs-api ${ws.rs.version} + org.openecomp.sdc.be common-be + ${project.version} + compile - spring-core org.springframework + spring-core - org.openecomp.sdc.be - compile - ${project.version} + org.openecomp.sdc.be common-be + ${project.version} + test-jar + test - spring-core org.springframework + spring-core - org.openecomp.sdc.be - test - test-jar - ${project.version} + org.openecomp.sdc.be catalog-dao + ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core - org.openecomp.sdc.be - ${project.version} + org.openecomp.sdc.be catalog-model + ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core - org.openecomp.sdc.be - ${project.version} - logback-classic ch.qos.logback - compile + logback-classic ${logback.version} + compile - snakeyaml org.yaml - compile + snakeyaml ${snakeyaml.version} + compile + org.apache.commons commons-jci-core + ${commons-jci-core.version} + compile - commons-io commons-io + commons-io - org.apache.commons - compile - ${commons-jci-core.version} - gson com.google.code.gson - compile + gson ${gson.version} + compile + org.glassfish.jersey.media jersey-media-json-jackson + ${jersey-bom.version} - jackson-core com.fasterxml.jackson.core + jackson-core - org.glassfish.jersey.media - ${jersey-bom.version} - jersey-container-servlet-core org.glassfish.jersey.containers - compile + jersey-container-servlet-core ${jersey-bom.version} + compile - jersey-media-multipart org.glassfish.jersey.media - compile + jersey-media-multipart ${jersey-bom.version} + compile + org.glassfish.jersey.ext jersey-spring4 + ${jersey-bom.version} - spring-web org.springframework + spring-web - spring-beans org.springframework + spring-beans - spring-core org.springframework + spring-core - spring-aop org.springframework + spring-aop - spring-context org.springframework + spring-context - hibernate-validator org.hibernate + hibernate-validator - org.glassfish.jersey.ext - ${jersey-bom.version} - asm-all-repackaged org.glassfish.hk2.external + asm-all-repackaged + org.glassfish.jersey.ext jersey-bean-validation - hibernate-validator org.hibernate + hibernate-validator - org.glassfish.jersey.ext - httpclient org.apache.httpcomponents - compile + httpclient ${httpclient.version} + compile - httpcore org.apache.httpcomponents - compile + httpcore ${httpcore.version} + compile - commons-logging commons-logging - compile + commons-logging ${commons-logging} + compile - commons-codec commons-codec - compile + commons-codec ${commons-codec} + compile - javax.servlet-api javax.servlet - provided + javax.servlet-api ${servlet-api.version} + provided - org.eclipse.jgit org.eclipse.jgit + org.eclipse.jgit 3.4.1.201406201815-r - spring-core org.springframework - compile + spring-core ${spring.version} + compile + org.springframework spring-context + ${spring.version} + compile - spring-expression org.springframework + spring-expression - spring-core org.springframework + spring-core - org.springframework - compile - ${spring.version} + org.springframework spring-web + ${spring.version} + compile - spring-core org.springframework + spring-core - org.springframework - compile - ${spring.version} + org.springframework spring-webmvc + ${spring.version} + compile - spring-expression org.springframework + spring-expression - spring-core org.springframework + spring-core - spring-web org.springframework + spring-web - org.springframework - compile - ${spring.version} + org.springframework spring-aop + ${spring.version} + compile - spring-core org.springframework + spring-core - org.springframework - compile - ${spring.version} - spring-beans org.springframework - compile + spring-beans ${spring.version} + compile - spring-expression org.springframework - compile + spring-expression ${spring.version} + compile - togglz-spring-web org.togglz + togglz-spring-web ${togglz.version} - janino org.codehaus.janino - compile + janino ${janino.version} + compile - commons-compiler org.codehaus.janino - compile + commons-compiler ${janino.version} + compile - guava com.google.guava - compile + guava ${guava.version} + compile + org.janusgraph janusgraph-core + ${janusgraph.version} + compile gremlin-groovy org.apache.tinkerpop - json org.json + json slf4j-log4j12 @@ -753,37 +457,37 @@ commons-collections - libthrift org.apache.thrift + libthrift - commons-io commons-io + commons-io - commons-codec commons-codec + commons-codec - dom4j dom4j + dom4j - org.janusgraph - compile - ${janusgraph.version} + org.janusgraph janusgraph-cql + ${janusgraph.version} + compile - slf4j-log4j12 org.slf4j + slf4j-log4j12 - json org.json + json commons-collections @@ -794,136 +498,136 @@ org.codehaus.groovy - netty-all io.netty + netty-all - org.janusgraph - compile - ${janusgraph.version} - commons-lang3 org.apache.commons - compile + commons-lang3 ${lang3.version} + compile - json-simple com.googlecode.json-simple - compile + json-simple ${json-simple.version} + compile - functionaljava org.functionaljava - compile + functionaljava ${functionaljava.version} + compile - jcabi-aspects com.jcabi - compile + jcabi-aspects ${jcabi.version} + compile - aspectjrt org.aspectj - compile + aspectjrt ${aspectjrt.version} + compile + com.att.nsa cambriaClient + 1.2.1-oss + compile - saClientLibrary com.att.nsa + saClientLibrary - com.att.nsa - compile - 1.2.1-oss - json org.json - compile + json 20131018 + compile - cassandra-driver-core com.datastax.cassandra - compile + cassandra-driver-core ${cassandra.driver.version} + compile - cassandra-driver-mapping com.datastax.cassandra - compile + cassandra-driver-mapping ${cassandra.driver.version} + compile + org.owasp.esapi esapi + ${org.owasp.esapi.version} - xercesImpl xerces + xercesImpl - log4j log4j + log4j - commons-fileupload commons-fileupload + commons-fileupload - xmlgraphics-commons org.apache.xmlgraphics + xmlgraphics-commons - xml-apis-ext xml-apis + xml-apis-ext - xml-apis xml-apis + xml-apis - org.owasp.esapi - ${org.owasp.esapi.version} + org.onap.portal.sdk epsdk-fw + ${ecomp.version} + compile - cambriaClient com.att.nsa + cambriaClient slf4j-log4j12 org.slf4j - aaf-cadi-aaf org.onap.aaf.authz + aaf-cadi-aaf aaf-cadi-core @@ -938,71 +642,71 @@ log4j - org.onap.portal.sdk - compile - ${ecomp.version} - jetty-http org.eclipse.jetty - compile + jetty-http ${jetty.version} + compile + org.eclipse.jetty jetty-proxy + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} + org.eclipse.jetty jetty-servlets + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - jetty-continuation org.eclipse.jetty + jetty-continuation - org.eclipse.jetty - compile - ${jetty.version} + org.fusesource sigar + ${sigar.version} + compile - log4j log4j + log4j - org.fusesource - compile - ${sigar.version} + org.onap.dmaap.messagerouter.dmaapclient dmaapClient + 1.1.3 + compile - dme2 com.att.aft + dme2 - jackson-core com.fasterxml.jackson.core + jackson-core log4j @@ -1013,280 +717,591 @@ log4j - org.onap.dmaap.messagerouter.dmaapclient - compile - 1.1.3 + com.att.aft dme2 + 3.1.200-oss - jms javax.jms + jms - com.att.aft - 3.1.200-oss + org.onap.aaf.authz aaf-cadi-aaf + ${cadi.version} - cassandra-driver-core com.datastax.cassandra + cassandra-driver-core - slf4j-log4j12 org.slf4j + slf4j-log4j12 log4j log4j - org.onap.aaf.authz - ${cadi.version} - assertj-core org.assertj + assertj-core test + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-bundle + ${jersey-bom.version} + pom + test - jetty-server org.eclipse.jetty + jetty-server - jetty-continuation org.eclipse.jetty + jetty-continuation - org.glassfish.jersey.test-framework.providers - test - pom - ${jersey-bom.version} - jersey-client org.glassfish.jersey.core + jersey-client ${jersey-bom.version} + org.eclipse.jetty jetty-webapp + ${jetty.version} + test - jetty-servlet org.eclipse.jetty + jetty-servlet - org.eclipse.jetty - test - ${jetty.version} - hamcrest org.hamcrest - test + hamcrest ${hamcrest.version} + test - hamcrest-library org.hamcrest - test + hamcrest-library ${hamcrest.version} + test - junit-jupiter-api org.junit.jupiter - test + junit-jupiter-api ${junitJupiter.version} + test - junit-jupiter org.junit.jupiter - test + junit-jupiter ${junitJupiter.version} + test - junit-platform-commons org.junit.platform - test + junit-platform-commons ${junit.platform.version} + test - junit-platform-engine org.junit.platform - test + junit-platform-engine ${junit.platform.version} + test - mockito-junit-jupiter org.mockito - test + mockito-junit-jupiter ${mockitoJupiter.version} + test - spring-test org.springframework - test + spring-test ${spring.version} + test + org.springframework spring-tx + ${spring.version} - spring-core org.springframework + spring-core - org.springframework - ${spring.version} - cucumber-java io.cucumber - test + cucumber-java ${cucumber.version} + test - cucumber-junit io.cucumber - test + cucumber-junit ${cucumber.version} + test - jmockit org.jmockit - test + jmockit ${jmockit.version} + test - bean-matchers com.google.code.bean-matchers - test + bean-matchers 0.11 + test - groovy org.codehaus.groovy + groovy ${groovy.version} - netty-handler io.netty + netty-handler + org.onap.sdc.common onap-tosca-datatype + ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core - org.onap.sdc.common - ${project.version} - commons-collections4 org.apache.commons + commons-collections4 ${commons.collections.version} + org.onap.sdc.sdc-be-common security-util-lib + ${security.util.lib.version} - spring-boot-starter-logging org.springframework.boot + spring-boot-starter-logging - org.onap.sdc.sdc-be-common - ${security.util.lib.version} + org.openecomp.sdc.core openecomp-tosca-lib + ${project.version} - jackson-core com.fasterxml.jackson.core + jackson-core - spring-core org.springframework + spring-core - org.openecomp.sdc.core - ${project.version} + org.onap.vnfsdk.validation validation-pmdictionary + ${onap.vnfsdk.validation.pmdictionary.version} - log4j-slf4j-impl org.apache.logging.log4j + log4j-slf4j-impl - org.onap.vnfsdk.validation - ${onap.vnfsdk.validation.pmdictionary.version} + com.googlecode.jmapper-framework jmapper-core + ${jMapper.version} - xstream com.thoughtworks.xstream + xstream - com.googlecode.jmapper-framework - ${jMapper.version} - 4.0.0 + + catalog-be + + + org.apache.maven.plugins + maven-surefire-plugin + + 1C + false + + + + + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + prepare-package + + unpack + + + + + org.webjars + swagger-ui + ${swagger-ui.version} + + + ${project.build.directory}/swagger-ui + + + + + + + com.google.code.maven-replacer-plugin + replacer + ${replacer.plugin.version} + + + prepare-package + + replace + + + + + + ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html + + + + https://petstore.swagger.io/v2/swagger.json + /sdc/openapi.json + + + + + + org.apache.maven.plugins + maven-war-plugin + + WEB-INF\lib\slf4j-log4j*.jar, + WEB-INF/classes/elasticsearch.yml, + WEB-INF/classes/portal.properties + + + + ${project.version} + + + true + true + + + true + + + + ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version} + + + **/*.* + + swagger-ui + + + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + src/test/resources/artifacts/pnfSoftwareInformation/** + + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + com.jcabi + jcabi-maven-plugin + ${jcabi.maven.plugin.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + + + + ajc + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + normatives + prepare-package + + single + + + normatives + false + + src/main/assembly/normatives.xml + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean.sdc.backend.folder + clean + + clean + + + + + + sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + + false + + normatives.tar.gz + + + + + + + + + io.swagger.core.v3 + swagger-maven-plugin + ${swagger-core-mvn-plugin.version} + + + sdce-2-sdce-5 + compile + + resolve + + + sdce-2-sdce-5 + ${project.build.directory}/generated/swagger + swagger-sdce-2-sdce-5 + JSON + + ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml + + ${swagger.skip} + + + + sdce-4 + compile + + resolve + + + sdce-4 + ${project.build.directory}/generated/swagger + swagger-sdce-4 + JSON + + ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml + + ${swagger.skip} + + + + sdce-6 + compile + + resolve + + + sdce-6 + ${project.build.directory}/generated/swagger + swagger-sdce-6 + JSON + + ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml + + ${swagger.skip} + + + + sdce-7 + compile + + resolve + + + sdce-7 + ${project.build.directory}/generated/swagger + swagger-sdce-7 + JSON + + ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml + + ${swagger.skip} + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + [1.2.1,) + + wget + + + - war + + + com.jcabi + jcabi-maven-plugin + [0.0,) + + ajc + + + + + + - - sdc-main - org.openecomp.sdc - 1.10.0-SNAPSHOT - + + + + + + + + + docker false + org.apache.maven.plugins maven-resources-plugin + copy-normatives + package + + copy-resources + sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default @@ -1300,13 +1315,13 @@ + + + copy-sdc-be-py + verify copy-resources - copy-normatives - package - - sdc-backend-init/ @@ -1323,35 +1338,29 @@ - - copy-resources - - copy-sdc-be-py - verify - org.apache.maven.plugins + io.fabric8 docker-maven-plugin + ${verbose} ${docker.api.version} + nexus3.onap.org:10001 - docker docker + docker + onap/sdc-backend sdc-backend - - backend/backend-files.xml - onap-sdc-backend - try backend @@ -1363,11 +1372,15 @@ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} + + backend/backend-files.xml + onap-sdc-backend + - onap/sdc-backend + onap/sdc-backend-init sdc-backend-init try @@ -1383,57 +1396,44 @@ - onap/sdc-backend-init - nexus3.onap.org:10001 - ${verbose} - - onap/sdc-backend,onap/sdc-backend-init - true - + clean-images + pre-clean remove - clean-images - pre-clean + + true + onap/sdc-backend,onap/sdc-backend-init + + generate-images + install build - generate-images - install - - onap/sdc-backend,onap/sdc-backend-init - + push-images + deploy push - push-images - deploy + + onap/sdc-backend,onap/sdc-backend-init + - io.fabric8 - docker - - - 2.0.0.0 - 3.2.0 - 1.5.3 - 3.25.0 - ${swagger-core-mvn-plugin.version} - diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 170c39d426..85b93c5228 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -2,463 +2,311 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 catalog-fe - - - ${project.artifactId}-${project.version} - - - - - - lifecycle-mapping - - - - - - - - - - jcabi-maven-plugin - - ajc - - com.jcabi - [0.0,) - - - - - - - org.eclipse.m2e - 1.0.0 - - - - - - - - - - maven-war-plugin - - - - true - - - - - - src/main/resources - - - - org.apache.maven.plugins - - - - jetty-maven-plugin - - ${project.build.directory}/${project.build.finalName}.war - - / - .*/.*jersey-[^/]\.jar$ - - - org.eclipse.jetty - ${jetty.version} - - - - maven-deploy-plugin - - true - - org.apache.maven.plugins - - - - jcabi-maven-plugin - - - aspectjtools - org.aspectj - ${aspectj.version} - - - aspectjweaver - org.aspectj - ${aspectj.version} - - - - - - ajc - - - - com.jcabi - ${jcabi.maven.plugin.version} - - - maven-clean-plugin - - - - - - - ${project.parent.basedir}/catalog-fe/sdc-frontend/ - - false - - *.war - - - - - - clean - - clean.catalog.fe.folder - clean - - - org.apache.maven.plugins - - - yaml-json-validator-maven-plugin - - - - ${skipYamlJsonValidator} - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - - - validate - - validate - validate - - - com.github.sylvainlaurent.maven - + war - + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + - - lombok org.projectlombok + lombok ${lombok.version} - functionaljava org.functionaljava - compile + functionaljava ${functionaljava.version} + compile - onap-configuration-management-api org.onap.sdc.common + onap-configuration-management-api ${project.version} - common-app-api org.openecomp.sdc + common-app-api ${project.version} - logback-classic ch.qos.logback - compile + logback-classic ${logback.version} + compile - groovy org.codehaus.groovy + groovy compile - janino org.codehaus.janino - compile + janino ${janino.version} + compile - snakeyaml org.yaml - compile + snakeyaml ${snakeyaml.version} + compile + org.apache.commons commons-jci-core + ${commons-jci-core.version} + compile - commons-io commons-io + commons-io - org.apache.commons - compile - ${commons-jci-core.version} - gson com.google.code.gson - compile + gson ${gson.version} + compile - jersey-container-servlet org.glassfish.jersey.containers - compile + jersey-container-servlet ${jersey-bom.version} + compile - jersey-media-multipart org.glassfish.jersey.media - compile + jersey-media-multipart ${jersey-bom.version} + compile - jersey-media-moxy org.glassfish.jersey.media - compile + jersey-media-moxy ${jersey-bom.version} + compile - jersey-media-json-jackson org.glassfish.jersey.media - compile + jersey-media-json-jackson ${jersey-bom.version} + compile - jersey-hk2 org.glassfish.jersey.inject + jersey-hk2 ${jersey-bom.version} - jackson-core com.fasterxml.jackson.core - compile + jackson-core ${jackson.version} + compile + com.fasterxml.jackson.core jackson-databind + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - ${jackson.version} - jackson-annotations com.fasterxml.jackson.core - compile + jackson-annotations ${jackson-annotations.version} + compile - httpclient org.apache.httpcomponents - compile + httpclient ${httpclient.version} + compile - httpcore org.apache.httpcomponents - compile + httpcore ${httpcore.version} + compile - httpmime org.apache.httpcomponents - compile + httpmime ${httpclient.version} + compile - commons-logging commons-logging - compile + commons-logging ${commons-logging} + compile - commons-codec commons-codec - compile + commons-codec ${commons-codec} + compile - javax.servlet-api javax.servlet - provided + javax.servlet-api ${servlet-api.version} + provided - jackson-dataformat-yaml com.fasterxml.jackson.dataformat - compile + jackson-dataformat-yaml ${jackson.version} + compile + org.eclipse.jetty jetty-proxy + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} + org.eclipse.jetty jetty-servlets + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} - guava com.google.guava - compile + guava ${guava.version} + compile - jcabi-aspects com.jcabi - compile + jcabi-aspects ${jcabi.version} + compile - aspectjrt org.aspectj - compile + aspectjrt ${aspectjrt.version} + compile - commons-lang3 org.apache.commons - compile + commons-lang3 ${lang3.version} + compile - jaxb-api javax.xml.bind - compile + jaxb-api ${jaxb-api.version} + compile - hibernate-validator org.hibernate.validator + hibernate-validator ${hibernate.validator.version} + org.owasp.esapi esapi + ${org.owasp.esapi.version} - log4j log4j + log4j - commons-io commons-io + commons-io - commons-fileupload commons-fileupload + commons-fileupload - xmlgraphics-commons org.apache.xmlgraphics + xmlgraphics-commons - xml-apis-ext xml-apis + xml-apis-ext - xml-apis xml-apis + xml-apis - org.owasp.esapi - ${org.owasp.esapi.version} + org.onap.portal.sdk epsdk-fw + ${ecomp.version} + compile - cambriaClient com.att.nsa + cambriaClient slf4j-log4j12 @@ -469,178 +317,330 @@ log4j - org.onap.portal.sdk - compile - ${ecomp.version} + org.fusesource sigar + ${sigar.version} + compile - log4j log4j + log4j - org.fusesource - compile - ${sigar.version} + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-bundle + ${jersey-bom.version} + pom + test - jetty-server org.eclipse.jetty + jetty-server - jetty-continuation org.eclipse.jetty + jetty-continuation - org.glassfish.jersey.test-framework.providers - test - pom - ${jersey-bom.version} - bean-matchers com.google.code.bean-matchers - test + bean-matchers ${bean-matchers.version} + test + org.eclipse.jetty jetty-servlet + ${jetty.version} + test - jetty-server org.eclipse.jetty + jetty-server - jetty-security org.eclipse.jetty + jetty-security - org.eclipse.jetty - test - ${jetty.version} + org.eclipse.jetty jetty-webapp + ${jetty.version} + test - jetty-servlet org.eclipse.jetty + jetty-servlet - org.eclipse.jetty - test - ${jetty.version} - jetty-http org.eclipse.jetty + jetty-http ${jetty.version} - javax.ws.rs-api javax.ws.rs - compile + javax.ws.rs-api ${ws.rs.version} + compile - validation-api javax.validation + validation-api ${javax.validation.version} - 4.0.0 + - war + ${project.artifactId}-${project.version} - - sdc-main - org.openecomp.sdc - 1.10.0-SNAPSHOT - + + + org.apache.maven.plugins + maven-war-plugin + + + + true + + + + + + src/main/resources + + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + / + .*/.*jersey-[^/]\.jar$ + + ${project.build.directory}/${project.build.finalName}.war + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + com.jcabi + jcabi-maven-plugin + ${jcabi.maven.plugin.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + + + + ajc + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean.catalog.fe.folder + clean + + clean + + + + + + ${project.parent.basedir}/catalog-fe/sdc-frontend/ + false + + *.war + + + + + + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.jcabi + jcabi-maven-plugin + [0.0,) + + ajc + + + + + + + + + + + + + + + catalog false + ${project.artifactId}-${project.version} - - catalog + docker false + + docker + docker + + org.apache.maven.plugins maven-resources-plugin + copy-resources-fe + verify + + copy-resources + ${basedir}/sdc-frontend - ${project.parent.basedir}/catalog-fe/target - + ${project.parent.basedir}/catalog-fe/target catalog-fe-${project.version}.war - - ${project.parent.basedir}/openecomp-ui/target - + ${project.parent.basedir}/openecomp-ui/target - onboarding-fe-${project.version}.war - + onboarding-fe-${project.version}.war - - copy-resources - - copy-resources-fe - verify - org.apache.maven.plugins + io.fabric8 docker-maven-plugin + ${verbose} ${docker.api.version} + nexus3.onap.org:10001 - ${docker.password} ${docker.username} + ${docker.password} + onap/sdc-frontend sdc-frontend try - ${project.basedir}/sdc-frontend - + ${project.basedir}/sdc-frontend latest @@ -651,53 +651,45 @@ - onap/sdc-frontend - nexus3.onap.org:10001 - ${verbose} - - onap/sdc-frontend - true - + clean-images + pre-clean remove - clean-images - pre-clean + + true + onap/sdc-frontend + + generate-images + install build - generate-images - install - - onap/sdc-frontend - + push-images + deploy push - push-images - deploy + + onap/sdc-frontend + - io.fabric8 - docker - - docker - docker - + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index b820980699..ab5b4a2110 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -14,332 +14,332 @@ ~ limitations under the License. --> - + 4.0.0 + sdc-onboarding + pom + + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + + + + ../common + ../openecomp-be + ../openecomp-ui + + + + + true + UTF-8 + + + 2.1 + 2.5 + 3.1.0 + 2.4 + 2.4 + 2.4 + 2.1.1 + + + ${aspectj.version} + 2.0b6 + 3.2.4 + 1.3.3 + ${commons-codec} + 2.1 + ${lang3.version} + 3.8.0 + 1.5.8 + ${httpclient.version} + 4.4.1 + 4.1.2 + 2.3.3 + 2.2.6 + 3.0.1-b06 + 1 + ${jackson.version} + ${jackson.version} + 1.58 + 1.19.1 + 1.18.1 + 1.5.1 + ${slf4j-api.version} + ${spring.version} + ${swagger-core-mvn-plugin.version} + 4.4.1 + 1.0.2 + 1.0.2 + 1.0.2 + 1.0.0 + 1.0.3 + ${project.version} + ${servlet-api.version} + - - - - maven-jar-plugin - org.apache.maven.plugins - ${mvn.jar.version} - - - maven-clean-plugin - org.apache.maven.plugins - ${mvn.clean.version} - - - maven-surefire-plugin - - - ${project.basedir}/src/test/resources - - - false - - ${project.basedir}/configuration - src/test/resources/logback-test.xml - - - - org.apache.maven.plugins - - - maven-install-plugin - org.apache.maven.plugins - ${mvn.install.version} - - - maven-resources-plugin - org.apache.maven.plugins - ${mvn.resource.version} - - - - - src/test/resources - - **/* - - - - - lombok org.projectlombok - provided + lombok ${lombok.version} + provided - spring-expression org.springframework + spring-expression ${spring.framework.version} + org.springframework spring-context + ${spring.framework.version} - spring-expression org.springframework + spring-expression - spring-core org.springframework + spring-core - org.springframework - ${spring.framework.version} + org.springframework spring-webmvc + ${spring.framework.version} - spring-expression org.springframework + spring-expression - spring-core org.springframework + spring-core - spring-web org.springframework + spring-web - org.springframework - ${spring.framework.version} - commons-text org.apache.commons + commons-text ${apache-commons-text.version} - jcommander com.beust + jcommander ${jcommander.version} - httpasyncclient org.apache.httpcomponents + httpasyncclient ${httpasyncclient.version} - jaxb-impl com.sun.xml.bind + jaxb-impl ${com.sun.xml.version} - bsh org.beanshell + bsh ${bsh.version} - commons-digester commons-digester + commons-digester ${commons.digester.version} - classmate com.fasterxml + classmate ${classmate.version} - slf4j-api org.slf4j + slf4j-api ${slf4j.version} - groovy-all-minimal org.codehaus.groovy + groovy-all-minimal ${groovy.minimal.version} - janino org.codehaus.janino - provided + janino ${janino.version} + provided - jackson-annotations com.fasterxml.jackson.core + jackson-annotations ${jackson.annotations.version} - jackson-core com.fasterxml.jackson.core + jackson-core ${jackson.version} - aspectjrt org.aspectj + aspectjrt ${aspectjrt.version} - javax.servlet-api javax.servlet - provided + javax.servlet-api ${servlet-api.version} + provided - commons-beanutils commons-beanutils + commons-beanutils ${commons-beanutils} - annotations com.google.code.findbugs + annotations 3.0.1u2 - cglib-nodep cglib + cglib-nodep ${cglib.nodep.version} - logback-classic ch.qos.logback + logback-classic ${logback.version} - logback-core ch.qos.logback + logback-core ${logback.version} + com.fasterxml.jackson.core jackson-databind + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - ${jackson.version} - jackson-dataformat-yaml com.fasterxml.jackson.dataformat + jackson-dataformat-yaml ${jackson.version} - commons-codec commons-codec + commons-codec ${commons.codec.version} - cassandra-driver-core com.datastax.cassandra + cassandra-driver-core ${datastax.cassandra.version} - cassandra-driver-mapping com.datastax.cassandra + cassandra-driver-mapping ${datastax.cassandra.version} - javax.ws.rs-api javax.ws.rs + javax.ws.rs-api ${ws.rs.version} - gson com.google.code.gson + gson ${gson.version} - commons-io commons-io + commons-io ${commons.io.version} - commons-lang3 org.apache.commons + commons-lang3 ${commons.lang3.version} - swagger-annotations io.swagger.core.v3 + swagger-annotations ${swagger.version} - wiremock com.github.tomakehurst + wiremock ${wire-mock.version} - 4.0.0 - - - ../common - ../openecomp-be - ../openecomp-ui - - - pom - - - sdc-main - org.openecomp.sdc - 1.10.0-SNAPSHOT - - - - - ${aspectj.version} - 2.0b6 - - - ${project.version} - 3.2.4 - 1.3.3 - 2.3.3 - ${commons-codec} - 2.1 - ${lang3.version} - - - 3.8.0 - 1.5.8 - ${httpclient.version} - 4.4.1 - 4.1.2 - ${jackson.version} - ${jackson.version} - 3.0.1-b06 - 2.2.6 - 1 - ${servlet-api.version} - 1.58 - 1.19.1 - 1.18.1 - true - 2.1 - 2.5 - 2.4 - 2.4 - 2.4 - 3.1.0 - 2.1.1 - 1.5.1 - UTF-8 - ${slf4j-api.version} - ${spring.version} - ${swagger-core-mvn-plugin.version} - 4.4.1 - 1.0.2 - 1.0.3 - 1.0.0 - 1.0.2 - 1.0.2 - + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvn.jar.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${mvn.clean.version} + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + ${project.basedir}/src/test/resources + + + + src/test/resources/logback-test.xml + + ${project.basedir}/configuration + + + + + org.apache.maven.plugins + maven-install-plugin + ${mvn.install.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${mvn.resource.version} + + + + + src/test/resources + + **/* + + + + diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 0ee74c03fe..39c663269e 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -1,71 +1,71 @@ - + + backend + org.openecomp.sdc + 1.10.0-SNAPSHOT + + 4.0.0 + openecomp-sdc-security-util + + - slf4j-api org.slf4j + slf4j-api 1.7.25 - commons-crypto org.apache.commons + commons-crypto 1.0.0 - commons-lang3 org.apache.commons + commons-lang3 ${commons.lang3.version} - functionaljava org.functionaljava + functionaljava ${functionaljava.version} - jackson-core com.fasterxml.jackson.core + jackson-core ${jackson.version} + com.fasterxml.jackson.core jackson-databind + ${jackson.version} - jackson-core com.fasterxml.jackson.core + jackson-core - com.fasterxml.jackson.core - ${jackson.version} - commons-codec commons-codec + commons-codec ${commons-codec} - javax.servlet-api javax.servlet - ${servlet-api.version} + javax.servlet-api + ${javax.servlet.version} - 4.0.0 - - - - backend - org.openecomp.sdc - 1.10.0-SNAPSHOT - - diff --git a/pom.xml b/pom.xml index a430ae9b67..0fbdd601b0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,111 +19,405 @@ limitations under the License. Modifications copyright (c) 2018-2019 Nokia ================================================================================ --> - + 4.0.0 + + org.openecomp.sdc sdc-main + 1.10.0-SNAPSHOT + pom + sdc + + + org.onap.oparent + oparent + 3.2.0 + + + + + UTF-8 + yyyyMMdd'T'HHmmss'Z' + + ${project.version} + + 0.11 + 3.10 + 30.1-jre + 0.3.3 + 5.3.9 + 2.34 + 4.1.68.Final + 4.0.1 + 2.26.3 + 3.4.0 + 4.3.1.0 + 2.1.8 + 1.18.20 + 1.9.4 + 2.8.0 + 2.7 + 4.1.0 + 1.6.1 + 1.9 + 2.3.1 + 0.10.3 + 3.0.7 + 2.1.7 + 3.0.0 + 6.1.6.Final + + 4.1 + 2.1.1 + 2.0.1.Final + ${servlet-api.version} + + 9.4.41.v20210516 + 3.4.4 + + 2.2.0.0 + 2.1.3 + + + 2.12.4 + ${jackson.version} + + 2.1.1 + false + + + 1.29 + 4.9 + 4.5.13 + 4.4.1 + 1.1 + + + 1.2.15 + + + + + 1.2.3 + 1.7.25 + 1.15 + 1.2 + 3.0.6 + 2.13.1 + + + 0.20.1 + 1.9.7 + ${aspectj.version} + 0.13.2 + + + + 1.6.4 + + 3.0.3 + + + 2.3.1 + + + 1.1 + + + 3.7.7 + ${mockito.version} + 1.35 + 1.7.1 + 5.7.2 + 3.16.0 + 7.4.0 + 6.8.1 + 0.11 + 2.2 + 1.3 + 2.22.2 + 2.4 + 1.6.0.1 + + + ${project.version} + ${project.basedir}/node/node + ${project.build.directory}/surefire-reports + + ${project.build.directory}/code-coverage/lcov.info + + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + ${project.build.sourceEncoding} + ${project.basedir} + pom.xml,src/test + + 3.8.0 + + nexus + nexus + + + https://nexus3.onap.org/repository/npm.public/npm/-/ + https://nexus.onap.org + /content/sites/site/org/openecomp/sdc/${project.version} + 176c31dfe190a + + 2.6.1.Final + + 2.9.9 + + + 1.6.0 + + 0.8.7 + + 4.5.1 + + + 1C + true + false + + 1.35 + 1.69 + + false + + + + + + com.google.guava + guava + ${guava.version} + + + + org.glassfish.jersey.ext + jersey-bean-validation + ${jersey-bom.version} + + + + org.glassfish.hk2.external + asm-all-repackaged + 2.4.0 + + + + org.assertj + assertj-core + ${assertj.version} + + + + org.jmockit + jmockit + ${jmockit.version} + + + + com.github.tomakehurst + wiremock-standalone + ${wire-mock.version} + + + + io.cucumber + cucumber-java + ${cucumber.version} + + + + io.cucumber + cucumber-junit + ${cucumber.version} + + + + org.apache.commons + commons-lang3 + ${lang3.version} + + + org.codehaus.groovy + groovy + ${groovy.version} + + + io.netty + netty-all + ${netty.version} + + + io.netty + netty-handler + ${netty.version} + + + io.swagger.core.v3 + swagger-maven-plugin + ${swagger-core-mvn-plugin.version} + + + + + + + + org.jacoco + org.jacoco.agent + runtime + ${jacoco.version} + test + + + + org.junit.jupiter + junit-jupiter-engine + ${junitJupiter.version} + test + + + + org.junit.vintage + junit-vintage-engine + ${junitJupiter.version} + test + + + + org.mockito + mockito-core + ${mockito.version} + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + true + + + + - jacoco-maven-plugin org.jacoco + jacoco-maven-plugin ${jacoco.version} + org.apache.maven.plugins maven-assembly-plugin + 3.1.0 posix - org.apache.maven.plugins - 3.1.0 - exec-maven-plugin org.codehaus.mojo + exec-maven-plugin 1.6.0 - sonar-maven-plugin org.sonarsource.scanner.maven + sonar-maven-plugin 3.7.0.1746 - maven-clean-plugin org.apache.maven.plugins + maven-clean-plugin 3.1.0 - write-text-files-maven-plugin ru.yaal.maven + write-text-files-maven-plugin 1.1 - gmaven-plugin org.codehaus.gmaven + gmaven-plugin 1.5 - build-helper-maven-plugin org.codehaus.mojo + build-helper-maven-plugin 3.2.0 - maven-deploy-plugin org.apache.maven.plugins + maven-deploy-plugin 2.8.2 - maven-shade-plugin org.apache.maven.plugins + maven-shade-plugin 3.1.1 - maven-resources-plugin org.apache.maven.plugins + maven-resources-plugin 3.2.0 - docker-maven-plugin io.fabric8 + docker-maven-plugin 0.31.0 - maven-war-plugin org.apache.maven.plugins + maven-war-plugin 3.2.2 - frontend-maven-plugin com.github.eirslett + frontend-maven-plugin 1.12.0 - maven-surefire-plugin org.apache.maven.plugins + maven-surefire-plugin ${maven-surefire-plugin.version} - maven-failsafe-plugin org.apache.maven.plugins + maven-failsafe-plugin ${maven-surefire-plugin.version} - maven-compiler-plugin org.apache.maven.plugins + maven-compiler-plugin 3.8.1 - yaml-json-validator-maven-plugin com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin 1.0.2 - git-commit-id-plugin pl.project13.maven + git-commit-id-plugin 4.0.0 @@ -132,77 +426,83 @@ Modifications copyright (c) 2018-2019 Nokia maven-checkstyle-plugin + 2.17 - ${checkstyle.skip} + checkstyle-suppressions.xml checkstyle.suppressions.file - checkstyle-suppressions.xml + ${checkstyle.skip} - 2.17 + org.codehaus.mojo build-helper-maven-plugin + parse-version + pre-clean parse-version - parse-version - pre-clean - org.codehaus.mojo + org.jacoco jacoco-maven-plugin + false + default-instrument instrument - default-instrument + default-restore-instrumented-classes restore-instrumented-classes - default-restore-instrumented-classes - - ${project.build.directory}/jacoco.exec - + default-report report - default-report + + ${project.build.directory}/jacoco.exec + - org.jacoco - false + org.apache.maven.plugins maven-site-plugin + 3.7.1 - wagon-webdav-jackrabbit org.apache.maven.wagon + wagon-webdav-jackrabbit 3.0.0 - org.apache.maven.plugins - 3.7.1 + org.codehaus.gmaven gmaven-plugin + false + integration-test + + execute + pom.properties['deploy.url'] = @@ -214,57 +514,57 @@ Modifications copyright (c) 2018-2019 Nokia project.distributionManagement.repository.id; - - execute - - false - integration-test - org.codehaus.gmaven + org.apache.maven.plugins maven-compiler-plugin - true 11 11 + true - org.apache.maven.plugins + org.apache.maven.plugins maven-surefire-plugin + + + org.apache.maven.surefire + surefire-junit-platform + ${maven-surefire-plugin.version} + + - ${surefire.forkCount} - methods false - ${surefire.reuseForks} - ${surefire.skip.tests} ${project.build.directory}/jacoco.exec + ${surefire.forkCount} + ${surefire.reuseForks} + methods + ${surefire.skip.tests} - - - surefire-junit-platform - org.apache.maven.surefire - ${maven-surefire-plugin.version} - - - org.apache.maven.plugins + pl.project13.maven git-commit-id-plugin + + + + revision + + + - true true ${project.build.outputDirectory}/META-INF/git.properties - - true - + true + false git.build.version git.build.time @@ -275,165 +575,24 @@ Modifications copyright (c) 2018-2019 Nokia git.commit.message.short git.commit.message.full + + true + false - false - - - - revision - - - - pl.project13.maven - - - - org.jacoco.agent - runtime - org.jacoco - test - ${jacoco.version} - - - - junit-jupiter-engine - org.junit.jupiter - test - ${junitJupiter.version} - - - - junit-vintage-engine - org.junit.vintage - test - ${junitJupiter.version} - - - - mockito-core - org.mockito - test - ${mockito.version} - - - - - - guava - com.google.guava - ${guava.version} - - - - jersey-bean-validation - org.glassfish.jersey.ext - ${jersey-bom.version} - - - - asm-all-repackaged - org.glassfish.hk2.external - 2.4.0 - - - - assertj-core - org.assertj - ${assertj.version} - - - - jmockit - org.jmockit - ${jmockit.version} - - - - wiremock-standalone - com.github.tomakehurst - ${wire-mock.version} - - - - cucumber-java - io.cucumber - ${cucumber.version} - - - - cucumber-junit - io.cucumber - ${cucumber.version} - - - - commons-lang3 - org.apache.commons - ${lang3.version} - - - groovy - org.codehaus.groovy - ${groovy.version} - - - netty-all - io.netty - ${netty.version} - - - netty-handler - io.netty - ${netty.version} - - - swagger-maven-plugin - io.swagger.core.v3 - ${swagger-core-mvn-plugin.version} - - - - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-site - dav:${nexus.proxy}${sitePath} - - - ecomp-snapshots - Snapshot Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - org.openecomp.sdc - - 4.0.0 - - sdc - - pom - - - oparent - org.onap.oparent - - 3.2.0 - + all true - all + + true + onboarding common-app-logging @@ -450,12 +609,13 @@ Modifications copyright (c) 2018-2019 Nokia utils/webseal-simulator integration-tests - - true - all-for-integration-tests-only + + true + true + onboarding common-app-logging @@ -472,19 +632,18 @@ Modifications copyright (c) 2018-2019 Nokia utils/webseal-simulator integration-tests - - true - true - + skip-integration-tests skipITs true - skip-integration-tests + + true + onboarding common-app-logging @@ -498,20 +657,21 @@ Modifications copyright (c) 2018-2019 Nokia catalog-ui catalog-fe sdc-os-chef - utils/webseal-simulator - - - true - + utils/webseal-simulator + + skip-tests skipTests true - skip-tests + + true + true + onboarding common-app-logging @@ -527,16 +687,20 @@ Modifications copyright (c) 2018-2019 Nokia sdc-os-chef utils/webseal-simulator - - true - true - + fast-build false - fast-build + + true + true + true + true + true + true + onboarding common-app-logging @@ -552,237 +716,57 @@ Modifications copyright (c) 2018-2019 Nokia sdc-os-chef utils/webseal-simulator - - true - true - true - true - true - true - + start-sdc false - start-sdc - - integration-tests - - true - true - true true true + true + true + true + + integration-tests + + stop-sdc false - stop-sdc - - integration-tests - + true + true true - true true - true - true + true + + integration-tests + + run-integration-tests false - run-integration-tests - - integration-tests - + true true true - true + + integration-tests + - - - 1.9 - 4.1.0 - - 1.9.7 - - ${aspectj.version} - 3.16.0 - 0.11 - 0.11 - 1.69 - 2.1.8 - 3.8.0 - 4.3.1.0 - 2.1.1 - 1.9.4 - 1.15 - 2.7 - 1.1 - 1.2 - 4.1 - 2.8.0 - 6.8.1 - 3.4.4 - 1.35 - 3.4.0 - 4.9 - 3.0.7 - 2.3.1 - 30.1-jre - 1.3 - - 2.2 - 6.1.6.Final - 4.5.13 - 4.4.1 - - 0.10.3 - 1.6.0.1 - - ${jackson.version} - 2.12.4 - - - 0.8.7 - 3.0.6 - - 0.3.3 - 4.5.1 - - - 4.0.1 - 2.0.1.Final - 2.3.1 - 0.13.2 - 0.20.1 - - - 2.34 - - - - 9.4.41.v20210516 - 1.35 - 2.9.9 - 1.1 - 1.7.1 - 5.7.2 - - - 3.10 - 2.13.1 - 1.2.3 - 1.18.20 - - - - 3.0.0 - - 2.4 - - - 2.22.2 - - - yyyyMMdd'T'HHmmss'Z' - - - 3.7.7 - ${mockito.version} - 4.1.66.Final - nexus - nexus - https://nexus.onap.org - https://nexus3.onap.org/repository/npm.public/npm/-/ - 1.6.1 - 1.2.15 - - 2.1.3 - 2.2.0.0 - UTF-8 - 3.0.3 - 1.6.0 - - - 4.0.1 - 1.6.4 - /content/sites/site/org/openecomp/sdc/${project.version} - false - 1.7.25 - 1.29 - pom.xml,src/test - - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - - - ${project.build.directory}/code-coverage/lcov.info - - - ${project.basedir}/node/node - ${project.basedir} - - - ${project.version} - ${project.build.sourceEncoding} - ${project.build.directory}/surefire-reports - - 5.3.9 - - 176c31dfe190a - - 1C - - - true - - false - - 2.1.7 - - - 7.4.0 - 2.6.1.Final - ${project.version} - - false - 2.26.3 - - 2.1.1 - - - - - - maven-javadoc-plugin - - org.umlgraph.doclet.UmlGraphDoc - - umlgraph - org.umlgraph - 5.6 - - false - true - - org.apache.maven.plugins - 3.0.1 - - - - @@ -803,5 +787,21 @@ Modifications copyright (c) 2018-2019 Nokia - 1.10.0-SNAPSHOT + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-site + dav:${nexus.proxy}${sitePath} + + + ecomp-snapshots + Snapshot Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 180ac3cff1..e9801c9402 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -1,137 +1,164 @@ - + 4.0.0 webseal-simulator - - WSSimulator-${project.version} - - - yaml-json-validator-maven-plugin - - - - ${skipYamlJsonValidator} - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - - - validate - - validate - validate - - - com.github.sylvainlaurent.maven - - - + war + + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + ../../ + + + + yyyyMMdd'T'HHmmss'Z' + https://nexus.onap.org + UTF-8 + true + + - javax.servlet-api javax.servlet - compile - ${servlet-api.version} + javax.servlet-api + ${javax.servlet.version} - httpclient org.apache.httpcomponents + httpclient ${httpclient.version} - commons-logging-api commons-logging + commons-logging-api 1.0.4 - commons-io commons-io + commons-io ${commons.io.version} - commons-codec commons-codec - compile + commons-codec ${commons-codec} + compile + org.eclipse.jetty jetty-proxy + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} + org.eclipse.jetty jetty-servlets + ${jetty.version} + compile - jetty-http org.eclipse.jetty + jetty-http - org.eclipse.jetty - compile - ${jetty.version} - config com.typesafe - compile + config 1.0.2 + compile + org.openecomp.sdc openecomp-sdc-logging-api + ${project.version} - powermock-module-junit4 org.powermock + powermock-module-junit4 - org.openecomp.sdc - ${project.version} - 4.0.0 - - war + + WSSimulator-${project.version} + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + - - sdc-main - org.openecomp.sdc - ../../ - 1.10.0-SNAPSHOT - + + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-snapshots + Snapshots Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + ecomp-public + Public Repository + ${nexus.proxy}/content/repositories/public/ + + + + docker false @@ -140,33 +167,38 @@ maven-clean-plugin + 3.0.0 + clean-static-files + clean + + clean + ${project.basedir}/sdc-simulator - false *.war + false - - clean - - clean-static-files - clean - 3.0.0 maven-resources-plugin + copy-resources-simulator + verify + + copy-resources + ${project.basedir}/sdc-simulator @@ -179,29 +211,28 @@ - - copy-resources - - copy-resources-simulator - verify + io.fabric8 docker-maven-plugin + ${verbose} ${docker.api.version} + nexus3.onap.org:10001 - docker docker + docker + onap/sdc-simulator sdc-simulator try @@ -217,67 +248,35 @@ - onap/sdc-simulator - nexus3.onap.org:10001 - ${verbose} + clean-images + pre-clean remove - clean-images - pre-clean + generate-images + install build - generate-images - install + push-images + deploy push - push-images - deploy - io.fabric8 - docker - - - yyyyMMdd'T'HHmmss'Z' - https://nexus.onap.org - UTF-8 - true - - - - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-snapshots - Snapshots Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - ecomp-public - Public Repository - ${nexus.proxy}/content/repositories/public/ - - - -- cgit 1.2.3-korg