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 --- adaptors/aai-service/installer/pom.xml | 3 +- adaptors/aai-service/pom.xml | 2 +- adaptors/aai-service/provider/pom.xml | 6 +- .../ansible-adapter/ansible-adapter-bundle/pom.xml | 29 +- .../ansible-adapter-installer/pom.xml | 7 +- adaptors/ansible-adapter/pom.xml | 314 +++++++------ adaptors/artifacts/pom.xml | 280 ++++++------ adaptors/base/http/installer/pom.xml | 228 +++++----- adaptors/base/http/pom.xml | 2 + adaptors/base/http/provider/pom.xml | 68 +-- adaptors/base/pom.xml | 4 +- adaptors/features/ccsdk-aai-service/pom.xml | 3 +- adaptors/features/ccsdk-ansible-adapter/pom.xml | 5 +- adaptors/features/ccsdk-base-http/pom.xml | 38 +- adaptors/features/ccsdk-mdsal-resource/pom.xml | 2 +- .../features/ccsdk-messagerouter-consumer/pom.xml | 46 +- .../features/ccsdk-messagerouter-publisher/pom.xml | 46 +- adaptors/features/ccsdk-netbox-client/pom.xml | 2 +- .../features/ccsdk-resource-assignment/pom.xml | 3 +- adaptors/features/ccsdk-saltstack-adapter/pom.xml | 5 +- adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 4 +- adaptors/features/ccsdk-sql-resource/pom.xml | 3 +- adaptors/features/installer/pom.xml | 505 ++++++++++----------- adaptors/features/pom.xml | 46 +- adaptors/mdsal-resource/installer/pom.xml | 2 +- adaptors/mdsal-resource/pom.xml | 2 +- adaptors/mdsal-resource/provider/pom.xml | 28 +- adaptors/message-router/consumer/api/pom.xml | 44 +- adaptors/message-router/consumer/installer/pom.xml | 238 +++++----- adaptors/message-router/consumer/pom.xml | 28 +- adaptors/message-router/consumer/provider/pom.xml | 74 +-- adaptors/message-router/pom.xml | 44 +- adaptors/message-router/publisher/api/pom.xml | 44 +- .../message-router/publisher/installer/pom.xml | 248 +++++----- adaptors/message-router/publisher/pom.xml | 30 +- adaptors/message-router/publisher/provider/pom.xml | 66 +-- .../message-router/publisher/sample.client/pom.xml | 66 +-- adaptors/netbox-client/installer/pom.xml | 4 +- adaptors/netbox-client/pom.xml | 2 +- adaptors/netbox-client/provider/pom.xml | 2 +- adaptors/pom.xml | 7 +- adaptors/resource-assignment/installer/pom.xml | 2 +- adaptors/resource-assignment/pom.xml | 2 +- adaptors/resource-assignment/provider/pom.xml | 20 +- adaptors/saltstack-adapter/pom.xml | 4 +- .../saltstack-adapter-installer/pom.xml | 3 +- .../saltstack-adapter-provider/pom.xml | 37 +- adaptors/sql-resource/installer/pom.xml | 2 +- adaptors/sql-resource/pom.xml | 2 +- adaptors/sql-resource/provider/pom.xml | 38 +- 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 +- northbound/artifacts/pom.xml | 2 +- northbound/asdcApi/installer/pom.xml | 229 +++++----- northbound/asdcApi/model/pom.xml | 3 +- northbound/asdcApi/pom.xml | 3 +- northbound/asdcApi/provider/pom.xml | 23 +- northbound/daexim-offsite-backup/installer/pom.xml | 2 +- northbound/daexim-offsite-backup/model/pom.xml | 3 +- northbound/daexim-offsite-backup/pom.xml | 2 +- northbound/daexim-offsite-backup/provider/pom.xml | 30 +- northbound/dataChange/installer/pom.xml | 3 +- northbound/dataChange/model/pom.xml | 4 +- northbound/dataChange/pom.xml | 2 +- northbound/dataChange/provider/pom.xml | 44 +- northbound/dmaap-listener/pom.xml | 5 +- northbound/features/ccsdk-asdcApi/pom.xml | 2 +- .../features/ccsdk-daexim-offsite-backup/pom.xml | 2 +- northbound/features/ccsdk-dataChange/pom.xml | 2 +- northbound/features/ccsdk-lcm/pom.xml | 2 +- .../features/ccsdk-sli-northbound-all/pom.xml | 1 - northbound/features/installer/pom.xml | 4 +- northbound/lcm/installer/pom.xml | 3 +- northbound/lcm/model/pom.xml | 3 +- northbound/lcm/pom.xml | 2 +- northbound/lcm/provider/pom.xml | 50 +- northbound/pom.xml | 45 +- northbound/ueb-listener/pom.xml | 5 +- plugins/artifacts/pom.xml | 198 ++++---- plugins/features/ccsdk-gr-toolkit/pom.xml | 2 +- plugins/features/ccsdk-properties-node/pom.xml | 3 +- plugins/features/ccsdk-restapi-call-node/pom.xml | 54 +-- plugins/features/ccsdk-restconf-client/pom.xml | 59 ++- plugins/features/ccsdk-sli-plugins-all/pom.xml | 114 ++--- plugins/features/ccsdk-sshapi-call-node/pom.xml | 4 +- plugins/features/ccsdk-template-node/pom.xml | 40 +- plugins/features/installer/pom.xml | 401 ++++++++-------- plugins/features/pom.xml | 38 +- plugins/grToolkit/installer/pom.xml | 2 +- plugins/grToolkit/model/pom.xml | 3 +- plugins/grToolkit/pom.xml | 2 +- plugins/grToolkit/provider/pom.xml | 26 +- plugins/pom.xml | 2 +- plugins/properties-node/installer/pom.xml | 2 +- plugins/properties-node/pom.xml | 5 +- plugins/properties-node/provider/pom.xml | 20 +- .../ccsdk/sli/plugins/prop/TestPropertiesNode.java | 4 +- .../provider/src/test/resources/test-invalid.xml | 8 +- .../provider/src/test/resources/test.xml | 8 +- plugins/restapi-call-node/installer/pom.xml | 226 ++++----- plugins/restapi-call-node/pom.xml | 2 +- plugins/restapi-call-node/provider/pom.xml | 44 +- .../provider/src/test/resources/test.xml | 8 +- plugins/restconf-client/installer/pom.xml | 2 +- plugins/restconf-client/pom.xml | 2 +- plugins/restconf-client/provider/pom.xml | 4 +- plugins/sshapi-call-node/installer/pom.xml | 226 ++++----- plugins/sshapi-call-node/pom.xml | 2 +- plugins/sshapi-call-node/provider/pom.xml | 21 +- .../provider/src/test/resources/test.xml | 8 +- plugins/template-node/installer/pom.xml | 228 +++++----- plugins/template-node/pom.xml | 2 + plugins/template-node/provider/pom.xml | 82 ++-- pom.xml | 44 +- 149 files changed, 4311 insertions(+), 4326 deletions(-) diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 49db131eb..37e21fc40 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-aai-service @@ -45,7 +45,6 @@ ${project.version} - diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index f6fbe63be..4def1b073 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: aai-service + ccsdk-sli-adaptors :: ${project.artifactId} The AAI Interface service exposes an interface to AAI as an OSGi service diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index 617d4ff4e..e1b1cabcf 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} @@ -48,7 +48,7 @@ org.onap.logging-analytics logging-filter-base provided - + org.osgi org.osgi.core @@ -98,7 +98,7 @@ javax.xml.bind - jaxb-api + jaxb-api javax.annotation diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml index b47eaa643..acf220396 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -1,16 +1,16 @@ - @@ -28,7 +28,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} @@ -60,7 +60,6 @@ httpclient - org.glassfish.jersey.core @@ -116,12 +115,10 @@ json - com.google.guava guava - diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml index f393ede76..13fe78edb 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -38,7 +38,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-ansible-adapter @@ -55,7 +55,6 @@ ${project.version} - @@ -70,7 +69,7 @@ package - true + true true stage/${application.name}-${project.version} @@ -85,7 +84,7 @@ package - false + false true ${application.name}-${project.version} diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index 65fd5de0c..8d8f85720 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -24,168 +24,166 @@ --> - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - - - org.onap.ccsdk.sli.adaptors - ansible-adaptor - 1.2.1-SNAPSHOT - pom - - ccsdk-sli-adaptors :: ansible-adapter - Abstractions to interact with Ansible server via REST - - - ansible-adapter-bundle - ansible-adapter-installer - - - - - - - org.onap.appc - ansible-adapter-features - ${project.version} - xml - features - - - - org.onap.appc - ansible-adapter-provider - ${project.version} - - - - - - - - - - + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + + + org.onap.ccsdk.sli.adaptors + ansible-adaptor + 1.2.1-SNAPSHOT + pom + + ccsdk-sli-adaptors :: ${project.artifactId} + Abstractions to interact with Ansible server via REST + + + ansible-adapter-bundle + ansible-adapter-installer + + + + + + + org.onap.appc + ansible-adapter-features + ${project.version} + xml + features + + + + org.onap.appc + ansible-adapter-provider + ${project.version} + + + + + + + + JCenter JCenter Repository http://jcenter.bintray.com - - - - - - - - - - - - - - maven-javadoc-plugin - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.antlr - antlr4 - ${antlr.version} - - - org.antlr - antlr4-runtime - 4.3 - - - - - - - javadoc-no-fork - test-javadoc-no-fork - - - - aggregate - - aggregate - test-aggregate - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - aggregate - - aggregate - test-aggregate - - - - - - - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-changelog-plugin - 2.3 - - - dual-report - - range - 30 - - - changelog - file-activity - - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - + + + + + + + + + + + + + + maven-javadoc-plugin + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.antlr + antlr4 + ${antlr.version} + + + org.antlr + antlr4-runtime + 4.3 + + + + + + + javadoc-no-fork + test-javadoc-no-fork + + + + aggregate + + aggregate + test-aggregate + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + aggregate + + aggregate + test-aggregate + + + + + + + maven-surefire-plugin + + + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + dual-report + + range + 30 + + + changelog + file-activity + + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index a0473197b..7be30447e 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/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.adaptors - sli-adaptors-artifacts - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors + sli-adaptors-artifacts + 1.2.1-SNAPSHOT + pom - ccsdk-sli-adaptors :: sli-adaptors-artifacts - CCSDK adaptors components Bill of Materials (BOM) - https://wiki.onap.org - - ONAP - + ccsdk-sli-adaptors :: ${project.artifactId} + CCSDK adaptors components Bill of Materials (BOM) + https://wiki.onap.org + + ONAP + - - - - org.onap.ccsdk.sli.adaptors - ccsdk-aai-service - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-ansible-adapter - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-mdsal-resource - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-netbox-client - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-resource-management - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-saltstack-adapter - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - ccsdk-sql-resource - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.adaptors - aai-service-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - aai-service-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - ansible-adapter-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - ansible-adapter-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - netbox-client-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - netbox-client-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - resource-assignment-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - resource-assignment-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - saltstack-adapter-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - saltstack-adapter-installer - ${project.version} - - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - sql-resource-installer - ${project.version} - - - + + + + org.onap.ccsdk.sli.adaptors + ccsdk-aai-service + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-ansible-adapter + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-mdsal-resource + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-netbox-client + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-resource-management + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-saltstack-adapter + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + ccsdk-sql-resource + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + aai-service-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + ansible-adapter-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + ansible-adapter-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + mdsal-resource-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + mdsal-resource-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + netbox-client-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + netbox-client-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + resource-assignment-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + resource-assignment-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + saltstack-adapter-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + saltstack-adapter-installer + ${project.version} + + + org.onap.ccsdk.sli.adaptors + sql-resource-provider + ${project.version} + + + org.onap.ccsdk.sli.adaptors + sql-resource-installer + ${project.version} + + + diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index b0f69b966..199bf1a61 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -1,127 +1,127 @@ - 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.adaptors - base-http-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors + base-http-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-adaptors :: base-http :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} - - ccsdk-base-http - ${application.name} + + ccsdk-base-http + ${application.name} mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features - false - + false + - + - - org.onap.ccsdk.sli.adaptors - base-http-provider - ${project.version} - - + + org.onap.ccsdk.sli.adaptors + base-http-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - 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 - ccsdk-base-http,base-http-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 + 2.6 + + + 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 + ccsdk-base-http,base-http-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/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index ea77acb69..60e9a2407 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -14,6 +14,8 @@ 1.2.1-SNAPSHOT pom + ccsdk-sli-adaptors :: base-${project.artifactId} + provider installer diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 49fee0cec..daa9dd9e7 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -1,39 +1,41 @@ - 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.adaptors - base-http-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.adaptors + base-http-provider + 1.2.1-SNAPSHOT + bundle - - - javax.ws.rs - javax.ws.rs-api - provided - - - org.slf4j - slf4j-api - provided - - - org.glassfish.jersey.core - jersey-client - test - - - org.onap.logging-analytics - logging-filter-base - provided - - + ccsdk-sli-adaptors :: ${project.artifactId} + + + + javax.ws.rs + javax.ws.rs-api + provided + + + org.slf4j + slf4j-api + provided + + + org.glassfish.jersey.core + jersey-client + test + + + org.onap.logging-analytics + logging-filter-base + provided + + diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 6ab8e4f1a..3320f9358 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -7,13 +7,15 @@ odlparent-lite 2.1.1 - + org.onap.ccsdk.sli.adaptors base-parent 1.2.1-SNAPSHOT pom + ccsdk-sli-adaptors :: ${project.artifactId} + http diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 6f0f48e78..4f4266b3b 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -33,6 +33,5 @@ ${project.version} - diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml index 8ee2bf432..4bc368f9e 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -33,12 +33,11 @@ ${project.version} - powermock-api-mockito org.powermock + powermock-api-mockito - diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 9c94a38d5..0a656829c 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -1,26 +1,26 @@ - 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.adaptors - ccsdk-base-http - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors + ccsdk-base-http + 1.2.1-SNAPSHOT + feature - ccsdk-sli-adaptors :: base-http :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} - - - ${project.groupId} - base-http-provider - ${project.version} - - + + + ${project.groupId} + base-http-provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index 55ec57081..123f1b755 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 30bdcaa9b..d066340e8 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -1,28 +1,30 @@ - 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.adaptors.messagerouter - ccsdk-messagerouter-consumer - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors.messagerouter + ccsdk-messagerouter-consumer + 1.2.1-SNAPSHOT + feature - - - ${project.groupId} - consumer.api - ${project.version} - - - ${project.groupId} - consumer.provider - ${project.version} - - + ccsdk-sli-adaptors :: features :: ${project.artifactId} + + + + ${project.groupId} + consumer.api + ${project.version} + + + ${project.groupId} + consumer.provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 0a0d5aec5..fff3ae3c5 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -1,28 +1,30 @@ - 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.adaptors.messagerouter - ccsdk-messagerouter-publisher - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors.messagerouter + ccsdk-messagerouter-publisher + 1.2.1-SNAPSHOT + feature - - - ${project.groupId} - publisher.api - ${project.version} - - - ${project.groupId} - publisher.provider - ${project.version} - - + ccsdk-sli-adaptors :: features :: ${project.artifactId} + + + + ${project.groupId} + publisher.api + ${project.version} + + + ${project.groupId} + publisher.provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index cd489761a..5258b53f5 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -30,7 +30,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index c5de29079..5b80354a8 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -42,6 +42,5 @@ ${project.version} - diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml index c83577f8c..ae97470a9 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -28,11 +28,10 @@ ${project.groupId} saltstack-adapter-provider ${project.version} - - powermock-api-mockito org.powermock + powermock-api-mockito diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 3fc7de1ae..7bf434323 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -31,7 +31,7 @@ xml features - + 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.adaptors - 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/adaptors/features/pom.xml b/adaptors/features/pom.xml index 4ffc35be9..a09179d9d 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -1,32 +1,32 @@ - 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.adaptors - sliadaptors-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-adaptors :: features + ccsdk-sli-adaptors :: features - - ccsdk-aai-service - ccsdk-ansible-adapter - ccsdk-base-http - ccsdk-mdsal-resource - ccsdk-messagerouter-consumer - ccsdk-messagerouter-publisher - ccsdk-netbox-client - ccsdk-resource-assignment - ccsdk-saltstack-adapter - ccsdk-sql-resource + + ccsdk-aai-service + ccsdk-ansible-adapter + ccsdk-base-http + ccsdk-mdsal-resource + ccsdk-messagerouter-consumer + ccsdk-messagerouter-publisher + ccsdk-netbox-client + ccsdk-resource-assignment + ccsdk-saltstack-adapter + ccsdk-sql-resource ccsdk-sli-adaptors-all features-sli-adaptors installer diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index e6a7c05ff..ec934544b 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-mdsal-resource diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index 76013e27a..7f88cbcff 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: mdsal-resource + ccsdk-sli-adaptors :: ${project.artifactId} The MD-SAL resource adaptor allows service logic to access persistent data from MD-SAL config and operational trees diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 27dd12390..b7c6abd37 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} http://maven.apache.org @@ -22,15 +22,15 @@ - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -50,10 +50,10 @@ compile - org.osgi - org.osgi.core - provided - + org.osgi + org.osgi.core + provided + org.slf4j slf4j-api diff --git a/adaptors/message-router/consumer/api/pom.xml b/adaptors/message-router/consumer/api/pom.xml index 20e1b9204..504e2e631 100755 --- a/adaptors/message-router/consumer/api/pom.xml +++ b/adaptors/message-router/consumer/api/pom.xml @@ -1,27 +1,29 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - consumer.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + consumer.aggregate + 1.2.1-SNAPSHOT + - consumer.api - bundle + consumer.api + bundle - - - - org.apache.felix - maven-bundle-plugin - - - org.onap.ccsdk.sli.adaptors.messagerouter.consumer.api - - - - - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} + + + + + org.apache.felix + maven-bundle-plugin + + + org.onap.ccsdk.sli.adaptors.messagerouter.consumer.api + + + + + diff --git a/adaptors/message-router/consumer/installer/pom.xml b/adaptors/message-router/consumer/installer/pom.xml index 3e044c5b8..03eeb0fc0 100755 --- a/adaptors/message-router/consumer/installer/pom.xml +++ b/adaptors/message-router/consumer/installer/pom.xml @@ -1,128 +1,130 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - consumer.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + consumer.aggregate + 1.2.1-SNAPSHOT + - org.onap.ccsdk.sli.adaptors.messagerouter - consumer.installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors.messagerouter + consumer.installer + 1.2.1-SNAPSHOT + pom - - messagerouter-consumer - messagerouter-consumer - mvn:${project.groupId}/consumer.features/${project.version}/xml/features - false - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} - - - ${project.groupId} - consumer.api - ${project.version} - - - ${project.groupId} - consumer.provider - ${project.version} - - + + messagerouter-consumer + messagerouter-consumer + mvn:${project.groupId}/consumer.features/${project.version}/xml/features + false + - - - - maven-assembly-plugin - 2.6 - - - 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 - ${project.groupId} - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + ${project.groupId} + consumer.api + ${project.version} + + + ${project.groupId} + consumer.provider + ${project.version} + + - - + + + + maven-assembly-plugin + 2.6 + + + 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 + ${project.groupId} + 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/adaptors/message-router/consumer/pom.xml b/adaptors/message-router/consumer/pom.xml index d99511d48..7afd84fb4 100755 --- a/adaptors/message-router/consumer/pom.xml +++ b/adaptors/message-router/consumer/pom.xml @@ -1,19 +1,21 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - messagerouter-root - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + messagerouter-root + 1.2.1-SNAPSHOT + - consumer.aggregate - pom + consumer.aggregate + pom - - api - provider - installer - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} + + + api + provider + installer + diff --git a/adaptors/message-router/consumer/provider/pom.xml b/adaptors/message-router/consumer/provider/pom.xml index 4279d1e8b..3cc97d48d 100755 --- a/adaptors/message-router/consumer/provider/pom.xml +++ b/adaptors/message-router/consumer/provider/pom.xml @@ -1,43 +1,45 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - consumer.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + consumer.aggregate + 1.2.1-SNAPSHOT + - consumer.provider - bundle + consumer.provider + bundle - - - ${project.groupId} - consumer.api - ${project.version} - - - org.slf4j - slf4j-api - - - com.google.code.gson - gson - - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} - - - - org.apache.felix - maven-bundle-plugin - - - ${project.groupId}.consumer.provider.impl - - - - - + + + ${project.groupId} + consumer.api + ${project.version} + + + org.slf4j + slf4j-api + + + com.google.code.gson + gson + + + + + + + org.apache.felix + maven-bundle-plugin + + + ${project.groupId}.consumer.provider.impl + + + + + diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 4ccc56e1a..3b924d645 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -1,33 +1,35 @@ - 4.0.0 + 4.0.0 - + org.onap.ccsdk.parent binding-parent 2.1.1 - org.onap.ccsdk.sli.adaptors.messagerouter - messagerouter-root - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors.messagerouter + messagerouter-root + 1.2.1-SNAPSHOT + pom - - publisher - consumer - + ccsdk-sli-adaptors :: message-router - - - - - org.apache.felix - maven-bundle-plugin - true - - - - + + publisher + consumer + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + diff --git a/adaptors/message-router/publisher/api/pom.xml b/adaptors/message-router/publisher/api/pom.xml index 30f4b7688..f229c2ba5 100755 --- a/adaptors/message-router/publisher/api/pom.xml +++ b/adaptors/message-router/publisher/api/pom.xml @@ -1,27 +1,29 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.aggregate + 1.2.1-SNAPSHOT + - publisher.api - bundle + publisher.api + bundle - - - - org.apache.felix - maven-bundle-plugin - - - org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api - - - - - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} + + + + + org.apache.felix + maven-bundle-plugin + + + org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api + + + + + diff --git a/adaptors/message-router/publisher/installer/pom.xml b/adaptors/message-router/publisher/installer/pom.xml index f715b7824..728670260 100644 --- a/adaptors/message-router/publisher/installer/pom.xml +++ b/adaptors/message-router/publisher/installer/pom.xml @@ -1,133 +1,135 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.aggregate + 1.2.1-SNAPSHOT + - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.installer + 1.2.1-SNAPSHOT + pom - - messagerouter-publisher - messagerouter-publisher - mvn:${project.groupId}/publisher.features/${project.version}/xml/features - false - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} - - - ${project.groupId} - publisher.api - ${project.version} - - - ${project.groupId} - publisher.provider - ${project.version} - - - ${project.groupId} - sample.client - ${project.version} - - + + messagerouter-publisher + messagerouter-publisher + mvn:${project.groupId}/publisher.features/${project.version}/xml/features + false + - - - - maven-assembly-plugin - 2.6 - - - 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 - ${project.groupId} - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + ${project.groupId} + publisher.api + ${project.version} + + + ${project.groupId} + publisher.provider + ${project.version} + + + ${project.groupId} + sample.client + ${project.version} + + - - + + + + maven-assembly-plugin + 2.6 + + + 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 + ${project.groupId} + 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/adaptors/message-router/publisher/pom.xml b/adaptors/message-router/publisher/pom.xml index a415ab661..22d420b5c 100755 --- a/adaptors/message-router/publisher/pom.xml +++ b/adaptors/message-router/publisher/pom.xml @@ -1,20 +1,22 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - messagerouter-root - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + messagerouter-root + 1.2.1-SNAPSHOT + - publisher.aggregate - pom + publisher.aggregate + pom - - api - provider - sample.client - installer - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} + + + api + provider + sample.client + installer + diff --git a/adaptors/message-router/publisher/provider/pom.xml b/adaptors/message-router/publisher/provider/pom.xml index 42cf0e00e..f6606e768 100755 --- a/adaptors/message-router/publisher/provider/pom.xml +++ b/adaptors/message-router/publisher/provider/pom.xml @@ -1,39 +1,41 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.aggregate + 1.2.1-SNAPSHOT + - publisher.provider - bundle + publisher.provider + bundle - - - ${project.groupId} - publisher.api - ${project.version} - - - org.slf4j - slf4j-api - - + ccsdk-sli-adaptors :: message-router :: ${project.artifactId} - - - - org.apache.felix - maven-bundle-plugin - - - ${project.groupId}.publisher.provider.impl - - - - - + + + ${project.groupId} + publisher.api + ${project.version} + + + org.slf4j + slf4j-api + + + + + + + org.apache.felix + maven-bundle-plugin + + + ${project.groupId}.publisher.provider.impl + + + + + diff --git a/adaptors/message-router/publisher/sample.client/pom.xml b/adaptors/message-router/publisher/sample.client/pom.xml index cbcfd0bb8..0313c7383 100755 --- a/adaptors/message-router/publisher/sample.client/pom.xml +++ b/adaptors/message-router/publisher/sample.client/pom.xml @@ -1,39 +1,41 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.aggregate - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.aggregate + 1.2.1-SNAPSHOT + - sample.client - bundle + sample.client + bundle - - - ${project.groupId} - publisher.api - ${project.version} - - - org.slf4j - slf4j-api - - + ccsdk-sli-adaptors :: message-router :: publisher.${project.artifactId} - - - - org.apache.felix - maven-bundle-plugin - - - ${project.groupId}.publisher.client.impl - - - - - + + + ${project.groupId} + publisher.api + ${project.version} + + + org.slf4j + slf4j-api + + + + + + + org.apache.felix + maven-bundle-plugin + + + ${project.groupId}.publisher.client.impl + + + + + diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 4849c1198..015e8af05 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -30,7 +30,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-netbox-client @@ -41,8 +41,6 @@ - - org.onap.ccsdk.sli.adaptors netbox-client-provider diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index c9eb49227..1cf6c3bc5 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -30,7 +30,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: netbox-client + ccsdk-sli-adaptors :: ${project.artifactId} The SDNC Adaptors for netbox IPAM as an OSGi service diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 5e74cde33..faadcefc1 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -30,7 +30,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 5f47db833..950756987 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors + ${project.artifactId} The CCSDK core components contains the SLI, dblib and root pom https://wiki.onap.org @@ -24,11 +24,11 @@ aai-service ansible-adapter saltstack-adapter - netbox-client + netbox-client mdsal-resource resource-assignment sql-resource - base + base message-router features artifacts @@ -101,7 +101,6 @@ - diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index eaa8bb51d..77414792a 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-resource-assignment diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index 1f42d5afb..ad321d438 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: resource-assignment + ccsdk-sli-adaptors :: ${project.artifactId} The resource assignment adaptor allows service logic to check and allocate network capacity diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 196296447..3c92d31fd 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} http://maven.apache.org @@ -22,15 +22,15 @@ - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml index 6bf150700..0a0a99d49 100644 --- a/adaptors/saltstack-adapter/pom.xml +++ b/adaptors/saltstack-adapter/pom.xml @@ -38,7 +38,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: saltstack-adapter + ccsdk-sli-adaptors :: ${project.artifactId} Abstractions to interact with Saltstack server via REST @@ -71,10 +71,8 @@ test - - diff --git a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml index bc9ad139a..5588770a8 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -38,8 +38,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} - + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-saltstack-adapter diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml index 994776668..65e288517 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -1,15 +1,15 @@ - @@ -27,19 +27,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} - + ccsdk-sli-adaptors :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 3eef0b309..d5238c2f2 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} ccsdk-sql-resource diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index d8cfc01ac..811d327bd 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-adaptors :: sql-resource + ccsdk-sli-adaptors :: ${project.artifactId} The Sql resource adaptor allows service logic to read/write data from a local database using direct SQL statements diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index fd32383a0..7d57f4735 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: ${project.artifactId} http://maven.apache.org @@ -22,15 +22,15 @@ - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -59,10 +59,10 @@ org.slf4j slf4j-api - - org.slf4j - jcl-over-slf4j - + + org.slf4j + jcl-over-slf4j + org.slf4j slf4j-simple @@ -73,10 +73,10 @@ dblib-provider provided - - org.osgi - org.osgi.core - provided - + + org.osgi + org.osgi.core + provided + 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 + diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 50d4b23f1..e197c0a9d 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: sli-northbound-artifacts + ccsdk-sli-northbound :: ${project.artifactId} CCSDK northbound components Bill of Materials (BOM) https://wiki.onap.org diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index cef565c33..796cb2784 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -1,134 +1,133 @@ - 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.northbound - asdcApi-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.northbound + asdcApi-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - ccsdk-asdcApi - ${application.name} + + ccsdk-asdcApi + ${application.name} mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features - false - + false + - + org.onap.ccsdk.sli.northbound asdcApi-model ${project.version} - - org.onap.ccsdk.sli.northbound - asdcApi-provider - ${project.version} - - + + org.onap.ccsdk.sli.northbound + asdcApi-provider + ${project.version} + - + - - - - maven-assembly-plugin - 2.6 - - - 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.northbound - 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 + 2.6 + + + 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.northbound + 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/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index e19f21325..a214addac 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +23,5 @@ rfc6991 - diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index fecbff0a7..c8debab38 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -14,12 +14,11 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: asdcApi + ccsdk-sli-northbound :: ${project.artifactId} model provider installer - diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index a89adfb98..347ecd340 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -59,10 +59,9 @@ test - org.opendaylight.mdsal - mdsal-binding-dom-adapter + mdsal-binding-dom-adapter test diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 551c5b72a..0e4fb8d56 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-daexim-offsite-backup diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index a40283e3b..8edccbb6c 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -22,6 +22,5 @@ rfc6991 - diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 0733e51b4..71af57ce1 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: daexim-offsite-backup + ccsdk-sli-northbound :: ${project.artifactId} ODL feature used for transferring MD-SAL data to an offsite location. diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index af8cd5126..f661878a5 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -35,18 +35,18 @@ mdsal-binding-test-model test - - - - - - - - - - - - + + + + + + + + + + + + org.apache.commons commons-lang3 @@ -62,8 +62,8 @@ ${project.version} - com.google.code.findbugs - annotations + com.google.code.findbugs + annotations junit diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 705bbff4b..849a3f32a 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-dataChange @@ -37,7 +37,6 @@ ${project.version} - diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 4a4e6b506..8f21714f2 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -14,8 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +22,5 @@ rfc6991 - diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index 0291e1b6d..2b64df3ce 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: dataChange + ccsdk-sli-northbound :: ${project.artifactId} model diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index e4f8aaf2b..9617e9ae9 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -58,18 +58,18 @@ test - - - - - - - - - - - - + + + + + + + + + + + + junit junit diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index acb100baa..84f6f9964 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -6,6 +6,7 @@ org.onap.ccsdk.parent standalone-parent 2.1.1 + org.onap.ccsdk.sli.northbound @@ -13,7 +14,7 @@ 1.2.1-SNAPSHOT jar - ccsdk-sli-northbound :: dmaap-listener + ccsdk-sli-northbound :: ${project.artifactId} DMAAP Listener @@ -73,7 +74,7 @@ org.apache.velocity velocity-engine-core - + org.glassfish.jersey.inject jersey-hk2 diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index efff4650a..dc1b9b244 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 8def7d822..ef207f269 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index f993ec61a..15fb23e63 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: dataChange :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 3062e0fa6..af5678832 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 7ebc66d74..7873fe4a3 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -39,6 +39,5 @@ features - diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index d1afadf18..46f990234 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -77,7 +77,6 @@ - org.onap.ccsdk.sli.northbound ${application.name} @@ -92,7 +91,6 @@ - @@ -151,7 +149,7 @@ true false false - org.onap.ccsdk.sli.northbound + org.onap.ccsdk.sli.northbound provided diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 107aa687b..0c453c617 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} ccsdk-lcm @@ -36,7 +36,6 @@ ${project.version} - diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index a1a262cc2..51c6d012f 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} @@ -23,6 +23,5 @@ rfc6991 - diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index a8d70aebe..35891a309 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound :: lcm + ccsdk-sli-northbound :: ${project.artifactId} model diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 7666fe2dc..65ab60611 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -14,18 +14,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-northbound :: lcm :: ${project.artifactId} + ccsdk-sli-northbound :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + @@ -84,26 +84,26 @@ test - org.osgi - org.osgi.core - test - + org.osgi + org.osgi.core + test + - org.apache.maven.plugins - maven-surefire-plugin - - - dummyUser - dummyPassword - dummyDatabase - - - - + org.apache.maven.plugins + maven-surefire-plugin + + + dummyUser + dummyPassword + dummyDatabase + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/northbound/pom.xml b/northbound/pom.xml index b49c05f0f..838d065f6 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-northbound + ${project.artifactId} The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications https://wiki.onap.org @@ -73,28 +73,27 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index ae854d442..7863dc880 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT jar - ccsdk-sli-northbound :: ueb-listener + ccsdk-sli-northbound :: ${project.artifactId} UEB Listener @@ -23,7 +23,7 @@ ${maven.build.timestamp} ${project.version}-${build.number} 1.4.1 - 1.6.5 + 1.6.5 @@ -38,7 +38,6 @@ - org.onap.sdc.sdc-distribution-client diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 0826fb50e..6063beb4b 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -1,106 +1,106 @@ - 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.plugins - sli-plugins-artifacts - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sli-plugins-artifacts + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: sli-plugins-artifacts - CCSDK plugins components Bill of Materials (BOM) - https://wiki.onap.org - - ONAP - + ccsdk-sli-plugins :: ${project.artifactId} + CCSDK plugins components Bill of Materials (BOM) + https://wiki.onap.org + + ONAP + - - - - org.onap.ccsdk.sli.plugins - ccsdk-properties-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-restapi-call-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-restconf-client - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - ccsdk-template-node - ${project.version} - xml - feature - - - org.onap.ccsdk.sli.plugins - fabric-discovery-plugin-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - fabric-discovery-plugin-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - restconf-client-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - restconf-client-installer - ${project.version} - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - - org.onap.ccsdk.sli.plugins - template-node-installer - ${project.version} - - - + + + + org.onap.ccsdk.sli.plugins + ccsdk-properties-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + ccsdk-template-node + ${project.version} + xml + feature + + + org.onap.ccsdk.sli.plugins + fabric-discovery-plugin-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + fabric-discovery-plugin-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + properties-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + properties-node-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + restapi-call-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + restconf-client-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + restconf-client-installer + ${project.version} + + + org.onap.ccsdk.sli.plugins + template-node-provider + ${project.version} + + + org.onap.ccsdk.sli.plugins + template-node-installer + ${project.version} + + + diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 072755d4b..c6afe244a 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index db737aca7..c11500f57 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -14,11 +14,10 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - ${project.groupId} properties-node-provider diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index af44fb223..2b8898a74 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -1,38 +1,38 @@ - 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.plugins - ccsdk-restapi-call-node - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - + javax.ws.rs javax.ws.rs-api - - - ${project.groupId} - restapi-call-node-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + + ${project.groupId} + restapi-call-node-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index edea3ee5d..30b2e503b 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -1,39 +1,38 @@ - 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.plugins - ccsdk-restconf-client - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - - true - + + true + - + - - - ${project.groupId} - restconf-client-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + ${project.groupId} + restconf-client-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 0ac957f0e..17d66c34a 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - - - org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins-all - 1.2.1-SNAPSHOT - feature - - ccsdk-sli-plugins :: features :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-properties-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restapi-call-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restconf-client - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-template-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-sshapi-call-node - ${project.version} - xml - features - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + + + org.onap.ccsdk.sli.plugins + ccsdk-sli-plugins-all + 1.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: features :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-properties-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restapi-call-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restconf-client + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-template-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-sshapi-call-node + ${project.version} + xml + features + + diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index c9a1d213b..79b2e286e 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -14,9 +14,9 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - + 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.plugins - 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/plugins/features/pom.xml b/plugins/features/pom.xml index 4c26161e2..1b8b15af1 100755 --- a/plugins/features/pom.xml +++ b/plugins/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.plugins - sliplugins-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: features + ccsdk-sli-plugins :: features - - ccsdk-gr-toolkit - ccsdk-properties-node - ccsdk-restapi-call-node - ccsdk-restconf-client - ccsdk-sshapi-call-node - ccsdk-template-node + + ccsdk-gr-toolkit + ccsdk-properties-node + ccsdk-restapi-call-node + ccsdk-restconf-client + ccsdk-sshapi-call-node + ccsdk-template-node ccsdk-sli-plugins-all features-sli-plugins installer diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index c9c6d378a..dbd5ece1c 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-gr-toolkit diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index b9a7e41a0..f4fe6af06 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -22,6 +22,5 @@ rfc6991 - diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 8808d54ca..476007f38 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: gr-toolkit + ccsdk-sli-plugins :: ${project.artifactId} ODL bundle used to judge health of SDN-C application. diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index acb42b17b..6e6604721 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -53,18 +53,18 @@ mdsal-binding-test-model test - - - - - - - - - - - - + + + + + + + + + + + + junit junit diff --git a/plugins/pom.xml b/plugins/pom.xml index c5c4ad39f..3c1baea16 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins + ${project.artifactId} CCSDK Java Plugins https://wiki.onap.org diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index fe36ad381..3d6ee7cf2 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-properties-node diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 5be15e5af..70dcbf11f 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -13,9 +13,10 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: properties-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that reads property file and - puts the properties in the DG context + puts the properties in the DG context + provider diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index d3571f197..d112ff604 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -13,18 +13,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java index a858c49b3..34ac4685f 100644 --- a/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java +++ b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java @@ -20,7 +20,7 @@ public class TestPropertiesNode { private static final Logger log = LoggerFactory.getLogger(TestPropertiesNode.class); @Rule public EnvironmentVariables environmentVariables = new EnvironmentVariables(); - + @Test public void testJSONFileParsing() throws SvcLogicException { SvcLogicContext ctx = new SvcLogicContext(); @@ -535,7 +535,7 @@ public class TestPropertiesNode { PropertiesNode rcn = new PropertiesNode(); rcn.readProperties(p, ctx); - assertEquals(ctx.getAttribute("NotFileBased.RESTAPI"),"Call Node - Provider"); + assertEquals(ctx.getAttribute("NotFileBased.ccsdk-sli-plugins"),": properties-node-provider :: test.xml"); assertEquals(ctx.getAttribute("NotFileBased."); diff --git a/plugins/properties-node/provider/src/test/resources/test-invalid.xml b/plugins/properties-node/provider/src/test/resources/test-invalid.xml index 50bd0fff2..3e4bd3b2d 100644 --- a/plugins/properties-node/provider/src/test/resources/test-invalid.xml +++ b/plugins/properties-node/provider/src/test/resources/test-invalid.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: properties-node-provider :: test-invalid.xml http://maven.apache.org UTF-8 diff --git a/plugins/properties-node/provider/src/test/resources/test.xml b/plugins/properties-node/provider/src/test/resources/test.xml index 19e3b7139..b3e1164e4 100644 --- a/plugins/properties-node/provider/src/test/resources/test.xml +++ b/plugins/properties-node/provider/src/test/resources/test.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: properties-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 2f98ff6ca..eb50cf81e 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -1,125 +1,125 @@ - 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.plugins - restapi-call-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-restapi-call-node - ${application.name} + + ccsdk-restapi-call-node + ${application.name} mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + false + - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - + + + org.onap.ccsdk.sli.plugins + restapi-call-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - 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.plugins - 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 + 2.6 + + + 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.plugins + 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/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index 613cf8583..0db05c2b9 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restapi-call-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external REST API diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 026a619f7..c0cf257ed 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -13,25 +13,25 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - - org.glassfish.jersey - jersey-bom - 2.27 - import - pom - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + + org.glassfish.jersey + jersey-bom + 2.27 + pom + import + + @@ -74,7 +74,7 @@ org.onap.logging-analytics logging-filter-base - + junit @@ -82,10 +82,10 @@ test - com.github.stefanbirkner - system-rules - 1.19.0 - test + com.github.stefanbirkner + system-rules + 1.19.0 + test org.glassfish.jersey.containers diff --git a/plugins/restapi-call-node/provider/src/test/resources/test.xml b/plugins/restapi-call-node/provider/src/test/resources/test.xml index 1974f688e..1f42886e9 100644 --- a/plugins/restapi-call-node/provider/src/test/resources/test.xml +++ b/plugins/restapi-call-node/provider/src/test/resources/test.xml @@ -9,9 +9,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,11 +25,11 @@ org.onap.ccsdk.sli.plugins restapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT restapi-call-node-provider bundle - RESTAPI Call Node - Provider + ccsdk-sli-plugins :: restapi-call-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 5378fae70..6e92da538 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} ccsdk-restconf-client diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index fc233ece2..801c0ed93 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: restconf-client + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external RESTCONF API diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 1a3301075..3640d6cfd 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} @@ -28,8 +28,8 @@ org.glassfish.jersey jersey-bom 2.27 - import pom + import diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index 5b40477fc..73bf80a11 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/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.plugins - sshapi-call-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sshapi-call-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-sshapi-call-node - ${application.name} + + ccsdk-sshapi-call-node + ${application.name} mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + false + - + - - org.onap.ccsdk.sli.plugins - sshapi-call-node-provider - ${project.version} - - + + org.onap.ccsdk.sli.plugins + sshapi-call-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - 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.plugins - 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 + 2.6 + + + 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.plugins + 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/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index 4bdd9a7fa..90bc7c92c 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -13,7 +13,7 @@ 1.2.1-SNAPSHOT pom - ccsdk-sli-plugins :: sshapi-call-node + ccsdk-sli-plugins :: ${project.artifactId} This is an implementation of DG Execute Node that makes a call to an external REST API diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index e933e05b8..7410211f0 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -13,19 +13,18 @@ 1.2.1-SNAPSHOT bundle - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - + ccsdk-sli-plugins :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/plugins/sshapi-call-node/provider/src/test/resources/test.xml b/plugins/sshapi-call-node/provider/src/test/resources/test.xml index 7645f1992..b6977854a 100644 --- a/plugins/sshapi-call-node/provider/src/test/resources/test.xml +++ b/plugins/sshapi-call-node/provider/src/test/resources/test.xml @@ -11,9 +11,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,11 +27,11 @@ org.onap.ccsdk.sli.plugins sshapi-call-node - 6.0.0-SNAPSHOT + 0.0.0-SNAPSHOT sshapi-call-node-provider bundle - SSHAPI Call Node - Provider + ccsdk-sli-plugins :: sshapi-call-node-provider :: test.xml http://maven.apache.org UTF-8 diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index e0d24c416..3eb7a4b27 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -1,125 +1,125 @@ - 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.plugins - template-node-installer - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + template-node-installer + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: template-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - ccsdk-template-node - ${application.name} - mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + + ccsdk-template-node + ${application.name} + mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features + false + - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - + + + org.onap.ccsdk.sli.plugins + template-node-provider + ${project.version} + + - - - - maven-assembly-plugin - 2.6 - - - 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.plugins - 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 + 2.6 + + + 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.plugins + 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/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 847ce01fc..5f9997dab 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -13,6 +13,8 @@ 1.2.1-SNAPSHOT pom + ccsdk-sli-plugins :: ${project.artifactId} + provider installer diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 0b6551a73..3058ae8a7 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -1,49 +1,49 @@ - 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.plugins - template-node-provider - 1.2.1-SNAPSHOT - bundle + org.onap.ccsdk.sli.plugins + template-node-provider + 1.2.1-SNAPSHOT + bundle - ccsdk-sli-plugins :: template-node :: ${project.artifactId} + ccsdk-sli-plugins :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + - - - junit - junit - test - - - org.onap.ccsdk.sli.core - sli-common - provided - - - org.slf4j - slf4j-api - - - org.apache.velocity - velocity - - + + + junit + junit + test + + + org.onap.ccsdk.sli.core + sli-common + provided + + + org.slf4j + slf4j-api + + + org.apache.velocity + velocity + + diff --git a/pom.xml b/pom.xml index 7da6fbff0..5104fe867 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.ccsdk.sli - ccsdk-sli + ccsdk-sli-root 1.2.1-SNAPSHOT pom @@ -54,27 +54,27 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + -- cgit 1.2.3-korg