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

diff --git a/pom.xml b/pom.xml
index 6e73a2c41..e50dd7d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,14 +2,15 @@
   ============LICENSE_START=======================================================
   ONAP Policy Engine
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   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.
@@ -17,19 +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"
+<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>2.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -53,17 +53,15 @@
         <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
-        <!-- Shared between policy/* project repositories - same version -->
-        <h2.version>1.4.186</h2.version>
-
-        <!-- Shared between policy/* project repositories - different version -->
-
         <!-- 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>
-        <httpclient.version>4.5.5</httpclient.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.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>
@@ -79,23 +77,8 @@
         <module>POLICY-SDK-APP</module>
         <module>ONAP-SDK-APP</module>
         <module>packages</module>
+        <module>TestSuite</module>
     </modules>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ONAP Release Repository</name>
-            <url>${nexusproxy}/${releases.path}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ONAP Snapshot Repository</name>
-            <url>${nexusproxy}/${snapshots.path}</url>
-        </snapshotRepository>
-        <site>
-            <id>ecomp-site</id>
-            <url>dav:${nexusproxy}${sitePath}</url>
-        </site>
-    </distributionManagement>
     <reporting>
         <plugins>
             <plugin>
@@ -116,17 +99,12 @@
             </plugin>
         </plugins>
     </reporting>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -148,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>
@@ -164,13 +147,11 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
@@ -185,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>
@@ -214,16 +200,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>