X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=pom.xml;h=e50dd7d4fe3e3e2b631f238b83cdbddbad540052;hp=3f5b660b7ee5b6446fede3660ea2da9f6ffc4e76;hb=2d523ee0d6929bd812bd9387c596ed8a653c714e;hpb=8bfbc4b6241d21252cd98d653f0860a58e64dcc2

diff --git a/pom.xml b/pom.xml
index 3f5b660b7..e50dd7d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,17 +18,18 @@
   limitations under the License.
   ============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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -53,14 +54,14 @@
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
         <!-- Project common dependency versions -->
-        <springframework.version>4.3.18.RELEASE</springframework.version>
+        <springframework.version>4.3.24.RELEASE</springframework.version>
         <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
         <jackson.version>2.9.4</jackson.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
-        <elasticsearch.version>6.4.3</elasticsearch.version>
-        <version.policy.common>1.5.1-SNAPSHOT</version.policy.common>
-        <version.policy.models>2.1.1-SNAPSHOT</version.policy.models>
+        <elasticsearch.version>6.8.2</elasticsearch.version>
+        <version.policy.common>1.6.0-SNAPSHOT</version.policy.common>
+        <version.policy.models>2.2.0-SNAPSHOT</version.policy.models>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>
@@ -99,6 +100,11 @@
         </plugins>
     </reporting>
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -120,6 +126,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
@@ -155,6 +166,11 @@
             <version>3.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>