summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/devicemanager-onf/provider
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2019-12-12 15:24:53 -0500
committerSingal, Kapil (ks220y) <ks220y@att.com>2019-12-16 15:42:48 -0500
commitdf195945d03dec122666e8d48e4c7ba94630468a (patch)
treeb82f3f19c720cc47789bd158d7c1e4b730109014 /sdnr/wt/devicemanager-onf/provider
parent6da38e9544f5eadc39ba3cf9f28183a6dac79f9c (diff)
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) <ks220y@att.com>
Diffstat (limited to 'sdnr/wt/devicemanager-onf/provider')
-rw-r--r--sdnr/wt/devicemanager-onf/provider/pom.xml165
1 files changed, 84 insertions, 81 deletions
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=========================================================
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
- <artifactId>sdnr-wt-devicemanager-onf-provider</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
- <packaging>bundle</packaging>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>binding-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
+ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+ <artifactId>sdnr-wt-devicemanager-onf-provider</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <properties>
- <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
- <buildtime>${maven.build.timestamp} UTC</buildtime>
- <elasticsearch.version>6.4.3</elasticsearch.version>
- <databaseport>49400</databaseport>
- </properties>
+ <name>ccsdk-features :: ${project.artifactId}</name>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
+ <maven.javadoc.skip>true</maven.javadoc.skip>
+ <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+ <buildtime>${maven.build.timestamp} UTC</buildtime>
+ <elasticsearch.version>6.4.3</elasticsearch.version>
+ <databaseport>49400</databaseport>
+ </properties>
- <dependencies>
- <!-- begin for testing -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependencies>
+ <!-- begin for testing -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- end for testing -->
-<!-- <dependency> -->
-<!-- <groupId>${project.groupId}</groupId> -->
-<!-- <artifactId>sdnr-wt-devicemanager-onf-model</artifactId> -->
-<!-- <version>${project.version}</version> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
- <dependency>
- <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
- <artifactId>sdnr-wt-devicemanager-model</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> -->
-<!-- <artifactId>rfc6991-ietf-yang-types</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
+ <!-- end for testing -->
+ <!-- <dependency> -->
+ <!-- <groupId>${project.groupId}</groupId> -->
+ <!-- <artifactId>sdnr-wt-devicemanager-onf-model</artifactId> -->
+ <!-- <version>${project.version}</version> -->
+ <!-- <scope>provided</scope> -->
+ <!-- </dependency> -->
+ <dependency>
+ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+ <artifactId>sdnr-wt-devicemanager-model</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>sal-netconf-connector</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> -->
+ <!-- <artifactId>rfc6991-ietf-yang-types</artifactId> -->
+ <!-- <scope>provided</scope> -->
+ <!-- </dependency> -->
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -114,15 +115,16 @@
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
- </goals>
- <configuration>
- <executable>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</executable>
- <arguments>
- <argument>initfile</argument>
- <argument>-f</argument>
+ </goals>
+ <configuration>
+ <executable>bash</executable>
+ <arguments>
+ <argument>${basedir}/../../data-provider/database/src/main/resources/es-init.sh</argument>
+ <argument>initfile</argument>
+ <argument>-f</argument>
<argument>${project.build.directory}/EsInit.script</argument>
</arguments>
- </configuration>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -134,8 +136,10 @@
<clusterName>testCluster</clusterName>
<transportPort>9500</transportPort>
<httpPort>${databaseport}</httpPort>
- <version>6.4.3</version>
+ <version>6.5.0</version>
+ <timeout>120</timeout>
<pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
+ <skip>${skipTests}</skip>
</configuration>
<executions>
<execution>
@@ -167,6 +171,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
-