From fe8d3bc523ac928f5cf7d9a9951d584b333e21f5 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 18 Jan 2019 16:51:25 -0500 Subject: [PATCH] Updates for Fluorine Updated to create Fluorine-based artifacts Change-Id: Ib450be62cc016c1b5e6da2ebfb4fa3d9851e9a41 Issue-ID: SDNC-552 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: 95f86710cfec2e6267bc97280ab6cfad4cf44866 --- .gitignore | 5 +++++ SdncReports/SdncReportsApi/pom.xml | 5 ++--- SdncReports/SdncReportsDao/pom.xml | 5 ++--- SdncReports/pom.xml | 7 +++---- admportal/pom.xml | 17 +++++++++++++---- configbackuprestore/getBackupVnfDetailService/pom.xml | 7 ++----- configbackuprestore/pom.xml | 6 ++---- configbackuprestore/vnfconfigbackupservice/pom.xml | 8 +++----- configbackuprestore/vnfconfigreportsservice/pom.xml | 8 ++------ installation/admportal/pom.xml | 5 ++--- installation/ansible-server/pom.xml | 5 ++--- installation/dmaap-listener/pom.xml | 5 ++--- installation/pom.xml | 5 ++--- installation/sdnc/pom.xml | 5 ++--- installation/sdnc/src/main/docker/Dockerfile | 2 +- installation/ueb-listener/pom.xml | 5 ++--- platform-logic/datachange/pom.xml | 7 +++---- platform-logic/generic-resource-api/pom.xml | 7 +++---- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 7 +++---- platform-logic/restconfapi-yang/pom.xml | 7 +++---- platform-logic/setup/pom.xml | 4 ++-- platform-logic/vnfapi/pom.xml | 4 ++-- pom.xml | 2 +- 26 files changed, 69 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index e1ea3801..b632be92 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ## IDE Specific Files ## org.eclipse.core.resources.prefs +.checkstyle .classpath .project .settings @@ -55,3 +56,7 @@ local-mode-cache #version plugin backups **/*.versionsBackup + +#Yang generated +**/restconfapi-yang/src/main/java/ +**/yang-gen-sal/ diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index 23fc5121..c1226e23 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 jar SdncReportsApi diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 776c496b..09a15c7b 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 org.onap.sdnc.oam SdncReportsDao diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 026f9616..cb99f881 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -1,6 +1,5 @@ - + + 4.0.0 @@ -14,7 +13,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 6c390aac..0398a62d 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT @@ -29,7 +28,17 @@ ${maven.build.timestamp} ${project.version}-${build.number} - + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + org.onap.ccsdk.sli.core diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index 8c4a65dc..3c3e9305 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -1,8 +1,5 @@ - - + + 4.0.0 org.onap.sdnc.oam.vnfbackup diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 035c616e..4b79ea09 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 @@ -14,7 +12,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index ef9a981e..c521c4aa 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 @@ -170,4 +168,4 @@ - \ No newline at end of file + diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index b84886fd..2fe814eb 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -1,8 +1,5 @@ - - + + 4.0.0 org.onap.sdnc.oam.vnfbackup @@ -111,4 +108,3 @@ - diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 7cd1f478..21bb37ff 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 0ec328ee..991aa91f 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 7878df52..1be5d881 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom diff --git a/installation/pom.xml b/installation/pom.xml index 383c6763..e884f776 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 004bb2c5..ed84080e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 89e2aa01..f424238b 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odlsli-image:${ccsdk.docker.version} +FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.onap.org) diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 5cd806a4..920c6e3a 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -1,11 +1,10 @@ - + org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index bdd154f1..801a29b7 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 9bc61948..838e9a1a 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 636e4aa7..8fca5988 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index a7515381..036a7d4d 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 7ccdbf74..2ecb8b6e 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 08263434..1b6afbc2 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 690617b9..1efdff6d 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index d3dfefb3..15d2d6e0 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index c0deed0e..62dc6ba9 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT - + 1.2.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/pom.xml b/pom.xml index 3876a21f..9f339d11 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT org.onap.sdnc.oam -- 2.16.6