SDN-R add updated app

[ccsdk/features.git] / sdnr / wt / common / pom.xml

diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index ad3ce56..d942925 100644 (file)
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -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>
@@ -53,6 +53,10 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -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>