From e92ff832cf993db876f22b2d27562fedf59f5043 Mon Sep 17 00:00:00 2001
From: Tarun Tej Velaga <tt3868@att.com>
Date: Mon, 24 Jul 2017 17:13:43 +0000
Subject: [Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes

Change-Id: I5675cf4527e17963b3142cf7184c0df31a766197
Signed-off-by: Tarun Tej Velaga <tt3868@att.com>
---
 ECOMP-PDP-REST/pom.xml | 104 ++++++++++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 45 deletions(-)

(limited to 'ECOMP-PDP-REST/pom.xml')

diff --git a/ECOMP-PDP-REST/pom.xml b/ECOMP-PDP-REST/pom.xml
index 3357851fe..142d81bc9 100644
--- a/ECOMP-PDP-REST/pom.xml
+++ b/ECOMP-PDP-REST/pom.xml
@@ -22,30 +22,30 @@
 	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.openecomp.policy.engine</groupId>
 		<artifactId>PolicyEngineSuite</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	
+
 	<artifactId>ECOMP-PDP-REST</artifactId>
-	
+
 	<description>ECOMP PDP REST</description>
 	<properties>
-        <springframework.version>4.3.3.RELEASE</springframework.version>
-    </properties>
+		<springframework.version>4.3.3.RELEASE</springframework.version>
+	</properties>
 	<packaging>war</packaging>
 	<build>
 		<plugins>
-	 		<plugin>
-	      		<artifactId>maven-war-plugin</artifactId>
-	      		<version>2.1</version>
-	      		<configuration>
-	        		<attachClasses>true</attachClasses>
-	      		</configuration>
-   			</plugin>
-    	</plugins>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<attachClasses>true</attachClasses>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
@@ -88,12 +88,24 @@
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
 			<version>1.2.3</version>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<version>9.1-901.jdbc4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>3.0.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
@@ -109,6 +121,12 @@
 			<artifactId>jersey-core</artifactId>
 			<version>1.18</version>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>javax.websocket</groupId>
 			<artifactId>javax.websocket-api</artifactId>
@@ -116,21 +134,21 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-  			<groupId>com.att.nsa</groupId>
-  			<artifactId>cambriaClient</artifactId>
-  			<version>0.0.1</version>
-  			<exclusions>
-  				<exclusion>
-  					<artifactId>slf4j-log4j12</artifactId>
-  					<groupId>org.slf4j</groupId>
-  				</exclusion>
-  			</exclusions>
+			<groupId>com.att.nsa</groupId>
+			<artifactId>cambriaClient</artifactId>
+			<version>0.0.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<version>1.9.5</version>
-		</dependency>     
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
@@ -152,28 +170,28 @@
 			<version>1.5.6</version>
 		</dependency>
 		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${springframework.version}</version>
+		</dependency>
+		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.5.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
-    				<artifactId>jackson-annotations</artifactId>
+					<artifactId>jackson-annotations</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -197,11 +215,7 @@
 				</exclusion>
 				<exclusion>
 					<groupId>javax.persistence</groupId>
-            		<artifactId>persistence-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.att.aft</groupId>
-    				<artifactId>dme2</artifactId>
+					<artifactId>persistence-api</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-- 
cgit 1.2.3-korg