From 94f4b9bf8661ad75628163b46518e902b6abc834 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 2 Mar 2021 20:00:49 -0500 Subject: Refactoring pom's name tag Indenting pom's and running mvn tidy:pom to rearrange items Issue-ID: CCSDK-3198 Signed-off-by: Singal, Kapil (ks220y) Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735 --- core/artifacts/pom.xml | 290 +++++++-------- core/dblib/installer/pom.xml | 230 ++++++------ core/dblib/pom.xml | 26 +- core/dblib/provider/pom.xml | 112 +++--- core/features/ccsdk-dblib/pom.xml | 104 +++--- core/features/ccsdk-filters/pom.xml | 74 ++-- core/features/ccsdk-sli-core-all/pom.xml | 150 ++++---- core/features/ccsdk-sli/pom.xml | 101 +++--- core/features/ccsdk-sliPluginUtils/pom.xml | 4 +- core/features/ccsdk-sliapi/pom.xml | 2 +- core/features/ccsdk-slicore-utils/pom.xml | 3 +- core/features/installer/pom.xml | 403 ++++++++++----------- core/features/pom.xml | 38 +- core/filters/installer/pom.xml | 228 ++++++------ core/filters/pom.xml | 26 +- core/filters/provider/pom.xml | 2 +- core/pom.xml | 234 ++++++------ core/sli/common/pom.xml | 2 +- core/sli/installer/pom.xml | 259 +++++++------ core/sli/model/pom.xml | 5 +- core/sli/pom.xml | 4 +- core/sli/provider-base/pom.xml | 108 +++--- core/sli/provider/pom.xml | 306 ++++++++-------- core/sliPluginUtils/installer/pom.xml | 266 +++++++------- core/sliPluginUtils/pom.xml | 34 +- core/sliPluginUtils/provider/pom.xml | 150 ++++---- core/sliapi/installer/pom.xml | 2 +- core/sliapi/model/pom.xml | 33 +- core/sliapi/model/swagger/pom.xml | 4 +- .../sliapi/model/swagger/src/main/json/sliapi.json | 2 +- .../sliapi/model/swagger/src/main/yaml/sliapi.yaml | 30 +- core/sliapi/model/yang/pom.xml | 31 +- core/sliapi/pom.xml | 40 +- core/sliapi/provider/pom.xml | 3 +- core/utils/installer/pom.xml | 231 ++++++------ core/utils/pom.xml | 26 +- core/utils/provider/pom.xml | 12 +- 37 files changed, 1783 insertions(+), 1792 deletions(-) (limited to 'core') diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 4eda1ea1b..cc380a48e 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -1,152 +1,152 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sli-core-artifacts - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sli-core-artifacts + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sli-core-artifacts - CCSDK core components Bill of Materials (BOM) - https://wiki.onap.org - - ONAP - + ccsdk-sli-core :: ${project.artifactId} + CCSDK core components Bill of Materials (BOM) + https://wiki.onap.org + + ONAP + - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-filters - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sli-core-all - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sliapi - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-slicore-utils - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sliPluginUtils - ${project.version} - xml - features - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - org.onap.ccsdk.sli.core - dblib-installer - ${project.version} - - - org.onap.ccsdk.sli.core - filters-provider - ${project.version} - - - org.onap.ccsdk.sli.core - filters-installer - ${project.version} - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - org.onap.ccsdk.sli.core - sli-model - ${project.version} - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - org.onap.ccsdk.sli.core - sli-provider-base - ${project.version} - - - org.onap.ccsdk.sli.core - sliapi-model - ${project.version} - - - org.onap.ccsdk.sli.core - sliapi-provider - ${project.version} - - - org.onap.ccsdk.sli.core - sliapi-installer - ${project.version} - - - org.onap.ccsdk.sli.core - sliPluginUtils-provider - ${project.version} - - - org.onap.ccsdk.sli.core - sliPluginUtils-installer - ${project.version} - - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - - - org.onap.ccsdk.sli.core - utils-installer - ${project.version} - - - + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-filters + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli-core-all + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sliapi + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-slicore-utils + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sliPluginUtils + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + org.onap.ccsdk.sli.core + dblib-installer + ${project.version} + + + org.onap.ccsdk.sli.core + filters-provider + ${project.version} + + + org.onap.ccsdk.sli.core + filters-installer + ${project.version} + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + org.onap.ccsdk.sli.core + sli-model + ${project.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + org.onap.ccsdk.sli.core + sli-provider-base + ${project.version} + + + org.onap.ccsdk.sli.core + sliapi-model + ${project.version} + + + org.onap.ccsdk.sli.core + sliapi-provider + ${project.version} + + + org.onap.ccsdk.sli.core + sliapi-installer + ${project.version} + + + org.onap.ccsdk.sli.core + sliPluginUtils-provider + ${project.version} + + + org.onap.ccsdk.sli.core + sliPluginUtils-installer + ${project.version} + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + + + org.onap.ccsdk.sli.core + utils-installer + ${project.version} + + + diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 2f9186f85..8a594ffae 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -1,128 +1,128 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - dblib-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + dblib-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: dblib :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - ccsdk-dblib - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-dblib + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - + - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.core - utils-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.core + utils-provider + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - + + - - + + diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 58e79e63e..bc7ff901f 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -1,27 +1,27 @@ - 4.0.0 + 4.0.0 - + org.onap.ccsdk.parent odlparent-lite 2.1.1 - org.onap.ccsdk.sli.core - dblib - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + dblib + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: dblib - The DBLIB adaptor allows service logic to access persistent data in a local sql database - + ccsdk-sli-core :: ${project.artifactId} + The DBLIB adaptor allows service logic to access persistent data in a local sql database + ONAP - - provider - installer - + + provider + installer + diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 49f067739..61123cb85 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - dblib-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + dblib-provider + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-core :: dblib :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - - junit - junit - test - - - ch.vorburger.mariaDB4j - mariaDB4j - test - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - test - - - org.mariadb.jdbc - mariadb-java-client - - - org.apache.tomcat - tomcat-jdbc - - - com.google.guava - guava - - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + + junit + junit + test + + + ch.vorburger.mariaDB4j + mariaDB4j + test + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + test + + + org.mariadb.jdbc + mariadb-java-client + + + org.apache.tomcat + tomcat-jdbc + + + com.google.guava + guava + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + - - - org.mockito - mockito-core - test - - + + + org.mockito + mockito-core + test + + diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 7481c3944..656dfc628 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-dblib - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-dblib + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: dblib :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - + - - ${project.groupId} - dblib-provider - ${project.version} - + + ${project.groupId} + dblib-provider + ${project.version} + - - org.mariadb.jdbc - mariadb-java-client - - - org.apache.tomcat - tomcat-jdbc + + org.mariadb.jdbc + mariadb-java-client + + + org.apache.tomcat + tomcat-jdbc 9.0.30 - - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + - - org.apache.derby - derby - - + + org.apache.derby + derby + + - - - - org.apache.karaf.tooling - karaf-maven-plugin - true - - - slf4j-api - tomcat-jdbc - tomcat-juli - - - - - + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + + slf4j-api + tomcat-jdbc + tomcat-juli + + + + + diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 44a5a6e1b..b7f429378 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -1,45 +1,45 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-filters - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-filters + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: filters :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - - ${project.groupId} - filters-provider - ${project.version} - - + + + ${project.groupId} + filters-provider + ${project.version} + + - - - - org.apache.karaf.tooling - karaf-maven-plugin - true - - - - slf4j-api - javax.annotation-api - javax.servlet-api - javax.ws.rs-api - - - - - + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + + + slf4j-api + javax.annotation-api + javax.servlet-api + javax.ws.rs-api + + + + + diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 8424d8c80..748d4e4e3 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -1,82 +1,82 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-sli-core-all - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.core + ccsdk-sli-core-all + 1.2.1-SNAPSHOT + feature - ccsdk-sli-core :: features :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - - - ${project.groupId} - ccsdk-slicore-utils - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-dblib - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-filters - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sli - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sliapi - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sliPluginUtils - ${project.version} - xml - features - - + + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + + + ${project.groupId} + ccsdk-slicore-utils + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-dblib + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-filters + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sli + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliapi + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliPluginUtils + ${project.version} + xml + features + + diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 430b0dd2e..36f03842a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - - - org.onap.ccsdk.sli.core - ccsdk-sli - 1.2.1-SNAPSHOT - feature - - ccsdk-sli-core :: sli :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - provided - - - - org.mariadb.jdbc - mariadb-java-client - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${project.version} - xml - features - - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + + + org.onap.ccsdk.sli.core + ccsdk-sli + 1.2.1-SNAPSHOT + feature + + ccsdk-sli-core :: features :: ${project.artifactId} + + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + provided + + + + org.mariadb.jdbc + mariadb-java-client + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index a53214f55..d63c89e32 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} @@ -31,6 +31,6 @@ sliPluginUtils-provider ${project.version} - + diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index a4d049f6c..edd4cc39d 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: sliapi :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index 58f613fe9..a2d817335 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -14,11 +14,10 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-core :: utils :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - ${project.groupId} utils-provider diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index a9b684874..12255e857 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -1,214 +1,213 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - slicore-features-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + slicore-features-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: features :: ${project.artifactId} + ccsdk-sli-core :: features :: ${project.artifactId} - - ccsdk-sli-core-all - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-sli-core-all + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - - - org.onap.ccsdk.sli.core - ccsdk-slicore-utils - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ccsdk-filters - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ccsdk-sliapi - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ccsdk-sliPluginUtils - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - + + + org.onap.ccsdk.sli.core + ccsdk-slicore-utils + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-filters + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sliapi + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ccsdk-sliPluginUtils + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.core + ${application.name} + ${project.version} + xml + features + + + * + * + + + + - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j + utils-provider,slf4j-api + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j - utils-provider,slf4j-api - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + - - - - - + + diff --git a/core/features/pom.xml b/core/features/pom.xml index a027dbe76..3004e2d63 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: features + ccsdk-sli-core :: features - - ccsdk-slicore-utils - ccsdk-dblib - ccsdk-filters - ccsdk-sli - ccsdk-sliapi - ccsdk-sliPluginUtils + + ccsdk-slicore-utils + ccsdk-dblib + ccsdk-filters + ccsdk-sli + ccsdk-sliapi + ccsdk-sliPluginUtils ccsdk-sli-core-all features-sli-core installer diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index bd42e1dad..f83f22f0c 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -1,126 +1,126 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - filters-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + filters-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: filters :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - ccsdk-filters - ${application.name} + + ccsdk-filters + ${application.name} mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + false + - - - org.onap.ccsdk.sli.core - filters-provider - ${project.version} - - + + + org.onap.ccsdk.sli.core + filters-provider + ${project.version} + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.core - sli-common,sli-provider,utils-provider,dblib-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.core + sli-common,sli-provider,utils-provider,dblib-provider + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - + + - - + + diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 9fa1f8247..03085af58 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -1,27 +1,27 @@ - 4.0.0 + 4.0.0 - + org.onap.ccsdk.parent odlparent-lite 2.1.1 - org.onap.ccsdk.sli.core - filters - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + filters + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: filters - Servlet filter to implement ONAP logging spec - + ccsdk-sli-core :: ${project.artifactId} + Servlet filter to implement ONAP logging spec + ONAP - - provider - installer - + + provider + installer + diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index f0135c05c..ab0b847be 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-core :: filters :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index fa8ad0bb9..63d6c9ed6 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,131 +1,131 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - ccsdk-sli-core - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + ccsdk-sli-core + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core - CCSDK core components contains the SLI, dblib - https://wiki.onap.org - - ONAP - + ${project.artifactId} + CCSDK core components contains the SLI, dblib + https://wiki.onap.org + + ONAP + - + utils - dblib - sli - filters - sliPluginUtils - sliapi - features - artifacts - + dblib + sli + filters + sliPluginUtils + sliapi + features + artifacts + - - scm:git:ssh://git@${onap.git.host}/sdnc-code.git - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-core.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-core/browse - sdnc-core-1.1.0 - - - - ecomp-site - dav:${onap.nexus.url}/${sitePath} - - + + scm:git:ssh://git@${onap.git.host}/sdnc-code.git + scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-core.git + ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-core/browse + sdnc-core-1.1.0 + + + + ecomp-site + dav:${onap.nexus.url}/${sitePath} + + - - content/sites/site/org/onap/ccsdk/sli/core/${project.version}/ - + + content/sites/site/org/onap/ccsdk/sli/core/${project.version}/ + - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + - + - - dependency-list - - - - com.github.ferstl - depgraph-maven-plugin - - - validate - false - - aggregate - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - false - - attach-artifact - - - - - ${dependency-list.file} - txt - dependencies - - - - - - - - - + + dependency-list + + + + com.github.ferstl + depgraph-maven-plugin + + + validate + false + + aggregate + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + false + + attach-artifact + + + + + ${dependency-list.file} + txt + dependencies + + + + + + + + + - + diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 930c66a9f..3bdfd9f1d 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-core :: sli :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} The SLI Common package includes common classes used by the various SLI subcomponents, as well as classes used by clients to interface with the service logic interpreter diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 50ecbe18e..57d04b111 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -1,144 +1,143 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sli-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sli-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sli :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - ccsdk-sli - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-sli + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.core + utils-provider,dblib-provider + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.core - utils-provider,dblib-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + - - - - - + + diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index 01de73df2..7d0468ac4 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -14,14 +14,13 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-core :: sli :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - + org.opendaylight.mdsal.binding.model.ietf rfc6991 - diff --git a/core/sli/pom.xml b/core/sli/pom.xml index f3c2d54ef..6c2c9febb 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -14,8 +14,8 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-core :: sli - The Service Logic Interpreter (SLI) allows service planners to design the flow of logic within the SDN controller in an XML format, without a need for custom Java code. + ccsdk-sli-core :: ${project.artifactId} + The Service Logic Interpreter (SLI) allows service planners to design the flow of logic within the SDN controller in an XML format, without a need for custom Java code. ONAP diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index ad10991c3..114b2a051 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - sli-provider-base - 1.2.1-SNAPSHOT - bundle - - ccsdk-sli-core :: sli :: ${project.artifactId} + org.onap.ccsdk.sli.core + sli-provider-base + 1.2.1-SNAPSHOT + bundle - - UTF-8 - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml,../provider/target/site/jacoco-aggregate/jacoco.xml - + ccsdk-sli-core :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - compile - - - org.slf4j - slf4j-api - - - commons-lang - commons-lang - compile - + + UTF-8 + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml,../provider/target/site/jacoco-aggregate/jacoco.xml + - - - junit - junit - test - + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + compile + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + compile + - - org.mockito - mockito-core - test - + + + junit + junit + test + - + + org.mockito + mockito-core + test + + + diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index ccc44a554..c3826fd21 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -1,163 +1,163 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - sli-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + sli-provider + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-core :: sli :: ${project.artifactId} - SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service. + ccsdk-sli-core :: ${project.artifactId} + SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service. - - UTF-8 - + + UTF-8 + - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - - - org.onap.ccsdk.sli.core - sli-model - ${project.version} - test - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - compile - - - org.onap.ccsdk.sli.core - sli-provider-base - ${project.version} - compile - - - org.slf4j - slf4j-api - - - commons-lang - commons-lang - compile - - - org.osgi - org.osgi.core - provided - - - org.opendaylight.mdsal - mdsal-binding-api - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991 - provided - - - org.opendaylight.bgpcep - bgp-concepts - provided - true - - - org.opendaylight.mdsal - mdsal-dom-api - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - com.google.code.findbugs - annotations - - - junit - junit - test - + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + + + org.onap.ccsdk.sli.core + sli-model + ${project.version} + test + + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + compile + + + org.onap.ccsdk.sli.core + sli-provider-base + ${project.version} + compile + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + compile + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.mdsal + mdsal-binding-api + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + provided + + + org.opendaylight.bgpcep + bgp-concepts + provided + true + + + org.opendaylight.mdsal + mdsal-dom-api + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + com.google.code.findbugs + annotations + + + junit + junit + test + - - org.mockito - mockito-core - test - - - org.apache.derby - derby - test - - + + org.mockito + mockito-core + test + + + org.apache.derby + derby + test + + - - - - org.apache.felix - maven-bundle-plugin - true - - - * - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - aggregate-report - verify - - report-aggregate - - - - target/code-coverage/jacoco-ut.exec, - target/code-coverage/jacoco-it.exec, - ../provider-base/target/code-coverage/jacoco-ut.exec, - ../provider-base/target/code-coverage/jacoco-it.exec - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - dummyUser - dummyPassword - dummyDatabase - - - - + + + + org.apache.felix + maven-bundle-plugin + true + + + * + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + aggregate-report + verify + + report-aggregate + + + + target/code-coverage/jacoco-ut.exec, + target/code-coverage/jacoco-it.exec, + ../provider-base/target/code-coverage/jacoco-ut.exec, + ../provider-base/target/code-coverage/jacoco-it.exec + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + dummyUser + dummyPassword + dummyDatabase + + + + org.apache.maven.plugins maven-failsafe-plugin @@ -168,6 +168,6 @@ - - + + diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index c61fae7e8..146296d38 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -1,147 +1,147 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sliPluginUtils-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sliPluginUtils-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - ccsdk-sliPluginUtils - ${application.name} + + ccsdk-sliPluginUtils + ${application.name} mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + false + - - - - - org.onap.ccsdk.sli.core - sli-common - ${project.version} - - - org.onap.ccsdk.sli.core - sli-provider - ${project.version} - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - + + - - org.onap.ccsdk.sli.core - sliPluginUtils-provider - ${project.version} - + + org.onap.ccsdk.sli.core + sli-common + ${project.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + - + + org.onap.ccsdk.sli.core + sliPluginUtils-provider + ${project.version} + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - + + + + + diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index f729cc7f5..0cb797831 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -1,24 +1,24 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sliPluginUtils - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sliPluginUtils + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sliPluginUtils - A package of static utility functions to be used when developing SLI plugins + ccsdk-sli-core :: ${project.artifactId} + A package of static utility functions to be used when developing SLI plugins - - provider - installer - + + provider + installer + diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 8e156ad47..2d432ca36 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -1,84 +1,84 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - sliPluginUtils-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + sliPluginUtils-provider + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} - http://maven.apache.org + ccsdk-sli-core :: ${project.artifactId} + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - - org.onap.ccsdk.sli.core - dblib-provider - ${project.version} - - - - - - junit - junit - test - - - ${project.groupId} - sli-common - ${project.version} - compile - + + + + org.onap.ccsdk.sli.core + dblib-provider + ${project.version} + + + + + + junit + junit + test + + + ${project.groupId} + sli-common + ${project.version} + compile + - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - - - org.apache.commons - commons-lang3 - - - org.hamcrest - hamcrest-library - test - - - com.google.code.gson - gson - - - org.apache.commons - commons-text - - - org.apache.commons - commons-lang3 - - - com.google.guava - guava - - - org.codehaus.jettison - jettison - - + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + org.apache.commons + commons-lang3 + + + org.hamcrest + hamcrest-library + test + + + com.google.code.gson + gson + + + org.apache.commons + commons-text + + + org.apache.commons + commons-lang3 + + + com.google.guava + guava + + + org.codehaus.jettison + jettison + + diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index f25b5dc35..bd927e9c8 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-core :: sliapi :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} ccsdk-sliapi diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index fcbe294a8..afb7809a7 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -1,24 +1,23 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sliapi-model - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sliapi-model + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sliapi - - - yang - swagger - + ccsdk-sli-core :: ${project.artifactId} + + yang + swagger + diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index 1b8fdc91b..17edee28f 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -29,7 +29,7 @@ sliapi-model-yang ${project.version} - + @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-source-plugin - + org.codehaus.mojo build-helper-maven-plugin 1.10 diff --git a/core/sliapi/model/swagger/src/main/json/sliapi.json b/core/sliapi/model/swagger/src/main/json/sliapi.json index 9133f3379..070ec0381 100644 --- a/core/sliapi/model/swagger/src/main/json/sliapi.json +++ b/core/sliapi/model/swagger/src/main/json/sliapi.json @@ -1 +1 @@ -{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.2.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}} \ No newline at end of file +{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.2.1-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}} \ No newline at end of file diff --git a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml index 15da98dfd..b00b7f077 100644 --- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml +++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml @@ -18,7 +18,7 @@ info: Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\ \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\ \ notices." - version: "1.2.0-SNAPSHOT" + version: "1.2.1-SNAPSHOT" title: "SLI-API,ietf-yang-types,ietf-inet-types API" consumes: - "application/json" @@ -38,10 +38,10 @@ paths: description: "Internal error" 200: description: "sli.api.TestResults" - responseSchema: + schema: originalRef: "#/definitions/sli.api.TestResults" $ref: "#/definitions/sli.api.TestResults" - schema: + responseSchema: originalRef: "#/definitions/sli.api.TestResults" $ref: "#/definitions/sli.api.TestResults" post: @@ -126,10 +126,10 @@ paths: description: "Internal error" 200: description: "sli.api.testresults.TestResult" - responseSchema: + schema: originalRef: "#/definitions/sli.api.testresults.TestResult" $ref: "#/definitions/sli.api.testresults.TestResult" - schema: + responseSchema: originalRef: "#/definitions/sli.api.testresults.TestResult" $ref: "#/definitions/sli.api.testresults.TestResult" post: @@ -206,10 +206,10 @@ paths: description: "Internal error" 200: description: "sli.api.TestResults" - responseSchema: + schema: originalRef: "#/definitions/sli.api.TestResults" $ref: "#/definitions/sli.api.TestResults" - schema: + responseSchema: originalRef: "#/definitions/sli.api.TestResults" $ref: "#/definitions/sli.api.TestResults" /operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/: @@ -228,10 +228,10 @@ paths: description: "Internal error" 200: description: "sli.api.testresults.TestResult" - responseSchema: + schema: originalRef: "#/definitions/sli.api.testresults.TestResult" $ref: "#/definitions/sli.api.testresults.TestResult" - schema: + responseSchema: originalRef: "#/definitions/sli.api.testresults.TestResult" $ref: "#/definitions/sli.api.testresults.TestResult" /operations/SLI-API:execute-graph/: @@ -252,10 +252,10 @@ paths: description: "Internal error" 200: description: "Correct response" - responseSchema: + schema: originalRef: "#/definitions/sli.api.ExecuteGraph" $ref: "#/definitions/sli.api.ExecuteGraph" - schema: + responseSchema: originalRef: "#/definitions/sli.api.ExecuteGraph" $ref: "#/definitions/sli.api.ExecuteGraph" 201: @@ -270,10 +270,10 @@ paths: description: "Internal error" 200: description: "Correct response" - responseSchema: + schema: originalRef: "#/definitions/sli.api.Healthcheck" $ref: "#/definitions/sli.api.Healthcheck" - schema: + responseSchema: originalRef: "#/definitions/sli.api.Healthcheck" $ref: "#/definitions/sli.api.Healthcheck" 201: @@ -288,10 +288,10 @@ paths: description: "Internal error" 200: description: "Correct response" - responseSchema: + schema: originalRef: "#/definitions/sli.api.Vlbcheck" $ref: "#/definitions/sli.api.Vlbcheck" - schema: + responseSchema: originalRef: "#/definitions/sli.api.Vlbcheck" $ref: "#/definitions/sli.api.Vlbcheck" 201: diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 894434891..68c388a13 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -1,27 +1,26 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 2.1.1 - - + + org.onap.ccsdk.parent + binding-parent + 2.1.1 + + - org.onap.ccsdk.sli.core - sliapi-model-yang - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.core + sliapi-model-yang + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-core :: sliapi :: ${project.artifactId} + ccsdk-sli-core :: sliapi :: ${project.artifactId} - - + + org.opendaylight.mdsal.binding.model.ietf rfc6991 - - + diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 599425d30..ba1cc74fc 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - sliapi - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + sliapi + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: sliapi + ccsdk-sli-core :: ${project.artifactId} - - model - provider - installer - + + model + provider + installer + - - sliapi - + + sliapi + diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 7b5f91527..78ba74116 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-core :: sliapi :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} @@ -25,7 +25,6 @@ - org.opendaylight.mdsal diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 4aee45b14..20c316711 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -1,129 +1,128 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.core - utils-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + utils-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: utils :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} - - ccsdk-slicore-utils - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-slicore-utils + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - + - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + + - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli,org.apache.tomcat + sli-common,sli-provider + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli,org.apache.tomcat - sli-common,sli-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + - - - - - + + diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 58cdc50ac..3a831d2a1 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -1,27 +1,27 @@ - 4.0.0 + 4.0.0 - + org.onap.ccsdk.parent odlparent-lite 2.1.1 - org.onap.ccsdk.sli.core - utils - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.core + utils + 1.2.1-SNAPSHOT + pom - ccsdk-sli-core :: utils - Utilities used across sli-core - + ccsdk-sli-core :: ${project.artifactId} + Utilities used across sli-core + ONAP - - provider - installer - + + provider + installer + diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 68b24769b..517df5f29 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-core :: utils :: ${project.artifactId} + ccsdk-sli-core :: ${project.artifactId} The SLI Core Utilities Package provides common functionality for setting up SLI connectivity. @@ -27,11 +27,11 @@ com.google.guava guava - - org.osgi - org.osgi.core - provided - + + org.osgi + org.osgi.core + provided + -- cgit 1.2.3-korg