From a4eb86ee39e858d5f7c036cc70be8603d5f420bb Mon Sep 17 00:00:00 2001 From: Peyton Puckett Date: Fri, 21 Feb 2020 10:25:28 -0600 Subject: Add pom.xml dependencies and exclusions needed for policy-engine gui Update powermockignore annotation to fix junit failure Issue-ID: POLICY-1590 Change-Id: Iadd0855565c05d02af034a5ad02ea7b8e386fadc Signed-off-by: Peyton Puckett --- POLICY-SDK-APP/pom.xml | 54 ++++++++++++++++++++++ .../src/main/webapp/WEB-INF/conf/system.properties | 4 +- .../policy/admin/PolicyRestControllerTest.java | 2 +- 3 files changed, 57 insertions(+), 3 deletions(-) (limited to 'POLICY-SDK-APP') diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index aa02984e4..6c66bd7d2 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -107,6 +107,10 @@ org.springframework spring-webmvc + + org.springframework + spring-aop + xalan xalan @@ -123,12 +127,40 @@ xml-apis xml-apis + + org.hibernate + hibernate-core + + + org.aspectj + aspectjrt + + + org.aspectj + aspectjweaver + + + org.springframework + spring-expression + ${springframework.version} + + + org.aspectj + aspectjrt + 1.8.14 + + + org.aspectj + aspectjweaver + 1.8.14 + org.springframework spring-core + ${springframework.version} commons-logging @@ -144,10 +176,24 @@ org.springframework spring-web + ${springframework.version} + + + org.springframework + spring-expression + + org.springframework spring-webmvc + ${springframework.version} + + + org.springframework + spring-expression + + org.springframework @@ -259,6 +305,14 @@ xml-apis xml-apis + + org.springframework + spring-orm + + + org.springframework + spring-test + diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties index a12eac3ce..4831802ca 100644 --- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties +++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties @@ -44,9 +44,9 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o== ########################################################################## #Mysql db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb://localhost:3306/onapsdk1707 +db.connectionURL = jdbc:mariadb://localhost:3306/onap_sdk db.userName = root -db.password = +db.password = db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java index b2e1b9228..6c47b3955 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java @@ -69,7 +69,7 @@ import org.powermock.reflect.Whitebox; import org.springframework.mock.web.MockHttpServletResponse; @RunWith(PowerMockRunner.class) -@PowerMockIgnore({"com.sun.org.apache.xerces.*", "jdk.internal.reflect.*", "javax.xml.*", "org.xml.*", "org.w3c.*"}) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "com.sun.org.apache.xalan.*"}) public class PolicyRestControllerTest { private String clRequestString; -- cgit 1.2.3-korg