From a36531c38fe1a9234b8dbeaed5505cf3ca48de26 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 29 Apr 2020 18:39:35 +0100 Subject: Prepare for Junit5 Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov Issue-ID: SDC-2844 Issue-ID: SDC-2983 --- .../action-library-rest-services/pom.xml | 233 ++++++++-------- .../application-config-rest-services/pom.xml | 5 - .../conflict-rest/conflict-rest-services/pom.xml | 89 +++--- .../conflict-rest/conflict-rest-types/pom.xml | 32 +-- .../externaltesting-rest-services/pom.xml | 291 ++++++++++---------- .../healthcheck-rest-services/pom.xml | 100 ++++--- .../healthcheck-rest-types/pom.xml | 27 +- .../item-permissions-rest-services/pom.xml | 85 +++--- .../item-rest/item-rest-services/pom.xml | 147 +++++----- .../notifications-rest-services/pom.xml | 111 ++++---- .../openecomp-sdc-common-rest/pom.xml | 5 - .../togglz-rest/togglz-rest-services/pom.xml | 109 ++++---- .../togglz-rest/togglz-rest-types/pom.xml | 27 +- .../unique-type-rest-services/pom.xml | 6 - .../validation-rest-services/pom.xml | 225 ++++++++------- .../vendor-license-rest-services/pom.xml | 154 +++++------ .../vendor-license-rest-types/pom.xml | 9 +- .../vendor-software-products-rest-services/pom.xml | 305 ++++++++++----------- .../vendor-software-products-rest-types/pom.xml | 72 +++-- .../vnf-repository-rest-services/pom.xml | 159 ++++++----- 20 files changed, 1038 insertions(+), 1153 deletions(-) (limited to 'openecomp-be/api') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 91a2a0f772..5995ce52ce 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -1,131 +1,126 @@ - 4.0.0 + 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 - action-library-rest-services - - org.openecomp.sdc.onboarding - action-library-rest - 1.7.0-SNAPSHOT - + action-library-rest-services + + org.openecomp.sdc.onboarding + action-library-rest + 1.7.0-SNAPSHOT + - - ${project.build.directory}/generated-sources/error-codes - + + ${project.build.directory}/generated-sources/error-codes + - - - ${project.groupId} - action-library-rest-types - ${project.version} - + + + ${project.groupId} + action-library-rest-types + ${project.version} + - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - org.apache.httpcomponents - httpcore - ${http.core.version} - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + org.apache.httpcomponents + httpcore + ${http.core.version} + - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - org.openecomp.sdc - openecomp-sdc-action-manager - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-action-api - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-logging-api - ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey.multipart.version} - provided - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.sun.activation - javax.activation - 1.2.0 - + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + org.openecomp.sdc + openecomp-sdc-action-manager + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-action-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-logging-api + ${project.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey.multipart.version} + provided + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + provided + + + org.mockito + mockito-core + test + + + com.sun.activation + javax.activation + 1.2.0 + - + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml index 1df100a4fd..d261f46f18 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml @@ -59,11 +59,6 @@ cxf-rt-frontend-jaxrs ${cxf.version} - - junit - junit - test - org.springframework spring-web diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml index 2a34883ffb..24b8108664 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml @@ -1,60 +1,45 @@ - 4.0.0 + 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.openecomp.sdc - conflict-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + conflict-rest + 1.7.0-SNAPSHOT + - conflict-rest-services + conflict-rest-services - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - javax.inject - javax.inject - 1 - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.openecomp.sdc - openecomp-sdc-conflict-manager - ${project.version} - - - org.openecomp.sdc - conflict-rest-types - ${project.version} - - - org.openecomp.sdc.onboarding - vendor-software-products-rest-services - ${project.version} - - - org.openecomp.sdc.onboarding - vendor-license-rest-services - ${project.version} - - - junit - junit - test - - + + + javax.inject + javax.inject + 1 + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.openecomp.sdc + conflict-rest-types + ${project.version} + + + org.openecomp.sdc.onboarding + vendor-software-products-rest-services + ${project.version} + + + org.openecomp.sdc.onboarding + vendor-license-rest-services + ${project.version} + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml index be53c9e65e..7783f5845b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml @@ -1,27 +1,17 @@ - 4.0.0 + 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.openecomp.sdc - conflict-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + conflict-rest + 1.7.0-SNAPSHOT + - conflict-rest-types + conflict-rest-types - - - org.openecomp.sdc - openecomp-sdc-conflict-manager - ${project.version} - - - junit - junit - test - - + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml index f84abb1e8f..036a072659 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml @@ -16,157 +16,152 @@ --> - 4.0.0 + 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 - externaltesting-rest-services - - org.openecomp.sdc.onboarding - externaltesting-rest - 1.7.0-SNAPSHOT - + externaltesting-rest-services + + org.openecomp.sdc.onboarding + externaltesting-rest + 1.7.0-SNAPSHOT + - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - com.sun.jersey - jersey-core - ${jersey.core.version} - - - javax.ws.rs - jsr311-api - - - - - io.swagger.core.v3 - swagger-annotations - ${swagger.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.dataformat.version} - - - org.codehaus.woodstox - woodstox-core-asl - ${woodstox.version} - - - org.openecomp.sdc - openecomp-sdc-vendor-software-product-manager - ${project.version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey.multipart.version} - provided - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.powermock - powermock-module-junit4-common - ${powermock.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.openecomp.sdc - openecomp-sdc-externaltesting-impl - ${project.version} - - - javax.servlet - javax.servlet-api - provided - - - com.sun.activation - javax.activation - 1.2.0 - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + com.sun.jersey + jersey-core + ${jersey.core.version} + + + javax.ws.rs + jsr311-api + + + + + io.swagger.core.v3 + swagger-annotations + ${swagger.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.dataformat.version} + + + org.codehaus.woodstox + woodstox-core-asl + ${woodstox.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-manager + ${project.version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey.multipart.version} + provided + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + org.mockito + mockito-core + test + + + org.powermock + powermock-module-junit4-common + ${powermock.version} + test + + + org.powermock + powermock-api-mockito2 + ${powermock.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.openecomp.sdc + openecomp-sdc-externaltesting-impl + ${project.version} + + + javax.servlet + javax.servlet-api + provided + + + com.sun.activation + javax.activation + 1.2.0 + - + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index 6f8f175b3b..4cc3d5e35a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -1,62 +1,56 @@ - 4.0.0 + 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.openecomp.sdc - healthcheck-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + healthcheck-rest + 1.7.0-SNAPSHOT + - healthcheck-rest-services + healthcheck-rest-services - + - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - javax.inject - javax.inject - 1 - - - org.openecomp.sdc - openecomp-sdc-healthcheck-manager - ${project.version} - - - org.openecomp.sdc - healthcheck-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - junit - junit - test - - - + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + javax.inject + javax.inject + 1 + + + org.openecomp.sdc + openecomp-sdc-healthcheck-manager + ${project.version} + + + org.openecomp.sdc + healthcheck-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml index 98f0664f35..7a527f2be5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml @@ -1,22 +1,17 @@ - 4.0.0 - - - junit - junit - test - - + 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.openecomp.sdc - healthcheck-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + healthcheck-rest + 1.7.0-SNAPSHOT + - healthcheck-rest-types + healthcheck-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml index 56d0c3d7df..641c03996a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml @@ -1,53 +1,48 @@ - 4.0.0 + 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.openecomp.sdc - item-permissions-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + item-permissions-rest + 1.7.0-SNAPSHOT + - item-permissions-rest-services + item-permissions-rest-services - - - org.openecomp.sdc - item-permissions-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-item-permissions-manager - ${project.version} - - - javax.inject - javax.inject - ${javax.inject.version} - - - io.swagger.core.v3 - swagger-models - ${swagger.version} - - - org.springframework - spring-context - - - junit - junit - test - - + + + org.openecomp.sdc + item-permissions-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-item-permissions-manager + ${project.version} + + + javax.inject + javax.inject + ${javax.inject.version} + + + io.swagger.core.v3 + swagger-models + ${swagger.version} + + + org.springframework + spring-context + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml index 6cd45e4d9b..c222c2f7f8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml @@ -1,83 +1,78 @@ - 4.0.0 + 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.openecomp.sdc - item-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + item-rest + 1.7.0-SNAPSHOT + - item-rest-services + item-rest-services - - - org.openecomp.sdc - openecomp-sdc-item-permissions-manager - ${project.version} - - - org.openecomp.sdc - item-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - javax.inject - javax.inject - 1 - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.openecomp.sdc - openecomp-sdc-conflict-manager - ${project.version} - - - org.springframework - spring-context - - - com.fasterxml.jackson.core - jackson-core - - - junit - junit - test - - - org.mockito - mockito-core - test - - - com.github.tomakehurst - wiremock-standalone - 2.6.0 - test - - - org.projectlombok - lombok - provided - - + + + org.openecomp.sdc + openecomp-sdc-item-permissions-manager + ${project.version} + + + org.openecomp.sdc + item-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + javax.inject + javax.inject + 1 + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.openecomp.sdc + openecomp-sdc-conflict-manager + ${project.version} + + + org.springframework + spring-context + + + com.fasterxml.jackson.core + jackson-core + + + org.mockito + mockito-core + test + + + com.github.tomakehurst + wiremock-standalone + 2.6.0 + test + + + org.projectlombok + lombok + provided + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml index d7f17d07ec..8762a21021 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml @@ -1,66 +1,61 @@ - 4.0.0 + 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.openecomp.sdc - notifications-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + notifications-rest + 1.7.0-SNAPSHOT + - notifications-rest-services + notifications-rest-services - - - org.openecomp.sdc - openecomp-sdc-application-config-manager - ${project.version} - provided - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - javax.inject - javax.inject - 1 - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.openecomp.sdc - notifications-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-notification-api - ${project.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - junit - junit - test - - - org.mockito - mockito-core - test - - + + + org.openecomp.sdc + openecomp-sdc-application-config-manager + ${project.version} + provided + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + javax.inject + javax.inject + 1 + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.openecomp.sdc + notifications-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-notification-api + ${project.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.mockito + mockito-core + test + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index fbdc9d68d0..393e672a6b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -75,11 +75,6 @@ ${javax.servlet.version} provided - - junit - junit - test - org.glassfish.jersey.core jersey-common diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml index 1ce48d4011..2d26276316 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -1,66 +1,61 @@ - 4.0.0 + 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.openecomp.sdc - togglz-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + togglz-rest + 1.7.0-SNAPSHOT + - togglz-rest-services - + togglz-rest-services + - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - javax.inject - javax.inject - ${javax.inject.version} - - - org.openecomp.sdc.core - openecomp-common-lib - ${project.version} - - - org.openecomp.sdc - togglz-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - junit - junit - test - - - org.mockito - mockito-core - test - - + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + javax.inject + javax.inject + ${javax.inject.version} + + + org.openecomp.sdc.core + openecomp-common-lib + ${project.version} + + + org.openecomp.sdc + togglz-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.mockito + mockito-core + test + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml index 0bcd1c477c..6fef06e3de 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml @@ -1,23 +1,18 @@ - 4.0.0 + 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.openecomp.sdc - togglz-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc + togglz-rest + 1.7.0-SNAPSHOT + - togglz-rest-types + togglz-rest-types - - - junit - junit - test - - + + \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml index bb174e84a9..e8605a55be 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml @@ -47,12 +47,6 @@ ${spring.framework.version} - - junit - junit - ${junit.version} - test - org.mockito mockito-core diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index 28c511520a..ecefd33276 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -16,123 +16,118 @@ --> - 4.0.0 + 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 - validation-rest-services - - org.openecomp.sdc.onboarding - validation-rest - 1.7.0-SNAPSHOT - + validation-rest-services + + org.openecomp.sdc.onboarding + validation-rest + 1.7.0-SNAPSHOT + - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - com.sun.jersey - jersey-core - ${jersey.core.version} - - - javax.ws.rs - jsr311-api - - - - - io.swagger.core.v3 - swagger-annotations - ${swagger.version} - - - org.openecomp.sdc.onboarding - validation-rest-types - ${project.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.dataformat.version} - - - org.codehaus.woodstox - woodstox-core-asl - ${woodstox.version} - - - org.openecomp.sdc - openecomp-sdc-vendor-software-product-manager - ${project.version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey.multipart.version} - provided - - - junit - junit - test - - - org.mockito - mockito-core - test - - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + com.sun.jersey + jersey-core + ${jersey.core.version} + + + javax.ws.rs + jsr311-api + + + + + io.swagger.core.v3 + swagger-annotations + ${swagger.version} + + + org.openecomp.sdc.onboarding + validation-rest-types + ${project.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.dataformat.version} + + + org.codehaus.woodstox + woodstox-core-asl + ${woodstox.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-manager + ${project.version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey.multipart.version} + provided + + + org.mockito + mockito-core + test + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index c3fcd4dfef..c38c7d47ca 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -14,88 +14,84 @@ ~ limitations under the License. --> - - 4.0.0 + + 4.0.0 - vendor-license-rest-services - vendor-license-rest-services + vendor-license-rest-services + vendor-license-rest-services - - org.openecomp.sdc.onboarding - vendor-license-rest - 1.7.0-SNAPSHOT - ../ - + + org.openecomp.sdc.onboarding + vendor-license-rest + 1.7.0-SNAPSHOT + ../ + - - ${project.build.directory}/generated-sources/error-codes - + + ${project.build.directory}/generated-sources/error-codes + - - - ${project.groupId} - vendor-license-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-vendor-license-api - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-item-permissions-manager - ${project.version} - + + + ${project.groupId} + vendor-license-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-license-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-item-permissions-manager + ${project.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - org.apache.httpcomponents - httpcore - ${http.core.version} - - - org.testng - testng - test - - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - org.openecomp.sdc - openecomp-sdc-vendor-software-product-manager - ${project.version} - - - org.openecomp.sdc - item-rest-services - ${project.version} - - - org.openecomp.sdc - unique-type-rest-types - ${project.version} - - - junit - junit - test - - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + org.apache.httpcomponents + httpcore + ${http.core.version} + + + org.testng + testng + test + + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-manager + ${project.version} + + + org.openecomp.sdc + item-rest-services + ${project.version} + + + org.openecomp.sdc + unique-type-rest-types + ${project.version} + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml index 3140c3504f..949a021699 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -23,12 +24,6 @@ item-rest-types ${project.version} - - junit - junit - ${junit.version} - test - diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 03e0fb72fd..1c4e61d406 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -1,165 +1,160 @@ - 4.0.0 + 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 - vendor-software-products-rest-services + vendor-software-products-rest-services - - org.openecomp.sdc.onboarding - vendor-software-products-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc.onboarding + vendor-software-products-rest + 1.7.0-SNAPSHOT + - - - junit - junit - test - - - com.sun.activation - javax.activation - 1.2.0 - - - com.sun.xml.ws - jaxws-ri - 2.3.0 - pom - - - org.mockito - mockito-core - test - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - + + + com.sun.activation + javax.activation + 1.2.0 + + + com.sun.xml.ws + jaxws-ri + 2.3.0 + pom + + + org.mockito + mockito-core + test + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + - - - javax.inject - javax.inject - ${javax.inject.version} - provided - - - javax.ws.rs - javax.ws.rs-api - ${ws.rs.version} - - - com.sun.jersey - jersey-core - ${jersey.core.version} - - - javax.ws.rs - jsr311-api - - - - - io.swagger.core.v3 - swagger-annotations - ${swagger.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.dataformat.version} - - - org.codehaus.woodstox - woodstox-core-asl - ${woodstox.version} - - - com.sun.jersey.contribs - jersey-multipart - ${jersey.multipart.version} - provided - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - org.openecomp.sdc.onboarding - vendor-software-products-rest-types - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-activity-log-manager - ${project.version} - - - org.openecomp.sdc - unique-type-rest-types - ${project.version} - - - org.powermock - powermock-module-junit4-common - ${powermock.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - + + + javax.inject + javax.inject + ${javax.inject.version} + provided + + + javax.ws.rs + javax.ws.rs-api + ${ws.rs.version} + + + com.sun.jersey + jersey-core + ${jersey.core.version} + + + javax.ws.rs + jsr311-api + + + + + io.swagger.core.v3 + swagger-annotations + ${swagger.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.dataformat.version} + + + org.codehaus.woodstox + woodstox-core-asl + ${woodstox.version} + + + com.sun.jersey.contribs + jersey-multipart + ${jersey.multipart.version} + provided + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + org.openecomp.sdc.onboarding + vendor-software-products-rest-types + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-activity-log-manager + ${project.version} + + + org.openecomp.sdc + unique-type-rest-types + ${project.version} + + + org.powermock + powermock-module-junit4-common + ${powermock.version} + test + + + org.powermock + powermock-api-mockito2 + ${powermock.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml index 66864d5da9..c19908e36c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml @@ -16,47 +16,41 @@ --> - 4.0.0 + 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 - vendor-software-products-rest-types - vendor-software-products-rest-types + vendor-software-products-rest-types + vendor-software-products-rest-types - - org.openecomp.sdc.onboarding - vendor-software-products-rest - 1.7.0-SNAPSHOT - ../ - + + org.openecomp.sdc.onboarding + vendor-software-products-rest + 1.7.0-SNAPSHOT + ../ + - - - org.openecomp.sdc - openecomp-sdc-common-rest - ${project.version} - - - org.openecomp.sdc - item-rest-services - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-vendor-software-product-manager - ${project.version} - - - org.projectlombok - lombok - provided - - - junit - junit - ${junit.version} - test - - + + + org.openecomp.sdc + openecomp-sdc-common-rest + ${project.version} + + + org.openecomp.sdc + item-rest-services + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-manager + ${project.version} + + + org.projectlombok + lombok + provided + + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml index 0ba36b9d81..ffb2a7cdf0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml @@ -16,90 +16,87 @@ ~ limitations under the License. --> - - 4.0.0 + + 4.0.0 - vnf-repository-rest-services + vnf-repository-rest-services - - org.openecomp.sdc.onboarding - vendor-software-products-rest - 1.7.0-SNAPSHOT - + + org.openecomp.sdc.onboarding + vendor-software-products-rest + 1.7.0-SNAPSHOT + - - - javax.ws.rs - javax.ws.rs-api - provided - - - io.swagger.core.v3 - swagger-annotations - - - org.springframework - spring-context - - - org.openecomp.sdc.onboarding - vendor-software-products-rest-services - ${project.version} - - - org.onap.sdc.common - onap-configuration-management-api - ${project.version} - - - org.onap.sdc.common - onap-configuration-management-core - ${project.version} - runtime - - - org.openecomp.sdc - openecomp-sdc-logging-api - ${project.version} - - - org.openecomp.sdc - openecomp-sdc-logging-core - ${project.version} - runtime - - - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - runtime - - - ch.qos.logback - logback-classic - test - - - junit - junit - test - - - com.github.tomakehurst - wiremock-standalone - 2.6.0 - test - - + + + javax.ws.rs + javax.ws.rs-api + provided + + + io.swagger.core.v3 + swagger-annotations + + + org.springframework + spring-context + + + org.openecomp.sdc.onboarding + vendor-software-products-rest-services + ${project.version} + + + org.onap.sdc.common + onap-configuration-management-api + ${project.version} + + + org.onap.sdc.common + onap-configuration-management-core + ${project.version} + runtime + + + org.openecomp.sdc + openecomp-sdc-logging-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-logging-core + ${project.version} + runtime + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + runtime + + + ch.qos.logback + logback-classic + test + + + com.github.tomakehurst + wiremock-standalone + 2.6.0 + test + + - - - - org.apache.maven.plugins - maven-surefire-plugin - - - + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + -- cgit 1.2.3-korg