From df195945d03dec122666e8d48e4c7ba94630468a Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 12 Dec 2019 15:24:53 -0500 Subject: Refactoring multiple plugins Refactoring below plugins in sdnr/wt/common/pom.xml : 1) org.codehaus.mojo : exec-maven-plugin -> changing executable to bash so that it can run on windows too 2) com.github.alexcojocaru : elasticsearch-maven-plugin -> skip if tests are skipped during maven build Adding create dir step in es-intit.sh : sdnr/wt/data-provider/database/src/main/resources/es-init.sh -> cmd_initfile() -> mkdir -p $( dirname $INITFILENAME ) Change-Id: I78516406101659f802dad2fb68ca349f63a4dd2e Issue-ID: CCSDK-1994 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/apigateway/feature/pom.xml | 66 ++--- sdnr/wt/apigateway/installer/pom.xml | 208 ++++++------- sdnr/wt/apigateway/pom.xml | 13 +- sdnr/wt/apigateway/provider/pom.xml | 22 +- sdnr/wt/common/pom.xml | 8 +- sdnr/wt/data-provider/database/pom.xml | 283 +++++++++--------- sdnr/wt/data-provider/feature/pom.xml | 43 ++- sdnr/wt/data-provider/installer/pom.xml | 218 +++++++------- sdnr/wt/data-provider/model/pom.xml | 104 +++---- sdnr/wt/data-provider/pom.xml | 18 +- sdnr/wt/data-provider/provider/pom.xml | 321 ++++++++++----------- sdnr/wt/devicemanager-gran/feature/pom.xml | 43 ++- sdnr/wt/devicemanager-gran/installer/pom.xml | 186 ++++++------ sdnr/wt/devicemanager-gran/model/pom.xml | 80 ++--- sdnr/wt/devicemanager-gran/pom.xml | 18 +- sdnr/wt/devicemanager-gran/provider/pom.xml | 205 ++++++------- sdnr/wt/devicemanager-onf/feature/pom.xml | 53 ++-- sdnr/wt/devicemanager-onf/installer/pom.xml | 168 +++++------ sdnr/wt/devicemanager-onf/model/pom.xml | 80 ++--- sdnr/wt/devicemanager-onf/pom.xml | 18 +- sdnr/wt/devicemanager-onf/provider/pom.xml | 165 +++++------ sdnr/wt/devicemanager-oran/feature/pom.xml | 43 ++- sdnr/wt/devicemanager-oran/installer/pom.xml | 186 ++++++------ sdnr/wt/devicemanager-oran/model/pom.xml | 80 ++--- sdnr/wt/devicemanager-oran/pom.xml | 18 +- sdnr/wt/devicemanager-oran/provider/pom.xml | 163 ++++++----- sdnr/wt/devicemanager/feature/pom.xml | 43 ++- sdnr/wt/devicemanager/installer/pom.xml | 236 +++++++-------- sdnr/wt/devicemanager/model/pom.xml | 114 ++++---- sdnr/wt/devicemanager/pom.xml | 18 +- sdnr/wt/devicemanager/provider/pom.xml | 316 ++++++++++---------- sdnr/wt/featureaggregator/feature/pom.xml | 183 ++++++------ sdnr/wt/featureaggregator/installer/pom.xml | 300 ++++++++++--------- sdnr/wt/featureaggregator/pom.xml | 32 +- sdnr/wt/helpserver/feature/pom.xml | 50 ++-- sdnr/wt/helpserver/installer/pom.xml | 209 +++++++------- sdnr/wt/helpserver/pom.xml | 40 +-- sdnr/wt/helpserver/provider/pom.xml | 24 +- sdnr/wt/netconfnode-state-service/feature/pom.xml | 61 ++-- .../wt/netconfnode-state-service/installer/pom.xml | 186 ++++++------ sdnr/wt/netconfnode-state-service/model/pom.xml | 96 +++--- sdnr/wt/netconfnode-state-service/pom.xml | 18 +- sdnr/wt/netconfnode-state-service/provider/pom.xml | 132 ++++----- sdnr/wt/odlux/apps/apiDemo/pom.xml | 41 +-- sdnr/wt/odlux/apps/app-feature/pom.xml | 13 +- sdnr/wt/odlux/apps/app-installer/pom.xml | 21 +- sdnr/wt/odlux/apps/configurationApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/connectApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/demoApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/eventLogApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/faultApp/pom.xml | 40 +-- sdnr/wt/odlux/apps/helpApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/inventoryApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/maintenanceApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/mediatorApp/pom.xml | 40 +-- sdnr/wt/odlux/apps/minimumApp/pom.xml | 41 +-- sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml | 41 +-- sdnr/wt/odlux/core/features/pom.xml | 14 +- sdnr/wt/odlux/core/installer/pom.xml | 183 ++++++------ sdnr/wt/odlux/core/model/pom.xml | 14 +- sdnr/wt/odlux/core/pom.xml | 54 ++-- sdnr/wt/odlux/core/provider/pom.xml | 207 ++++++------- sdnr/wt/odlux/framework/pom.xml | 320 ++++++++++---------- sdnr/wt/odlux/pom.xml | 59 ++-- sdnr/wt/pom.xml | 4 +- sdnr/wt/readthedocs/pom.xml | 4 +- sdnr/wt/websocketmanager2/feature/pom.xml | 68 ++--- sdnr/wt/websocketmanager2/installer/pom.xml | 205 ++++++------- sdnr/wt/websocketmanager2/model/pom.xml | 27 +- sdnr/wt/websocketmanager2/pom.xml | 42 +-- sdnr/wt/websocketmanager2/provider/pom.xml | 244 ++++++++-------- 71 files changed, 3458 insertions(+), 3379 deletions(-) (limited to 'sdnr/wt') diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index cb83b169e..aec1d6632 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -22,40 +22,40 @@ --> - 4.0.0 - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: ${project.artifactId} + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - - - - - ${project.groupId} - sdnr-wt-apigateway-provider - ${project.version} - + + ${project.groupId} + sdnr-wt-apigateway-provider + ${project.version} + - + diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index 96888e243..19425cc65 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -1,115 +1,115 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-apigateway - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-apigateway + false + - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index 8189a2ce8..66b9cb8e9 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-apigateway-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,6 +31,13 @@ + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-apigateway-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} + feature provider diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index a989874f8..dd133ff55 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -11,24 +11,27 @@ OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= --> - - + 4.0.0 + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-provider 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} bundle + + ccsdk-features :: ${project.artifactId} + true - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + javax.servlet @@ -49,6 +52,7 @@ + diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml index dfefe1834..adce977c3 100644 --- a/sdnr/wt/common/pom.xml +++ b/sdnr/wt/common/pom.xml @@ -30,7 +30,7 @@ 0.7.0-SNAPSHOT jar - ccsdk-features-sdnr-wt :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -107,9 +107,9 @@ exec - bash + bash - ${basedir}/../data-provider/database/src/main/resources/es-init.sh + ${basedir}/../data-provider/database/src/main/resources/es-init.sh initfile -f ${project.build.directory}/EsInit.script @@ -123,13 +123,13 @@ elasticsearch-maven-plugin 6.16 - ${skipTests} testCluster 9500 ${databaseport} 6.5.0 120 ${project.build.directory}/EsInit.script + ${skipTests} diff --git a/sdnr/wt/data-provider/database/pom.xml b/sdnr/wt/data-provider/database/pom.xml index ce4b29152..d8812e4ea 100644 --- a/sdnr/wt/data-provider/database/pom.xml +++ b/sdnr/wt/data-provider/database/pom.xml @@ -21,149 +21,150 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-database - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - 49401 - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-database + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.mockito - mockito-core - test - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - - - - - - org.osgi - org.osgi.core - provided - - - ${project.groupId} - sdnr-wt-common - ${project.version} - - - ${project.groupId} - sdnr-wt-data-provider-model - ${project.version} - - - - - - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - org.codehaus.mojo - exec-maven-plugin - - - generateDTOs - generate-sources - - exec - - - ${skipTests} - ${basedir}/src/main/resources/es-init.sh - - initfile - -f - ${project.build.directory}/EsInit.script - - - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - 6.16 - - ${skipTests} - testCluster - 9500 - ${databaseport} - 6.4.3 - ${project.build.directory}/EsInit.script - - - - start-elasticsearch - process-test-classes - - runforked - - - - stop-elasticsearch - prepare-package - - stop - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - databaseport - ${databaseport} - - - - - - + + true + 49401 + + + + + org.mockito + mockito-core + test + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + + + + + + org.osgi + org.osgi.core + provided + + + ${project.groupId} + sdnr-wt-common + ${project.version} + + + ${project.groupId} + sdnr-wt-data-provider-model + ${project.version} + + + + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + org.codehaus.mojo + exec-maven-plugin + + + generateDTOs + generate-sources + + exec + + + bash + + ${basedir}/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + + + + + + com.github.alexcojocaru + elasticsearch-maven-plugin + 6.16 + + testCluster + 9500 + ${databaseport} + 6.5.0 + 120 + ${project.build.directory}/EsInit.script + ${skipTests} + + + + start-elasticsearch + process-test-classes + + runforked + + + + stop-elasticsearch + prepare-package + + stop + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + databaseport + ${databaseport} + + + + + + diff --git a/sdnr/wt/data-provider/feature/pom.xml b/sdnr/wt/data-provider/feature/pom.xml index 0bda76f8e..39bf1f8c7 100644 --- a/sdnr/wt/data-provider/feature/pom.xml +++ b/sdnr/wt/data-provider/feature/pom.xml @@ -21,29 +21,28 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-feature + 0.7.0-SNAPSHOT + feature - - - ${project.groupId} - sdnr-wt-data-provider-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + ${project.groupId} + sdnr-wt-data-provider-provider + ${project.version} + + diff --git a/sdnr/wt/data-provider/installer/pom.xml b/sdnr/wt/data-provider/installer/pom.xml index c736041e2..e9a4860ff 100755 --- a/sdnr/wt/data-provider/installer/pom.xml +++ b/sdnr/wt/data-provider/installer/pom.xml @@ -22,116 +22,118 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-data-provider - false - + ccsdk-features :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - maven-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + sdnr-wt-data-provider + false + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + maven-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/data-provider/model/pom.xml b/sdnr/wt/data-provider/model/pom.xml index 454742a60..8ac1ef01d 100644 --- a/sdnr/wt/data-provider/model/pom.xml +++ b/sdnr/wt/data-provider/model/pom.xml @@ -21,60 +21,60 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - ${project.groupId} - sdnr-wt-common - ${project.version} - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + ${project.groupId} + sdnr-wt-common + ${project.version} + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/data-provider/pom.xml b/sdnr/wt/data-provider/pom.xml index 5b1f483d4..ad621ea4a 100755 --- a/sdnr/wt/data-provider/pom.xml +++ b/sdnr/wt/data-provider/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-data-provider - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -49,4 +46,7 @@ installer + + sdnr-wt-data-provider + diff --git a/sdnr/wt/data-provider/provider/pom.xml b/sdnr/wt/data-provider/provider/pom.xml index b21d2f991..557c82f23 100644 --- a/sdnr/wt/data-provider/provider/pom.xml +++ b/sdnr/wt/data-provider/provider/pom.xml @@ -15,173 +15,172 @@ language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} - 6.4.3 - 7.4.0 - 49402 - Frankfurt - Neon-SR1 - 29.7af5ca8(19/11/19) - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} + 6.4.3 + 7.4.0 + 49402 + Frankfurt + Neon-SR1 + 29.7af5ca8(19/11/19) + - - - org.mockito - mockito-core - test - - - ${project.groupId} - sdnr-wt-common - ${project.version} - - - ${project.groupId} - sdnr-wt-data-provider-database - ${project.version} - - + + + org.mockito + mockito-core + test + + + ${project.groupId} + sdnr-wt-common + ${project.version} + + + ${project.groupId} + sdnr-wt-data-provider-database + ${project.version} + + javax.servlet servlet-api - - org.osgi - org.osgi.core - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - org.json - json - provided - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - org.codehaus.mojo - exec-maven-plugin - - - generateDTOs - generate-sources - - exec - - - ${skipTests} - ${basedir}/../database/src/main/resources/es-init.sh - - initfile - -f - ${project.build.directory}/EsInit.script - - - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - 6.16 - - ${skipTests} - testCluster - 9500 - ${databaseport} - 6.4.3 - ${project.build.directory}/EsInit.script - - - - start-elasticsearch - process-test-classes - - runforked - - - - stop-elasticsearch - prepare-package - - stop - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - databaseport - ${databaseport} - - - - - - - + + org.osgi + org.osgi.core + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + org.json + json + provided + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + org.codehaus.mojo + exec-maven-plugin + + + generateDTOs + generate-sources + + exec + + + bash + + ${basedir}/../database/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + + + + + + com.github.alexcojocaru + elasticsearch-maven-plugin + 6.16 + + testCluster + 9500 + ${databaseport} + 6.5.0 + 120 + ${project.build.directory}/EsInit.script + ${skipTests} + + + + start-elasticsearch + process-test-classes + + runforked + + + + stop-elasticsearch + prepare-package + + stop + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + databaseport + ${databaseport} + + + + + + + diff --git a/sdnr/wt/devicemanager-gran/feature/pom.xml b/sdnr/wt/devicemanager-gran/feature/pom.xml index 161c030ef..bc7ff2cb4 100644 --- a/sdnr/wt/devicemanager-gran/feature/pom.xml +++ b/sdnr/wt/devicemanager-gran/feature/pom.xml @@ -21,29 +21,28 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-feature + 0.7.0-SNAPSHOT + feature - - - ${project.groupId} - sdnr-wt-devicemanager-gran-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + ${project.groupId} + sdnr-wt-devicemanager-gran-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-gran/installer/pom.xml b/sdnr/wt/devicemanager-gran/installer/pom.xml index 9cbe113d2..e0764ab3f 100755 --- a/sdnr/wt/devicemanager-gran/installer/pom.xml +++ b/sdnr/wt/devicemanager-gran/installer/pom.xml @@ -22,104 +22,104 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemanager-gran - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-devicemanager-gran + false + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/devicemanager-gran/model/pom.xml b/sdnr/wt/devicemanager-gran/model/pom.xml index b95a6cf0a..39d2b5346 100644 --- a/sdnr/wt/devicemanager-gran/model/pom.xml +++ b/sdnr/wt/devicemanager-gran/model/pom.xml @@ -22,47 +22,49 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-gran/pom.xml b/sdnr/wt/devicemanager-gran/pom.xml index d661d7d5f..b39543812 100755 --- a/sdnr/wt/devicemanager-gran/pom.xml +++ b/sdnr/wt/devicemanager-gran/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-devicemanager-gran - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-devicemanager-gran + diff --git a/sdnr/wt/devicemanager-gran/provider/pom.xml b/sdnr/wt/devicemanager-gran/provider/pom.xml index 56ec1c2f4..16f4dbaf0 100644 --- a/sdnr/wt/devicemanager-gran/provider/pom.xml +++ b/sdnr/wt/devicemanager-gran/provider/pom.xml @@ -16,102 +16,103 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-gran-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-gran-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 6.4.3 - 49400 - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 6.4.3 + 49400 + - - - - org.mockito - mockito-core - test - - - - ${project.groupId} - sdnr-wt-devicemanager-gran-model - ${project.version} - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-common - ${project.version} - provided - - - org.osgi - org.osgi.core - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - - - - src/main/resources - true - - - + + + + org.mockito + mockito-core + test + + + + ${project.groupId} + sdnr-wt-devicemanager-gran-model + ${project.version} + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-common + ${project.version} + provided + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -133,15 +134,16 @@ generate-sources exec - - - ${basedir}/../../data-provider/database/src/main/resources/es-init.sh - - initfile - -f + + + bash + + ${basedir}/../../data-provider/database/src/main/resources/es-init.sh + initfile + -f ${project.build.directory}/EsInit.script - + @@ -153,8 +155,10 @@ testCluster 9500 ${databaseport} - 6.4.3 + 6.5.0 + 120 ${project.build.directory}/EsInit.script + ${skipTests} @@ -186,6 +190,5 @@ - + - diff --git a/sdnr/wt/devicemanager-onf/feature/pom.xml b/sdnr/wt/devicemanager-onf/feature/pom.xml index a2129ff9e..6ea6c0e93 100644 --- a/sdnr/wt/devicemanager-onf/feature/pom.xml +++ b/sdnr/wt/devicemanager-onf/feature/pom.xml @@ -21,34 +21,33 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-feature + 0.7.0-SNAPSHOT + feature - - - - - - - - ${project.groupId} - sdnr-wt-devicemanager-onf-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + + + + + + ${project.groupId} + sdnr-wt-devicemanager-onf-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-onf/installer/pom.xml b/sdnr/wt/devicemanager-onf/installer/pom.xml index a36def9e4..a4155a9ab 100755 --- a/sdnr/wt/devicemanager-onf/installer/pom.xml +++ b/sdnr/wt/devicemanager-onf/installer/pom.xml @@ -22,91 +22,93 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemanager-onf - false - + ccsdk-features :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + sdnr-wt-devicemanager-onf + false + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/devicemanager-onf/model/pom.xml b/sdnr/wt/devicemanager-onf/model/pom.xml index 26a068410..15daa9ddb 100644 --- a/sdnr/wt/devicemanager-onf/model/pom.xml +++ b/sdnr/wt/devicemanager-onf/model/pom.xml @@ -22,47 +22,49 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-onf/pom.xml b/sdnr/wt/devicemanager-onf/pom.xml index 3d742e2ae..26bcfc407 100755 --- a/sdnr/wt/devicemanager-onf/pom.xml +++ b/sdnr/wt/devicemanager-onf/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-devicemanager-onf - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-devicemanager-onf + diff --git a/sdnr/wt/devicemanager-onf/provider/pom.xml b/sdnr/wt/devicemanager-onf/provider/pom.xml index e56cd3076..92d2516b0 100644 --- a/sdnr/wt/devicemanager-onf/provider/pom.xml +++ b/sdnr/wt/devicemanager-onf/provider/pom.xml @@ -16,83 +16,84 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-onf-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-onf-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 6.4.3 - 49400 - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 6.4.3 + 49400 + - - - - org.mockito - mockito-core - test - + + + + org.mockito + mockito-core + test + - - - - - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - - - - - - - - - src/main/resources - true - - - + + + + + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + + + + + + + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -114,15 +115,16 @@ generate-sources exec - - - ${basedir}/../../data-provider/database/src/main/resources/es-init.sh - - initfile - -f + + + bash + + ${basedir}/../../data-provider/database/src/main/resources/es-init.sh + initfile + -f ${project.build.directory}/EsInit.script - + @@ -134,8 +136,10 @@ testCluster 9500 ${databaseport} - 6.4.3 + 6.5.0 + 120 ${project.build.directory}/EsInit.script + ${skipTests} @@ -167,6 +171,5 @@ - + - diff --git a/sdnr/wt/devicemanager-oran/feature/pom.xml b/sdnr/wt/devicemanager-oran/feature/pom.xml index 8eaa930e2..c2f87a0df 100644 --- a/sdnr/wt/devicemanager-oran/feature/pom.xml +++ b/sdnr/wt/devicemanager-oran/feature/pom.xml @@ -21,29 +21,28 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-feature + 0.7.0-SNAPSHOT + feature - - - ${project.groupId} - sdnr-wt-devicemanager-oran-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + ${project.groupId} + sdnr-wt-devicemanager-oran-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-oran/installer/pom.xml b/sdnr/wt/devicemanager-oran/installer/pom.xml index e36acfc71..fbe3b231d 100755 --- a/sdnr/wt/devicemanager-oran/installer/pom.xml +++ b/sdnr/wt/devicemanager-oran/installer/pom.xml @@ -22,104 +22,104 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemanager-oran - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-devicemanager-oran + false + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/devicemanager-oran/model/pom.xml b/sdnr/wt/devicemanager-oran/model/pom.xml index 6518a0fd2..d3fbab87e 100644 --- a/sdnr/wt/devicemanager-oran/model/pom.xml +++ b/sdnr/wt/devicemanager-oran/model/pom.xml @@ -22,47 +22,49 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-oran/pom.xml b/sdnr/wt/devicemanager-oran/pom.xml index a4f1b3ba2..85c192864 100755 --- a/sdnr/wt/devicemanager-oran/pom.xml +++ b/sdnr/wt/devicemanager-oran/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-devicemanager-oran - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-devicemanager-oran + diff --git a/sdnr/wt/devicemanager-oran/provider/pom.xml b/sdnr/wt/devicemanager-oran/provider/pom.xml index 3a8063827..e03295cc8 100644 --- a/sdnr/wt/devicemanager-oran/provider/pom.xml +++ b/sdnr/wt/devicemanager-oran/provider/pom.xml @@ -16,82 +16,83 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 6.4.3 - 49400 - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 6.4.3 + 49400 + - - - - org.mockito - mockito-core - test - + + + + org.mockito + mockito-core + test + - - - ${project.groupId} - sdnr-wt-devicemanager-oran-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - - - - src/main/resources - true - - - + + + ${project.groupId} + sdnr-wt-devicemanager-oran-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -113,15 +114,16 @@ generate-sources exec - - - ${basedir}/../../data-provider/database/src/main/resources/es-init.sh - - initfile - -f + + + bash + + ${basedir}/../../data-provider/database/src/main/resources/es-init.sh + initfile + -f ${project.build.directory}/EsInit.script - + @@ -133,8 +135,10 @@ testCluster 9500 ${databaseport} - 6.4.3 + 6.5.0 + 120 ${project.build.directory}/EsInit.script + ${skipTests} @@ -166,6 +170,5 @@ - + - diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 728ec0365..123ab2328 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -21,29 +21,28 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-feature + 0.7.0-SNAPSHOT + feature - - - ${project.groupId} - sdnr-wt-devicemanager-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + ${project.groupId} + sdnr-wt-devicemanager-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index 099de242f..86e586f4b 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -22,129 +22,129 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-devicemanager - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-devicemanager + false + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - maven-resources-plugin - 2.6 - - - copy-schemas - - copy-resources - - validate - - ${project.build.directory}/assembly/cache/schema - - - ${basedir}/../provider/src/main/resources/preload.cache.schema - - *.yang - - true - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + maven-resources-plugin + 2.6 + + + copy-schemas + + copy-resources + + validate + + ${project.build.directory}/assembly/cache/schema + + + ${basedir}/../provider/src/main/resources/preload.cache.schema + + *.yang + + true + + + + + + + + diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index d64af1a84..7a1ef0d4b 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -22,64 +22,66 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + true + + + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index 5a37d8521..6b4848ef2 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-devicemanager - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-devicemanager + diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 7c8a88095..1e7b1caa6 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -16,160 +16,161 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 6.4.3 - 49400 - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 6.4.3 + 49400 + - - - - org.mockito - mockito-core - test - + + + + org.mockito + mockito-core + test + - - - ${project.groupId} - sdnr-wt-devicemanager-model - ${project.version} - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-database - ${project.version} - provided - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-common - ${project.version} - provided - - - org.osgi - org.osgi.core - provided - - - org.opendaylight.mdsal.model - ietf-topology - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - provided - - - org.opendaylight.mdsal - yang-binding - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - org.json - json - provided - - - com.typesafe.akka - akka-actor_2.12 - provided - - - com.typesafe.akka - akka-cluster_2.12 - provided - - - org.osgi - org.osgi.compendium - provided - + + + ${project.groupId} + sdnr-wt-devicemanager-model + ${project.version} + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-database + ${project.version} + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-common + ${project.version} + provided + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.mdsal.model + ietf-topology + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + provided + + + org.opendaylight.mdsal + yang-binding + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + org.json + json + provided + + + com.typesafe.akka + akka-actor_2.12 + provided + + + com.typesafe.akka + akka-cluster_2.12 + provided + + + org.osgi + org.osgi.compendium + provided + - - - - - - - org.apache.commons - commons-lang3 - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - + + + + + + + org.apache.commons + commons-lang3 + provided + + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-annotations + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + - - - - - src/main/resources - true - - - + + + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -191,15 +192,16 @@ generate-sources exec - - - ${basedir}/../../data-provider/database/src/main/resources/es-init.sh - - initfile - -f + + + bash + + ${basedir}/../../data-provider/database/src/main/resources/es-init.sh + initfile + -f ${project.build.directory}/EsInit.script - + @@ -211,9 +213,10 @@ testCluster 9500 ${databaseport} - 6.4.3 - ${project.build.directory}/EsInit.script + 6.5.0 120 + ${project.build.directory}/EsInit.script + ${skipTests} @@ -245,6 +248,5 @@ - + - diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 41683844b..e1501e978 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -20,98 +20,99 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator + 0.7.0-SNAPSHOT + feature - - - ${project.groupId} - sdnr-wt-apigateway-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-helpserver-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-websocketmanager2-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-data-provider-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-onf-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-oran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-devicemanager-gran-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-core-feature - ${project.version} - xml - features - - - ${project.groupId} - sdnr-wt-odlux-apps-feature - ${project.version} - xml - features - - + ccsdk-features :: ${project.artifactId} + + + + ${project.groupId} + sdnr-wt-apigateway-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-helpserver-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-websocketmanager2-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-data-provider-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-onf-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-oran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-devicemanager-gran-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-core-feature + ${project.version} + xml + features + + + ${project.groupId} + sdnr-wt-odlux-apps-feature + ${project.version} + xml + features + + diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 805075b06..be29408c3 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -20,162 +20,160 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-feature-aggregator - true - ${project.version} - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-feature-aggregator + true + ${project.version} + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name} + ${project.version} + xml + features + + + + + + + + - - - - - - org.onap.ccsdk.features.sdnr.wt - ${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 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - unpack-cache-schema - - unpack - - prepare-package - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-provider - ${project.version} - jar - preload.cache.schema/** - ${project.build.directory}/assembly - - - - - - - unpack-es-init - prepare-package - - unpack - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-database - ${project.version} - jar - es-init.sh - ${project.build.directory}/assembly/opt/onap/sdnc/bin - - - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + unpack-cache-schema + + unpack + + prepare-package + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-provider + ${project.version} + jar + preload.cache.schema/** + ${project.build.directory}/assembly + + + + + + + unpack-es-init + prepare-package + + unpack + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-database + ${project.version} + jar + es-init.sh + ${project.build.directory}/assembly/opt/onap/sdnc/bin + + + + + + + + diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index e6e058774..a9576bda9 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -20,24 +20,24 @@ * ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-top + 0.7.0-SNAPSHOT + pom - - feature - installer - + ccsdk-features :: ${project.artifactId} + + feature + installer + diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index da50bc9db..a03f08865 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -22,29 +22,29 @@ --> - 4.0.0 - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - - - - - - - ${project.groupId} - sdnr-wt-helpserver-provider - ${project.version} - - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: ${project.artifactId} + + + + + ${project.groupId} + sdnr-wt-helpserver-provider + ${project.version} + + + diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index 557e7bf4e..53bceff85 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -1,113 +1,114 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-helpserver - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-helpserver + false + - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index fd0a68cbb..d11cb94ac 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -22,29 +22,29 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-top + 0.7.0-SNAPSHOT + pom + ccsdk-features :: ${project.artifactId} - - feature - provider - installer - + + feature + provider + installer + - - sdnr-wt-helpserver - + + sdnr-wt-helpserver + diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 2fae07cda..1b2367eda 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -11,24 +11,27 @@ OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= --> - - + 4.0.0 + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + org.onap.ccsdk.features.sdnr.wt sdnr-wt-helpserver-provider 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} bundle + + ccsdk-features :: ${project.artifactId} + true - - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + javax.servlet @@ -57,6 +60,7 @@ + diff --git a/sdnr/wt/netconfnode-state-service/feature/pom.xml b/sdnr/wt/netconfnode-state-service/feature/pom.xml index 1e98505a8..8becb3bcb 100644 --- a/sdnr/wt/netconfnode-state-service/feature/pom.xml +++ b/sdnr/wt/netconfnode-state-service/feature/pom.xml @@ -21,38 +21,37 @@ * ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-feature + 0.7.0-SNAPSHOT + feature - - - - - - - - - - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-provider - ${project.version} - - + ccsdk-features :: ${project.artifactId} + + + + + + + + + + + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-provider + ${project.version} + + diff --git a/sdnr/wt/netconfnode-state-service/installer/pom.xml b/sdnr/wt/netconfnode-state-service/installer/pom.xml index aedc4d2c6..332fd16ef 100755 --- a/sdnr/wt/netconfnode-state-service/installer/pom.xml +++ b/sdnr/wt/netconfnode-state-service/installer/pom.xml @@ -22,104 +22,104 @@ --> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-netconfnode-state-service - false - + ccsdk-features :: ${project.artifactId} - + + sdnr-wt-netconfnode-state-service + false + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/netconfnode-state-service/model/pom.xml b/sdnr/wt/netconfnode-state-service/model/pom.xml index b0c9840ac..5a41e293c 100644 --- a/sdnr/wt/netconfnode-state-service/model/pom.xml +++ b/sdnr/wt/netconfnode-state-service/model/pom.xml @@ -22,57 +22,59 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - true - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-model + 0.7.0-SNAPSHOT + bundle - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - + + true + + + + org.opendaylight.netconf - sal-netconf-connector - provided + sal-netconf-connector + provided + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-data-provider-model + ${project.version} - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-data-provider-model - ${project.version} - - - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/netconfnode-state-service/pom.xml b/sdnr/wt/netconfnode-state-service/pom.xml index 07dfcc7bf..65be6bf15 100755 --- a/sdnr/wt/netconfnode-state-service/pom.xml +++ b/sdnr/wt/netconfnode-state-service/pom.xml @@ -24,12 +24,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -37,9 +31,12 @@ - - sdnr-wt-netconfnode-state-service - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-top + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} model @@ -48,4 +45,7 @@ installer + + sdnr-wt-netconfnode-state-service + diff --git a/sdnr/wt/netconfnode-state-service/provider/pom.xml b/sdnr/wt/netconfnode-state-service/provider/pom.xml index ed0dad795..cead46878 100644 --- a/sdnr/wt/netconfnode-state-service/provider/pom.xml +++ b/sdnr/wt/netconfnode-state-service/provider/pom.xml @@ -16,75 +16,75 @@ ============LICENSE_END========================================================= --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-netconfnode-state-service-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-netconfnode-state-service-provider + 0.7.0-SNAPSHOT + bundle - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - - com.typesafe.akka - akka-actor_2.12 - provided - - - com.typesafe.akka - akka-cluster_2.12 - provided - - - ${project.groupId} - sdnr-wt-common - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - - - - - - src/main/resources - true - - - - + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + + com.typesafe.akka + akka-actor_2.12 + provided + + + com.typesafe.akka + akka-cluster_2.12 + provided + + + ${project.groupId} + sdnr-wt-common + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + + + + + + src/main/resources + true + + + + diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 11bf306f2..960fb745b 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-apiDemo 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-apiDemo + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -46,8 +48,21 @@ org.osgi.compendium + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -96,9 +111,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -139,17 +154,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index dd67901ab..9b4a9f565 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -14,18 +14,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - org.onap.ccsdk.parent single-feature-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 20871a4d2..60ef31348 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -2,12 +2,6 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-apps-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} - org.onap.ccsdk.parent odlparent-lite @@ -15,10 +9,12 @@ - - sdnr-wt-odlux-apps - false - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-apps-installer + 0.7.0-SNAPSHOT + pom + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -26,6 +22,11 @@ + + sdnr-wt-odlux-apps + false + + org.onap.ccsdk.features.sdnr.wt diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index a4e067873..6abe1f07b 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-configurationApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-configurationApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index f52fa1111..36a5cf8bf 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-connectApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-connectApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 8cffb9e7a..535549ae3 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-demoApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-demoApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/eventLogApp/pom.xml b/sdnr/wt/odlux/apps/eventLogApp/pom.xml index 9e369ee62..ed67399ec 100644 --- a/sdnr/wt/odlux/apps/eventLogApp/pom.xml +++ b/sdnr/wt/odlux/apps/eventLogApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-eventLogApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-eventLogApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 973c1061f..1c616a40b 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -9,18 +9,19 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-faultApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-faultApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -39,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -89,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -132,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index 8180a68df..8f8b59a9a 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-helpApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-helpApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index 081f070fc..86c5e8381 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-inventoryApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-inventoryApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index be6e2ea6e..ccd0dbf09 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-maintenanceApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-maintenanceApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index bc3355a39..80fdbf569 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -9,18 +9,19 @@ - 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-mediatorApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-mediatorApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -39,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -89,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -132,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index dc9507c9b..51a8f0a6b 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-minimumApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-minimumApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index b6ede0c36..4fc302f05 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,18 +8,20 @@ 1.5.1-SNAPSHOT - 4.0.0 + org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-performanceHistoryApp 0.7.0-SNAPSHOT bundle - sdnr-wt-odlux-app-performanceHistoryApp + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 + ${project.groupId} @@ -38,8 +40,21 @@ test + src2/main/java + + + dist + odlux + + + src2/main/resources + + + src2/test/resources + + maven-clean-plugin @@ -88,9 +103,9 @@ - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 install node and yarn @@ -131,17 +146,5 @@ - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index a643ec2fe..a0c01c995 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -14,18 +14,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature - org.onap.ccsdk.parent single-feature-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-feature + 0.7.0-SNAPSHOT + feature + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -44,7 +45,6 @@ - diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index 98a4fd50f..bf6243c6c 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -1,99 +1,100 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-odlux-core - false - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + sdnr-wt-odlux-core + false + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + + + diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index 1618e7aa1..ad80dc080 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -2,18 +2,19 @@ 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-model - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - org.onap.ccsdk.parent binding-parent 1.5.1-SNAPSHOT + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-model + 0.7.0-SNAPSHOT + bundle + + ccsdk-features :: ${project.artifactId} Apache License, Version 2.0 @@ -36,6 +37,7 @@ + diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index c41075a10..de888e7f4 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -1,35 +1,35 @@ + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-top + 0.7.0-SNAPSHOT + pom - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-top - 0.7.0-SNAPSHOT - pom - odlux-core + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - sdnr-wt-odlux-core - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + model + provider + features + installer + - - model - provider - features - installer - + + sdnr-wt-odlux-core + diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index 84838a05f..2b8d9e4c6 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -1,108 +1,111 @@ - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-core-model - ${project.version} - - - ${project.groupId} - sdnr-wt-odlux-framework - ${project.version} - - - org.eclipse.jetty - jetty-server - test - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-provider + 0.7.0-SNAPSHOT + bundle - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.slf4j - slf4j-api - - - com.google.guava - guava - - - javax.servlet - javax.servlet-api - - - org.mockito - mockito-core - test - - - junit - junit - test - - - org.slf4j - slf4j-simple - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-checkstyle-plugin - - true - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; - - sdnr-wt-odlux-framework;inline=true - true - ${project.groupId}.* - - - - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-core-model + ${project.version} + + + ${project.groupId} + sdnr-wt-odlux-framework + ${project.version} + + + org.eclipse.jetty + jetty-server + test + + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + javax.servlet + javax.servlet-api + + + org.mockito + mockito-core + test + + + junit + junit + test + + + org.slf4j + slf4j-simple + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + maven-checkstyle-plugin + + true + + + + org.apache.felix + maven-bundle-plugin + true + + + org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*; + + sdnr-wt-odlux-framework;inline=true + true + ${project.groupId}.* + + + + + diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index 467101759..210727c53 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -1,163 +1,165 @@ - + + 4.0.0 - - org.onap.ccsdk.parent - odlparent - 1.5.1-SNAPSHOT - - - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-framework - 0.7.0-SNAPSHOT - jar - sdnr-wt-odlux-framework - - ${maven.build.timestamp} - ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version}) - 36.1a30021(19/12/12) - ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + org.onap.ccsdk.parent + odlparent + 1.5.1-SNAPSHOT + + - - - - maven-clean-plugin - - - - dist - false - - - node - false - - - node_modules - false - - - ../node_modules - false - - - - bin - false - - - - - - de.jacks-it-lab - frontend-maven-plugin - 1.7.1 - - - install node and yarn - - install-node-and-yarn - - - initialize - - v10.16.3 - v1.19.0 - - - - clear cache - - yarn - - initialize - - cache clean - ${project.basedir} - ${project.basedir}/../ - - - - install lerna - - yarn - - initialize - - add lerna@3.13.1 -W --exact - ${project.basedir} - ${project.basedir}/../ - - - - exec lerna bootstrap - - lerna - - initialize - - false - bootstrap - ${project.basedir} - ${project.basedir}/../ - - - - yarn build - - yarn - - - run build - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - replace version - prepare-package - - replace - - - - - ${project.build.directory}/classes/odlux - - app.js - - - - ##odlux.version## - ${odlux.version} - - - - - - - - dist - odlux - - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-odlux-framework + 0.7.0-SNAPSHOT + jar + + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + ${maven.build.timestamp} + ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version}) + 36.1a30021(19/12/12) + ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version} + + + + + + dist + odlux + + + + + maven-clean-plugin + + + + dist + false + + + node + false + + + node_modules + false + + + ../node_modules + false + + + + bin + false + + + + + + de.jacks-it-lab + frontend-maven-plugin + 1.7.1 + + + install node and yarn + + install-node-and-yarn + + + initialize + + v10.16.3 + v1.19.0 + + + + clear cache + + yarn + + initialize + + cache clean + ${project.basedir} + ${project.basedir}/../ + + + + install lerna + + yarn + + initialize + + add lerna@3.13.1 -W --exact + ${project.basedir} + ${project.basedir}/../ + + + + exec lerna bootstrap + + lerna + + initialize + + false + bootstrap + ${project.basedir} + ${project.basedir}/../ + + + + yarn build + + yarn + + + run build + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + replace version + prepare-package + + replace + + + + + ${project.build.directory}/classes/odlux + + app.js + + + + ##odlux.version## + ${odlux.version} + + + + + + diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index cade21b30..f88301bb0 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -1,5 +1,6 @@ + 4.0.0 org.onap.ccsdk.parent @@ -8,13 +9,12 @@ - - 4.0.0 org.onap.ccsdk.features.sdnr.wt - odlux-top + sdnr-wt-odlux-top 0.7.0-SNAPSHOT pom - odlux + + ccsdk-features :: ${project.artifactId} framework @@ -29,35 +29,34 @@ apps/maintenanceApp apps/minimumApp apps/performanceHistoryApp - apps/eventLogApp + apps/eventLogApp apps/configurationApp apps/app-feature apps/app-installer - - - - exec-maven-plugin - org.codehaus.mojo - - - Clean node and node_modules - package - - exec - - - rm - - -r - node_modules - - - - - - - - + + + + org.codehaus.mojo + exec-maven-plugin + + + Clean node and node_modules + package + + exec + + + rm + + -r + node_modules + + + + + + + diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index d0c0ee7b6..185b4becb 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -33,7 +33,7 @@ 0.7.0-SNAPSHOT pom - ccsdk-sdnr-wireless transport :: micro-services + ccsdk-features :: ${project.artifactId} SDN-R wireless transport micro-services @@ -43,7 +43,7 @@ helpserver data-provider netconfnode-state-service - devicemanager + devicemanager devicemanager-onf devicemanager-oran devicemanager-gran diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 428e72328..25dff3427 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -11,10 +11,10 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-readthedocs-installer - 0.5.1-SNAPSHOT + 0.7.0-SNAPSHOT pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} sdnr-wt-apigateway diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index f7c33dd0a..c0023aa0b 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -22,43 +22,43 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-feature - 0.7.0-SNAPSHOT - feature - ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature + + org.onap.ccsdk.parent + single-feature-parent + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - single-feature-parent - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-feature + 0.7.0-SNAPSHOT + feature - + ccsdk-features :: ${project.artifactId} + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + ${project.groupId} + sdnr-wt-websocketmanager2-provider + ${project.version} + - - - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - ${project.groupId} - sdnr-wt-websocketmanager2-provider - ${project.version} - - diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index e363be323..b17065a89 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -22,111 +22,112 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-installer - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-installer + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - false - + ccsdk-features :: ${project.artifactId} - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - + + sdnr-wt-websocketmanager2 + false + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - - - - - - - - - - - - - - - - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + + + + + + + + + + + + + + + + + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index fed8b2e54..2d04ad1bb 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -22,16 +22,19 @@ --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-model - 0.7.0-SNAPSHOT - bundle - ccsdk-features-sdnr-wt :: ${project.artifactId} - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-model + 0.7.0-SNAPSHOT + bundle + + ccsdk-features :: ${project.artifactId} diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index f02ce1177..f6fec3c43 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -22,30 +22,30 @@ --> - 4.0.0 + 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-top - 0.7.0-SNAPSHOT - pom - ccsdk-features-sdnr-wt :: ${project.artifactId} + + org.onap.ccsdk.parent + odlparent-lite + 1.5.1-SNAPSHOT + + - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-top + 0.7.0-SNAPSHOT + pom - - sdnr-wt-websocketmanager2 - + ccsdk-features :: ${project.artifactId} - - model - provider - feature - installer - + + model + provider + feature + installer + + + sdnr-wt-websocketmanager2 + diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 11d212f3f..894be09e9 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -11,116 +11,120 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - 4.0.0 - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-websocketmanager2-provider - 0.7.0-SNAPSHOT - ccsdk-features-sdnr-wt :: ${project.artifactId} - bundle - - org.onap.ccsdk.parent - binding-parent - 1.5.1-SNAPSHOT - - - - true - true - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - - - - - - - - - + 4.0.0 - - - ${project.groupId} - sdnr-wt-websocketmanager2-model - ${project.version} - - - javax.servlet - servlet-api - - - org.eclipse.jetty.websocket - websocket-api - - - org.eclipse.jetty.websocket - websocket-servlet - - - io.netty - netty-transport - - - io.netty - netty-all + + org.onap.ccsdk.parent + binding-parent + 1.5.1-SNAPSHOT + + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-websocketmanager2-provider + 0.7.0-SNAPSHOT + bundle + + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + true + true + + + + + + + + + + + + + + + + ${project.groupId} + sdnr-wt-websocketmanager2-model + ${project.version} + + + javax.servlet + servlet-api + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-servlet + + + io.netty + netty-transport + + + io.netty + netty-all - - - org.json - json - - - com.typesafe.akka - akka-actor_2.12 - - - com.typesafe.akka - akka-cluster_2.12 - - - org.java-websocket - Java-WebSocket - - - org.mockito - mockito-core + + + org.json + json + + + com.typesafe.akka + akka-actor_2.12 + + + com.typesafe.akka + akka-cluster_2.12 + + + org.java-websocket + Java-WebSocket + + + org.mockito + mockito-core - test - - - org.opendaylight.controller - sal-binding-api - - - org.osgi - org.osgi.core - - - org.osgi - org.osgi.compendium - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - - - - + test + + + org.opendaylight.controller + sal-binding-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + + + + @@ -133,18 +137,18 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + -- cgit 1.2.3-korg