From a0f9f9bf12b06c894b980d4438ddae4cf5a4abd2 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 3 Mar 2020 10:56:20 -0500 Subject: [PATCH] Use released 1.5.2 CCSDK parent Update to use released version of CCSDK parent pom Change-Id: I573d5c30a799c1bf828b195aa0dff1b85c9a44ad Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- artifacts/pom.xml | 2 +- dblib/installer/pom.xml | 2 +- dblib/pom.xml | 2 +- dblib/provider/pom.xml | 2 +- features/ccsdk-dblib/pom.xml | 2 +- features/ccsdk-filters/pom.xml | 2 +- features/ccsdk-sli-core-all/pom.xml | 2 +- features/ccsdk-sli/pom.xml | 2 +- features/ccsdk-sliPluginUtils/pom.xml | 2 +- features/ccsdk-sliapi/pom.xml | 2 +- features/ccsdk-slicore-utils/pom.xml | 2 +- features/features-sli-core/pom.xml | 2 +- features/installer/pom.xml | 2 +- features/pom.xml | 2 +- filters/installer/pom.xml | 2 +- filters/pom.xml | 2 +- filters/provider/pom.xml | 2 +- pom.xml | 2 +- sli/common/pom.xml | 2 +- sli/installer/pom.xml | 2 +- sli/model/pom.xml | 2 +- sli/pom.xml | 2 +- sli/provider-base/pom.xml | 2 +- sli/provider/pom.xml | 2 +- sliPluginUtils/installer/pom.xml | 2 +- sliPluginUtils/pom.xml | 2 +- sliPluginUtils/provider/pom.xml | 2 +- sliapi/installer/pom.xml | 2 +- sliapi/model/pom.xml | 2 +- sliapi/pom.xml | 2 +- sliapi/provider/pom.xml | 2 +- sliapi/springboot/pom.xml | 194 ++++++++++++++++++---------------- utils/installer/pom.xml | 2 +- utils/pom.xml | 2 +- utils/provider/pom.xml | 2 +- 35 files changed, 137 insertions(+), 125 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a5ed3799..a99345c8 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.onap.ccsdk.parent parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index ecc73ec1..2b150e26 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/dblib/pom.xml b/dblib/pom.xml index cd2b8724..6cf7cee2 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 745671c1..409f1500 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml index 664898a7..eea93557 100644 --- a/features/ccsdk-dblib/pom.xml +++ b/features/ccsdk-dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml index 24cc33b7..8ba8c1c6 100644 --- a/features/ccsdk-filters/pom.xml +++ b/features/ccsdk-filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml index 576cff0f..e5876001 100644 --- a/features/ccsdk-sli-core-all/pom.xml +++ b/features/ccsdk-sli-core-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-sli/pom.xml b/features/ccsdk-sli/pom.xml index 14c82312..f32fd591 100644 --- a/features/ccsdk-sli/pom.xml +++ b/features/ccsdk-sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml index c92dafc2..df843c04 100644 --- a/features/ccsdk-sliPluginUtils/pom.xml +++ b/features/ccsdk-sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml index b1bf1550..f7ffe28a 100644 --- a/features/ccsdk-sliapi/pom.xml +++ b/features/ccsdk-sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml index daf8e135..92940065 100644 --- a/features/ccsdk-slicore-utils/pom.xml +++ b/features/ccsdk-slicore-utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml index 08c00c49..f524ca5d 100644 --- a/features/features-sli-core/pom.xml +++ b/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 092b88d8..12fc962a 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/features/pom.xml b/features/pom.xml index ee1d01e5..9e927d47 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index b03bf754..3a90de58 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/filters/pom.xml b/filters/pom.xml index b7d7c5fa..73f1fa99 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index fd24dbed..4dc25a70 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/pom.xml b/pom.xml index c65d6c6a..6ce85271 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/common/pom.xml b/sli/common/pom.xml index 2570f33b..d1dde52f 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index dcbe6b8d..5e5d099e 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/model/pom.xml b/sli/model/pom.xml index 4e551da7..c330646c 100755 --- a/sli/model/pom.xml +++ b/sli/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/pom.xml b/sli/pom.xml index 7363f5b7..d21a6cfb 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml index fd97a717..8d59b507 100644 --- a/sli/provider-base/pom.xml +++ b/sli/provider-base/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index 638bb9bb..eb3dc27d 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 8a5455e7..0a3c62c3 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 0dd6dcc1..85d232a5 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index be7f8514..a568e0ab 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index 2f363ef5..304e0358 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml index f25714bf..fee78a6f 100755 --- a/sliapi/model/pom.xml +++ b/sliapi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliapi/pom.xml b/sliapi/pom.xml index c8bc164c..58589305 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 5b277964..0ad2ce75 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml index e3cca4bd..602c20af 100644 --- a/sliapi/springboot/pom.xml +++ b/sliapi/springboot/pom.xml @@ -1,18 +1,18 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - spring-boot-starter-parent - 1.5.2-SNAPSHOT + + org.onap.ccsdk.parent + spring-boot-starter-parent + 1.5.2 - + - org.onap.ccsdk.sli.core - sliapi-springboot - 0.7.1-SNAPSHOT - jar + org.onap.ccsdk.sli.core + sliapi-springboot + 0.7.1-SNAPSHOT + jar ccsdk-sli-core :: sliapi :: ${project.artifactId} @@ -20,96 +20,108 @@ org.onap.ccsdk.sli.core.sliapi.springboot.App - - - io.swagger - swagger-annotations - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot + + + io.swagger + swagger-annotations + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot spring-boot-starter-test test org.springframework.boot - spring-boot-starter-data-jpa - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - ${project.groupId} - sli-provider-base - ${project.version} - - - com.google.code.gson - gson - - - org.apache.derby - derby - runtime - + spring-boot-starter-data-jpa + + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + + + ${project.groupId} + dblib-provider + ${project.version} + + + ${project.groupId} + sli-common + ${project.version} + + + ${project.groupId} + sli-provider-base + ${project.version} + + + com.google.code.gson + gson + + + org.apache.derby + derby + runtime + junit junit test - + - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - - generate - - - target/generated-sources - ${project.basedir}/../model/src/main/resources/sli-api.20161110.yaml - spring - org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger - org.onap.ccsdk.sli.core.sliapi.model - org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger - true - true - ${project.basedir}/.swagger-codegen-ignore - true - - true - 2.2.4-RELEASE - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + + generate + + + target/generated-sources + ${project.basedir}/../model/src/main/resources/sli-api.20161110.yaml + spring + org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger + org.onap.ccsdk.sli.core.sliapi.model + org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger + true + true + ${project.basedir}/.swagger-codegen-ignore + true + + true + 2.2.4-RELEASE + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index fde570ba..eb5dd0e8 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/utils/pom.xml b/utils/pom.xml index 83c94905..c1bfe1ea 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 1.5.2 diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml index e228e2f1..20cb30fc 100644 --- a/utils/provider/pom.xml +++ b/utils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 1.5.2 -- 2.16.6