From c0247ec48aaa2fefb6a2c065d18b27d7c65e94ff Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Thu, 11 Apr 2019 10:34:45 -0400 Subject: corrected inlucde filter for formatter all pom.xml files now have two spaces validation is on for pom.xml files Change-Id: I424ea2e4d6a549f468792e5f90a43f3a97e6c954 Issue-ID: SO-1781 Signed-off-by: Benjamin, Max (mb388a) --- adapters/mso-adapter-utils/pom.xml | 292 ++++++------- adapters/mso-adapters-rest-interface/pom.xml | 120 +++--- adapters/mso-catalog-db-adapter/pom.xml | 391 ++++++++--------- adapters/mso-openstack-adapters/pom.xml | 478 +++++++++++---------- adapters/mso-requests-db-adapter/pom.xml | 477 ++++++++++---------- adapters/mso-sdnc-adapter/pom.xml | 336 +++++++-------- adapters/mso-vfc-adapter/pom.xml | 228 +++++----- .../mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml | 205 +++++---- .../mso-vnfm-adapter-ext-clients/pom.xml | 451 ++++++++++--------- .../mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml | 253 ++++++----- adapters/mso-vnfm-adapter/pom.xml | 37 +- adapters/pom.xml | 71 +-- 12 files changed, 1670 insertions(+), 1669 deletions(-) (limited to 'adapters') diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index ed76354792..7918072323 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -1,151 +1,151 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-adapter-utils - mso-adapter-utils - Common MSO utilities, including Openstack client wrappers. + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-adapter-utils + mso-adapter-utils + Common MSO utilities, including Openstack client wrappers. - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - ${project.artifactId} - src/main/java - + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + ${project.artifactId} + src/main/java + - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - - copy-resources - validate - - copy-resources - - - - - ./src/main/resources/META-INF - false - - - ${project.build.directory}/${project.build.finalName}/META-INF/ - - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + copy-resources + validate + + copy-resources + + + + + ./src/main/resources/META-INF + false + + + ${project.build.directory}/${project.build.finalName}/META-INF/ + + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + + + - - - org.glassfish.jersey.core - jersey-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - true - - - org.onap.so - mso-catalog-db - ${project.version} - - - org.onap.so - cloudify-client - ${project.version} - - - javax.servlet - javax.servlet-api - provided - - - org.jmockit - jmockit - 1.8 - test - - - org.yaml - snakeyaml - - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - test - - - org.apache.cxf - cxf-rt-rs-client - ${cxf.version} - - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - + + + org.glassfish.jersey.core + jersey-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + true + + + org.onap.so + mso-catalog-db + ${project.version} + + + org.onap.so + cloudify-client + ${project.version} + + + javax.servlet + javax.servlet-api + provided + + + org.jmockit + jmockit + 1.8 + test + + + org.yaml + snakeyaml + + + org.springframework.boot + spring-boot-starter-test + test + + + com.h2database + h2 + test + + + org.apache.cxf + cxf-rt-rs-client + ${cxf.version} + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index a23cb62e1e..17d4bc1e35 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-adapters-rest-interface - jar - mso-adapters-rest-interface - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-adapters-rest-interface + jar + mso-adapters-rest-interface + Java Beans (Requests and Responses) for Network/Tenant/VNF/SDNC REST Operations - - ${project.artifactId}-${project.version} - - - maven-jar-plugin - 2.6 - - target/classes - - - - org.jacoco - jacoco-maven-plugin - - - - - - org.javatuples - javatuples - 1.2 - - - org.onap.so.libs.openstack-java-sdk - keystone-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk - heat-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk - quantum-client - ${openstack.version} - - - org.onap.so.libs.openstack-java-sdk.client-connectors - http-connector - ${openstack.version} - - - org.onap.so - common - ${project.version} - - + + ${project.artifactId}-${project.version} + + + maven-jar-plugin + 2.6 + + target/classes + + + + org.jacoco + jacoco-maven-plugin + + + + + + org.javatuples + javatuples + 1.2 + + + org.onap.so.libs.openstack-java-sdk + keystone-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk + heat-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk + quantum-client + ${openstack.version} + + + org.onap.so.libs.openstack-java-sdk.client-connectors + http-connector + ${openstack.version} + + + org.onap.so + common + ${project.version} + + diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 1f6ea413ec..9ec98cf96c 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -1,206 +1,207 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + - org.onap.so.adapters - mso-catalog-db-adapter - jar - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.adapters.catalogdb.CatalogDBApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - - -parameters - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.jax-ws-commons - + jaxws-maven-plugin - + [2.3,) - - wsgen - - - - - - - - - - + + wsgen + + + + + + + + + + + - - org.jacoco - jacoco-maven-plugin - - - - ${project.artifactId}-${project.version} - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - - org.springframework.boot - spring-boot-starter-web - - - io.swagger - swagger-jersey2-jaxrs - 1.5.16 - - - org.mariadb.jdbc - mariadb-java-client - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so - mso-catalog-db - ${project.version} - - - uk.co.blackpepper.bowman - bowman-client - 0.3.0 - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.flywaydb - flyway-core - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - + + org.jacoco + jacoco-maven-plugin + + + + ${project.artifactId}-${project.version} + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + + org.springframework.boot + spring-boot-starter-web + + + io.swagger + swagger-jersey2-jaxrs + 1.5.16 + + + org.mariadb.jdbc + mariadb-java-client + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so + mso-catalog-db + ${project.version} + + + uk.co.blackpepper.bowman + bowman-client + 0.3.0 + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.flywaydb + flyway-core + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 9c3ef2578f..088f9499ce 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -1,62 +1,62 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - mso-openstack-adapters - jar - mso-openstack-adapters - Consolidate openstack adapters into one Spring Boot project - - 10.1.0 - - - ${project.artifactId}-${project.version} + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + mso-openstack-adapters + jar + mso-openstack-adapters + Consolidate openstack adapters into one Spring Boot project + + 10.1.0 + + + ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.openstack.MsoOpenstackAdaptersApplication - - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.openstack.MsoOpenstackAdaptersApplication + + + + + repackage - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - - - - - + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + + + + + - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.jax-ws-commons - + jaxws-maven-plugin - + [2.3,) - - wsgen - - - - - - - - - - - - - + + wsgen + + + + + + + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.webjars + swagger-ui + 3.5.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + janino + janino + 2.5.15 + - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.webjars - swagger-ui - 3.5.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - janino - janino - 2.5.15 - + - + + org.pacesys + openstack4j-core + 3.1.0 + + + org.pacesys.openstack4j.connectors + openstack4j-httpclient + 3.1.0 + - - org.pacesys - openstack4j-core - 3.1.0 - - - org.pacesys.openstack4j.connectors - openstack4j-httpclient - 3.1.0 - + + commons-collections + commons-collections + 3.2.1 + - - commons-collections - commons-collections - 3.2.1 - + + com.typesafe + config + 1.3.2 + + + com.google.code.findbugs + jsr305 + 1.3.9 + - - com.typesafe - config - 1.3.2 - - - com.google.code.findbugs - jsr305 - 1.3.9 - - - - commons-validator - commons-validator - 1.4.0 - + + commons-validator + commons-validator + 1.4.0 + - - - org.onap.so.adapters - mso-adapter-utils - ${project.version} - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - javax.servlet - javax.servlet-api - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.onap.so - common - ${project.version} - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - test - - - org.onap.so - cxf-logging - ${project.version} - - - org.onap.so.libs.openstack-java-sdk - nova-model - ${openstack.version} - - - org.camunda.bpm - camunda-external-task-client - 1.1.1 - - + + + org.onap.so.adapters + mso-adapter-utils + ${project.version} + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + javax.servlet + javax.servlet-api + test + + + org.mariadb.jdbc + mariadb-java-client + + + org.onap.so + common + ${project.version} + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + test + + + org.onap.so + cxf-logging + ${project.version} + + + org.onap.so.libs.openstack-java-sdk + nova-model + ${openstack.version} + + + org.camunda.bpm + camunda-external-task-client + 1.1.1 + + diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 4be3935cf4..a02ebbe75d 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -1,249 +1,250 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + - org.onap.so.adapters - mso-requests-db-adapter - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - mso-requests-db-repositories - ${project.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - true - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.flywaydb - flyway-core - true - - - net.javacrumbs.shedlock - shedlock-spring - - - net.javacrumbs.shedlock - shedlock-provider-jdbc-template - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.onap.so - cxf-logging - ${project.version} - - + org.onap.so.adapters + mso-requests-db-adapter + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mariadb.jdbc + mariadb-java-client + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + mso-requests-db-repositories + ${project.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + true + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.flywaydb + flyway-core + true + + + net.javacrumbs.shedlock + shedlock-spring + + + net.javacrumbs.shedlock + shedlock-provider-jdbc-template + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.onap.so + cxf-logging + ${project.version} + + - - ${project.artifactId}-${project.version} - - - org.apache.cxf - cxf-java2ws-plugin - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-simple - ${cxf.version} - - - - - process-classes - process-classes - - org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter - true - true - - - java2ws - - - - - - org.jacoco - jacoco-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.onap.so.adapters.requestsdb.application.MSORequestDBApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.cxf - + cxf-java2ws-plugin - + [3.2.5,) - - java2ws - - - - - - - - - - - - - + + java2ws + + + + + + + + + + + + + + diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 7f03879507..fc577a52e3 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -1,172 +1,172 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - mso-sdnc-adapter - - UTF-8 - UTF-8 - - mso-sdnc-adapter - mso sdnc adapter + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + mso-sdnc-adapter + + UTF-8 + UTF-8 + + mso-sdnc-adapter + mso sdnc adapter - - ${project.artifactId}-${project.version} - - - org.apache.cxf - cxf-codegen-plugin - 2.5.2 - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.sdnc.SDNCAdapterApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-docker-file - - - - - io.fabric8 - fabric8-maven-plugin - - - start - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - default-test - - test - - - - **/AllTestsTestSuite.java - - suites - - - - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - + + ${project.artifactId}-${project.version} + + + org.apache.cxf + cxf-codegen-plugin + 2.5.2 + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.sdnc.SDNCAdapterApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + + + + io.fabric8 + fabric8-maven-plugin + + + start + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + test + + + + **/AllTestsTestSuite.java + + suites + + + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + - - - org.springframework.boot - spring-boot-starter-web - - - io.swagger - swagger-jersey2-jaxrs - 1.5.16 - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so.adapters - mso-adapter-utils - ${project.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.glassfish - javax.json - 1.0.4 - test - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-prometheus - - - org.onap.so - cxf-logging - ${project.version} - - + + + org.springframework.boot + spring-boot-starter-web + + + io.swagger + swagger-jersey2-jaxrs + 1.5.16 + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so.adapters + mso-adapter-utils + ${project.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.glassfish + javax.json + 1.0.4 + test + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-registry-prometheus + + + org.onap.so + cxf-logging + ${project.version} + + diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml index 5408bf9112..09dd512629 100644 --- a/adapters/mso-vfc-adapter/pom.xml +++ b/adapters/mso-vfc-adapter/pom.xml @@ -1,116 +1,116 @@ - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-vfc-adapter - mso-vfc-adapter - Web service endpoint for vfc operations - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - - ${project.artifactId}-${project.version} - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.vfc.MSOVfcApplication - - - - - repackage - - - - - - org.jacoco - jacoco-maven-plugin - - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.apache.tomcat - tomcat-jdbc - - - - - org.apache.cxf - cxf-spring-boot-starter-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-spring-boot-starter-jaxrs - ${cxf.version} - - - org.apache.cxf - cxf-rt-rs-service-description-swagger - ${cxf.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so - mso-requests-db - ${project.version} - - - org.onap.so - mso-requests-db-repositories - ${project.version} - - - org.mariadb.jdbc - mariadb-java-client - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-vfc-adapter + mso-vfc-adapter + Web service endpoint for vfc operations + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + + ${project.artifactId}-${project.version} + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.vfc.MSOVfcApplication + + + + + repackage + + + + + + org.jacoco + jacoco-maven-plugin + + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.tomcat + tomcat-jdbc + + + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-spring-boot-starter-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-rs-service-description-swagger + ${cxf.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so + mso-requests-db + ${project.version} + + + org.onap.so + mso-requests-db-repositories + ${project.version} + + + org.mariadb.jdbc + mariadb-java-client + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml index 7e866f9008..66a1cb1ca7 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-api/pom.xml @@ -1,105 +1,104 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-adapter-api - - UTF-8 - UTF-8 - 1.8.2 - 2.3.0 - 1.3.5 - 1.0.1 - 1.5.15 - - mso-vnfm-adapter-api - MSO VNFM adapter API + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-adapter-api + + UTF-8 + UTF-8 + 1.8.2 + 2.3.0 + 1.3.5 + 1.0.1 + 1.5.15 + + mso-vnfm-adapter-api + MSO VNFM adapter API - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - vnfmadapter - - generate - - - ${basedir}/src/main/resources/vnfmadapter.yaml - java - retrofit2 - ${project.build.directory}/generated-sources/vnfmadapter - org.onap.vnfmadapter.v1.api - org.onap.vnfmadapter.v1.model - - true - src/gen/java/main - true - true - true - - - - - - - - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.retrofit2 - converter-gson - ${retrofit-version} - - - com.squareup.retrofit2 - retrofit - ${retrofit-version} - - - com.squareup.retrofit2 - converter-scalars - ${retrofit-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - io.reactivex.rxjava2 - rxjava - - - com.squareup.retrofit2 - adapter-rxjava2 - ${retrofit-version} - - - com.google.code.gson - gson - - + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + vnfmadapter + + generate + + + ${basedir}/src/main/resources/vnfmadapter.yaml + java + retrofit2 + ${project.build.directory}/generated-sources/vnfmadapter + org.onap.vnfmadapter.v1.api + org.onap.vnfmadapter.v1.model + + true + src/gen/java/main + true + true + true + + + + + + + + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.retrofit2 + converter-gson + ${retrofit-version} + + + com.squareup.retrofit2 + retrofit + ${retrofit-version} + + + com.squareup.retrofit2 + converter-scalars + ${retrofit-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + io.reactivex.rxjava2 + rxjava + + + com.squareup.retrofit2 + adapter-rxjava2 + ${retrofit-version} + + + com.google.code.gson + gson + + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml index c161bc2cd4..da778d286e 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/pom.xml @@ -1,234 +1,233 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-adapter-ext-clients - - UTF-8 - UTF-8 - 1.5.15 - 2.7.5 - 1.8.2 - 1.3.5 - 2.4.0 - 3.14.0 - 1.0.1 - - mso-vnfm-adapter-ext-clients - Clients for the vnfm adpater to use towards REST endpoints which are external to the VNFM adapter/ + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-adapter-ext-clients + + UTF-8 + UTF-8 + 1.5.15 + 2.7.5 + 1.8.2 + 1.3.5 + 2.4.0 + 3.14.0 + 1.0.1 + + mso-vnfm-adapter-ext-clients + Clients for the vnfm adpater to use towards REST endpoints which are external to the VNFM adapter/ - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - sol003-vnf-lcm-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleManagement-API.json - java - okhttp-gson - ${project.build.directory}/generated-sources/sol003-vnf-lcm - org.onap.so.adapters.vnfmadapter.extclients.vnfm.api - org.onap.so.adapters.vnfmadapter.extclients.vnfm.model - - true - src/gen/java/main - true - true - true - - - - - sol003-vnf-lcn-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json - java - okhttp-gson - ${project.build.directory}/generated-sources/sol003-vnf-lcn - org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.api - org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.model - - true - src/gen/java/main - true - true - true - - - - - sol003-vnf-grant-api - - generate - - - ${basedir}/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + sol003-vnf-lcm-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleManagement-API.json + java + okhttp-gson + ${project.build.directory}/generated-sources/sol003-vnf-lcm + org.onap.so.adapters.vnfmadapter.extclients.vnfm.api + org.onap.so.adapters.vnfmadapter.extclients.vnfm.model + + true + src/gen/java/main + true + true + true + + + + + sol003-vnf-lcn-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json + java + okhttp-gson + ${project.build.directory}/generated-sources/sol003-vnf-lcn + org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.api + org.onap.so.adapters.vnfmadapter.extclients.vnfm.lcn.model + + true + src/gen/java/main + true + true + true + + + + + sol003-vnf-grant-api + + generate + + + ${basedir}/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json - java - retrofit2 - ${project.build.directory}/generated-sources/sol003-vnf-grant - false - org.onap.so.adapters.vnfmadapter.extclients.vnfm.grant.model - - false - src/gen/java/main - true - true - - - - - - - + java + retrofit2 + ${project.build.directory}/generated-sources/sol003-vnf-grant + false + org.onap.so.adapters.vnfmadapter.extclients.vnfm.grant.model + + false + src/gen/java/main + true + true + + + + + + + - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.okhttp - okhttp - ${okhttp-version} - - - com.squareup.okhttp - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - junit - junit - 4.12 - - provided - - - com.squareup.retrofit2 - converter-gson - ${retrofit2-version} - - - com.squareup.retrofit2 - retrofit - ${retrofit2-version} - - - com.squareup.retrofit2 - converter-scalars - ${retrofit2-version} - - - com.squareup.retrofit2 - adapter-rxjava2 - ${retrofit2-version} - - - com.squareup.okhttp3 - okhttp - ${okhttp3-version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp3-version} - - - com.squareup.okhttp - logging-interceptor - ${okhttp-version} - + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.okhttp + okhttp + ${okhttp-version} + + + com.squareup.okhttp + logging-interceptor + ${okhttp-version} + + + com.google.code.gson + gson + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + junit + junit + 4.12 + + provided + + + com.squareup.retrofit2 + converter-gson + ${retrofit2-version} + + + com.squareup.retrofit2 + retrofit + ${retrofit2-version} + + + com.squareup.retrofit2 + converter-scalars + ${retrofit2-version} + + + com.squareup.retrofit2 + adapter-rxjava2 + ${retrofit2-version} + + + com.squareup.okhttp3 + okhttp + ${okhttp3-version} + + + com.squareup.okhttp3 + logging-interceptor + ${okhttp3-version} + + + com.squareup.okhttp + logging-interceptor + ${okhttp-version} + - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.common - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.httpclient4 - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.client - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.common - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.authzserver - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.resourceserver - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.resourceserver-filter - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg.server - ${oltu-version} - - - org.apache.oltu.oauth2 - org.apache.oltu.oauth2.jwt - ${oltu-version} - - + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.common + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.httpclient4 + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.client + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.common + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.authzserver + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.resourceserver + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.resourceserver-filter + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.server + ${oltu-version} + + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.jwt + ${oltu-version} + + - + diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml index fdbc76dea7..c561721b3e 100644 --- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml +++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/pom.xml @@ -1,129 +1,128 @@ - - 4.0.0 - - org.onap.so.adapters - mso-vnfm-adapter - 1.4.0-SNAPSHOT - - mso-vnfm-etsi-adapter - - UTF-8 - UTF-8 - - mso-vnfm-etsi-adapter - MSO ETSI compliant VNFM Adapter + + 4.0.0 + + org.onap.so.adapters + mso-vnfm-adapter + 1.4.0-SNAPSHOT + + mso-vnfm-etsi-adapter + + UTF-8 + UTF-8 + + mso-vnfm-etsi-adapter + MSO ETSI compliant VNFM Adapter - - ${project.artifactId}-${project.version} - - - org.springframework.boot - spring-boot-maven-plugin - - org.onap.so.adapters.vnfmadapter.VnfmAdapterApplication - - - - - repackage - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - original - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - DEBUG - - 2 - suites - false - 1 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.so.adapters - mso-adapters-rest-interface - ${project.version} - - - org.onap.so.adapters - mso-vnfm-adapter-api - ${project.version} - - - org.onap.so.adapters - mso-vnfm-adapter-ext-clients - ${project.version} - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.core - jersey-common - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.inject - jersey-hk2 - 2.26 - - - org.glassfish.jersey.media - jersey-media-json-jackson - - - org.yaml - snakeyaml - 1.23 - - + + ${project.artifactId}-${project.version} + + + org.springframework.boot + spring-boot-maven-plugin + + org.onap.so.adapters.vnfmadapter.VnfmAdapterApplication + + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + original + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + DEBUG + + 2 + suites + false + 1 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.so.adapters + mso-adapters-rest-interface + ${project.version} + + + org.onap.so.adapters + mso-vnfm-adapter-api + ${project.version} + + + org.onap.so.adapters + mso-vnfm-adapter-ext-clients + ${project.version} + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.core + jersey-common + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + 2.26 + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + org.yaml + snakeyaml + 1.23 + + diff --git a/adapters/mso-vnfm-adapter/pom.xml b/adapters/mso-vnfm-adapter/pom.xml index 9cc17056c2..962b3b4fb7 100644 --- a/adapters/mso-vnfm-adapter/pom.xml +++ b/adapters/mso-vnfm-adapter/pom.xml @@ -1,22 +1,21 @@ - - 4.0.0 - - org.onap.so - adapters - 1.4.0-SNAPSHOT - - org.onap.so.adapters - mso-vnfm-adapter - MSO VNFM Adapter - MSO Adapter for VNFM - pom + + 4.0.0 + + org.onap.so + adapters + 1.4.0-SNAPSHOT + + org.onap.so.adapters + mso-vnfm-adapter + MSO VNFM Adapter + MSO Adapter for VNFM + pom - - mso-vnfm-adapter-api - mso-vnfm-adapter-ext-clients - mso-vnfm-etsi-adapter - + + mso-vnfm-adapter-api + mso-vnfm-adapter-ext-clients + mso-vnfm-etsi-adapter + diff --git a/adapters/pom.xml b/adapters/pom.xml index d00304b837..bd7bebafa0 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -1,41 +1,42 @@ - - 4.0.0 - - org.onap.so - so - 1.4.0-SNAPSHOT - + + 4.0.0 + + org.onap.so + so + 1.4.0-SNAPSHOT + - adapters - MSO Adapters - Adapters for MSO - pom + adapters + MSO Adapters + Adapters for MSO + pom - - mso-adapter-utils - mso-adapters-rest-interface - mso-sdnc-adapter - mso-requests-db-adapter - mso-catalog-db-adapter - mso-vfc-adapter - mso-openstack-adapters - mso-vnfm-adapter + + mso-adapter-utils + mso-adapters-rest-interface + mso-sdnc-adapter + mso-requests-db-adapter + mso-catalog-db-adapter + mso-vfc-adapter + mso-openstack-adapters + mso-vnfm-adapter - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.springframework.cloud - spring-cloud-contract-wiremock - 1.2.4.RELEASE - - + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.springframework.cloud + spring-cloud-contract-wiremock + 1.2.4.RELEASE + + -- cgit 1.2.3-korg