X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fpom.xml;h=65a544b0febb464e2239844548bd5578e1401f84;hb=78232bcb0d1bb4a4ec4329dda72f10e5193ed380;hp=fa20a6be544c4be61e46174c19e9fa237a61b9ea;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index fa20a6be5..65a544b0f 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP Policy Engine
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<plugins>
@@ -76,7 +76,7 @@
 					<artifactId>json</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>com.att.nsa</groupId>
+					<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
 					<artifactId>dmaapClient</artifactId>
 				</exclusion>
 				<exclusion>
@@ -84,7 +84,7 @@
 					<artifactId>cambriaClient</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>com.att.cadi</groupId>
+					<groupId>org.onap.aaf.cadi</groupId>
 					<artifactId>cadi-aaf</artifactId>
 				</exclusion>
 			</exclusions>
@@ -108,17 +108,17 @@
 		<dependency>
 			<groupId>org.onap.policy.common</groupId>
 			<artifactId>ONAP-Logging</artifactId>
-			<version>${common-modules.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.powermock</groupId>
-						<artifactId>powermock-module-junit4</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.powermock</groupId>
-						<artifactId>powermock-api-mockito</artifactId>
-					</exclusion>
-				</exclusions>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-module-junit4</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -144,12 +144,12 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.1</version>
+			<version>${commons.fileupload.version}</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-core</artifactId>
-    		<version>2.8.2</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.8.2</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -190,7 +190,6 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>[1.4.186,)</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.fge</groupId>
@@ -207,20 +206,19 @@
 			<artifactId>eclipselink</artifactId>
 			<version>2.6.0</version>
 		</dependency>
-
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.30</version>
-		</dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.1.1</version>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<version>2.0.8</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.policy.engine</groupId>
-			<artifactId>ControlloopPolicy</artifactId>
+			<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+			<artifactId>policy-yaml</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -279,17 +277,17 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.6.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.6.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.6.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
@@ -307,9 +305,9 @@
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.elasticsearch</groupId>
-    		<artifactId>elasticsearch</artifactId>
-    		<version>5.1.2</version>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>6.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>io.searchbox</groupId>
@@ -333,12 +331,23 @@
 			<artifactId>tomcat-dbcp</artifactId>
 			<version>8.5.9</version>
 		</dependency>
-
+		<!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+		<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>
 	</dependencies>
 	<properties>
-		<springframework.version>4.2.0.RELEASE</springframework.version>
+		<springframework.version>4.3.3.RELEASE</springframework.version>
 		<hibernate.version>4.3.10.Final</hibernate.version>
 		<projectversion>2.0.2</projectversion>
-		<jackson.version>2.6.0</jackson.version>
 	</properties>
 </project>