From 42ef3e4d9d80ac3de18cb687fac3c375ecdc96db Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 13 Sep 2018 12:11:35 -0400 Subject: [PATCH] Fix groupIds Incorrect groupIds - need to match repo structure. Also, name tags need to include sdnc-oam to map to correct Sonar project. Change-Id: I530855763bb02fc655a2192f9af55da63fd12512 Issue-ID: SDNC-445 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: 597abe7f0380146d5e44588c2be24c63357afbd7 --- SdncReports/SdncReportsApi/pom.xml | 359 ++++++++++----------- SdncReports/SdncReportsDao/pom.xml | 90 +++--- SdncReports/pom.xml | 13 +- .../getBackupVnfDetailService/pom.xml | 99 +++--- configbackuprestore/pom.xml | 9 +- configbackuprestore/vnfconfigbackupservice/pom.xml | 10 +- .../vnfconfigreportsservice/pom.xml | 56 ++-- 7 files changed, 310 insertions(+), 326 deletions(-) diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index 2529a054..f5320780 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -1,210 +1,193 @@ - - 4.0.0 - jar - SdncReportsApi - - org.onap.ccsdk.parent - SdncReports - 0.0.1-SNAPSHOT - - - - + + 4.0.0 + jar + SdncReportsApi + org.onap.sdnc.oam + 1.4.0-SNAPSHOT + sdnc-oam :: SdncReports :: SdncReportsApi + + org.onap.sdnc.oam + SdncReports + 1.4.0-SNAPSHOT + + + + UTF-8 UTF-8 1.8 - - - - - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - - - + + + + + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + + + com.google.code.gson gson 2.8.2 - - - - - org.onap.ccsdk.parent - SdncReportsDao - 0.0.1-SNAPSHOT - - - + + + + + ${project.groupId} + SdncReportsDao + ${project.version} + + + org.mariadb.jdbc mariadb-java-client 1.1.9 - - - org.springframework.boot - spring-boot-starter-web - 1.5.4.RELEASE - - - - org.springframework - spring-context - 4.3.9.RELEASE - - - + + + org.springframework.boot + spring-boot-starter-web + 1.5.4.RELEASE + + + + org.springframework + spring-context + 4.3.9.RELEASE + + + org.springframework.boot spring-boot-starter-tomcat provided - + - + org.apache.tomcat.embed tomcat-embed-jasper provided - - - - - org.springframework.boot - spring-boot-devtools - true - - - - org.springframework.boot - spring-boot-starter-test - test - 1.5.3.RELEASE - - - + + + + + org.springframework.boot + spring-boot-devtools + true + + + org.springframework.boot - spring-boot-starter-data-jpa - - + spring-boot-starter-test + test + 1.5.3.RELEASE + + + + org.springframework.boot + spring-boot-starter-data-jpa + + - - org.springframework.boot - spring-boot-starter-log4j2 - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - - pre-unit-test - - prepare-agent - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - ${project.reporting.outputDirectory}/jacoco-ut - - - - - - - io.fabric8 - docker-maven-plugin - 0.15.3 - - http://127.0.0.1:9092 - true - - - vishal/sdnc_report - - Dockerfile - - artifact - - - - - - - - - - \ No newline at end of file + + org.springframework.boot + spring-boot-starter-log4j2 + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + + + + io.fabric8 + docker-maven-plugin + 0.15.3 + + http://127.0.0.1:9092 + true + + + vishal/sdnc_report + + Dockerfile + + artifact + + + + + + + + + + diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 5e6afa16..afcce957 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -1,65 +1,65 @@ - - 4.0.0 - SdncReportsDao - jar - - - org.onap.ccsdk.parent - SdncReports - 0.0.1-SNAPSHOT - - - - - org.springframework - spring-context - - - - org.springframework.boot - spring-boot-starter-test - test - 1.5.3.RELEASE - - + + 4.0.0 + org.onap.sdnc.oam + SdncReportsDao + 1.4.0-SNAPSHOT + jar + + sdnc-oam :: SdncReports :: SdncReportsDao + + + org.onap.sdnc.oam + SdncReports + 1.4.0-SNAPSHOT + + + + + org.springframework + spring-context + + + + org.springframework.boot + spring-boot-starter-test + test + 1.5.3.RELEASE + + org.springframework.boot spring-boot-starter-data-jpa org.hibernate - hibernate-entitymanager + hibernate-entitymanager - + - + mysql mysql-connector-java runtime - + com.fasterxml.jackson.core jackson-annotations - - - - org.mariadb.jdbc - mariadb-java-client - 1.1.7 - - - \ No newline at end of file + + + + org.mariadb.jdbc + mariadb-java-client + 1.1.7 + + + diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index a811d1b3..5b9bd5dc 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -1,13 +1,16 @@ - 4.0.0 - org.onap.ccsdk.parent + org.onap.sdnc.oam SdncReports - 0.0.1-SNAPSHOT + 1.4.0-SNAPSHOT pom + sdnc-oam :: SdncReports + org.springframework.boot spring-boot-starter-parent @@ -23,10 +26,10 @@ http://nexus.onap.org/content/repositories/snapshots - + SdncReportsDao - SdncReportsApi + SdncReportsApi diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index a5259f09..ad82e094 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -1,17 +1,18 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.onap.ccsdk.parent + org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.0-SNAPSHOT + 1.4.0-SNAPSHOT - com.onap.sdnc.vnfbackup + com.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.0-SNAPSHOT - getBackupVnfDetailService + 1.4.0-SNAPSHOT + sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org UTF-8 @@ -105,50 +106,44 @@ - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - - pre-unit-test - - prepare-agent - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${project.build.directory}/coverage-reports/jacoco-ut.exec - - ${project.reporting.outputDirectory}/jacoco-ut - - - - - + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/coverage-reports/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + + - \ No newline at end of file + diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 9aa3c32d..4501ca7d 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -1,13 +1,14 @@ - 4.0.0 - org.onap.ccsdk.parent + org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.0-SNAPSHOT - Archetype - configbackuprestore + 1.4.0-SNAPSHOT + sdnc-oam :: vnfbackup pom diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index bf6fdf0e..c3de9c2e 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -6,15 +6,15 @@ 4.0.0 - org.onap.ccsdk.parent + org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.0-SNAPSHOT + 1.4.0-SNAPSHOT - com.onap.sdnc.vnfbackupservice + com.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.0-SNAPSHOT - vnfconfigbackupservice + 1.4.0-SNAPSHOT + sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index 1d83bd02..22ed28f3 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -1,34 +1,36 @@ - - 4.0.0 - - org.onap.ccsdk.parent + + 4.0.0 + + org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.0-SNAPSHOT + 1.4.0-SNAPSHOT - com.onap.sdnc.vnfbackup - vnfconfigreportsservice - 1.0-SNAPSHOT - vnfconfigreportsservice - http://maven.apache.org - - UTF-8 - - + com.onap.sdnc.oam.vnfbackup + vnfconfigreportsservice + 1.4.0-SNAPSHOT + sdnc-oam :: vnfbackup :: vnfconfigreportservice + http://maven.apache.org + + UTF-8 + + junit junit 4.11 test - + - javax.servlet - jstl - provided - - + javax.servlet + jstl + provided + + org.mariadb.jdbc mariadb-java-client @@ -101,12 +103,12 @@ jackson-xml-databind 0.6.2 - - org.mockito - mockito-all - 1.9.5 - test - + + org.mockito + mockito-all + 1.9.5 + test + -- 2.16.6