summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/common/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt/common/pom.xml')
-rw-r--r--sdnr/wt/common/pom.xml19
1 files changed, 12 insertions, 7 deletions
diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index d10de210c..1010fa835 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -21,16 +21,16 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-common</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.7.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>ccsdk-features :: ${project.artifactId}</name>
+ <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -43,8 +43,8 @@
<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>
+ <elasticsearch-rest-client.version>6.4.3</elasticsearch-rest-client.version>
</properties>
<dependencies>
@@ -54,6 +54,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -65,7 +69,7 @@
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch.version}</version>
+ <version>${elasticsearch-rest-client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -80,6 +84,7 @@
<artifactId>jackson-databind</artifactId>
</dependency>
+
</dependencies>
<build>
@@ -109,7 +114,7 @@
<configuration>
<executable>bash</executable>
<arguments>
- <argument>${basedir}/../data-provider/database/src/main/resources/es-init.sh</argument>
+ <argument>${basedir}/../data-provider/provider/src/main/resources/es-init.sh</argument>
<argument>initfile</argument>
<argument>-f</argument>
<argument>${project.build.directory}/EsInit.script</argument>
@@ -123,13 +128,13 @@
<artifactId>elasticsearch-maven-plugin</artifactId>
<version>6.16</version>
<configuration>
+ <skip>${skipTests}</skip>
<clusterName>testCluster</clusterName>
<transportPort>9500</transportPort>
<httpPort>${databaseport}</httpPort>
<version>6.5.0</version>
<timeout>120</timeout>
<pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
- <skip>${skipTests}</skip>
</configuration>
<executions>
<execution>