X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=pom.xml;h=b993dbd5eecc6e2f136a108dead161d6b380fe65;hp=4c055ac0e67a605c01fe492ef9b871ca55eaa5bc;hb=55d7f3d9d076a858bce8aad24b69c80438831040;hpb=47066cb4750955f9eed0db0e772f6224151a11a2

diff --git a/pom.xml b/pom.xml
index 4c055ac0e..b993dbd5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,19 +17,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-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -53,19 +51,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>
+        <elasticsearch.version>6.4.3</elasticsearch.version>
+        <version.policy.common>1.4.0-SNAPSHOT</version.policy.common>
+        <version.policy.drools-application>1.4.0-SNAPSHOT</version.policy.drools-application>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>
@@ -81,23 +75,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>
@@ -118,16 +97,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>
@@ -166,13 +135,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 -->