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/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 +++++++-------- 5 files changed, 247 insertions(+), 246 deletions(-) (limited to 'sdnr/wt/netconfnode-state-service') 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 + + + + -- cgit 1.2.3-korg