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/devicemanager-onf/provider/pom.xml | 165 +++++++++++++++-------------- 1 file changed, 84 insertions(+), 81 deletions(-) (limited to 'sdnr/wt/devicemanager-onf/provider') 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 @@ - + - -- cgit 1.2.3-korg