X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=pom.xml;h=7957b0f6317f428aca09ddf0bf41860ec88257a3;hp=dec4433d3d69394f8a05aaa022bea5f6f3162f9a;hb=e78f07ad32ffb52ed5d3e02295ed5282841870f3;hpb=4a74141f145c74d4d26a191ea30d34d331feb70e

diff --git a/pom.xml b/pom.xml
index dec4433d3..7957b0f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,8 @@
   ============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.
@@ -17,19 +18,17 @@
   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>2.0.0</version>
+        <version>3.0.1-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -53,21 +52,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>
         <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.3.0</elasticsearch.version>
-        <version.policy.common>1.3.1</version.policy.common>
-        <version.policy.drools-application>1.3.1</version.policy.drools-application>
+        <elasticsearch.version>6.8.2</elasticsearch.version>
+        <version.policy.common>1.5.2-SNAPSHOT</version.policy.common>
+        <version.policy.models>2.1.3-SNAPSHOT</version.policy.models>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>
@@ -105,16 +98,6 @@
             </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>javax.servlet</groupId>
@@ -153,13 +136,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 -->
@@ -203,16 +184,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>