diff options
| author |   Peyton Puckett <peyton.puckett@att.com> | 2020-02-21 10:25:28 -0600 |
|---|---|---|
| committer | Peyton Puckett <peyton.puckett@att.com> | 2020-02-21 13:36:58 -0600 |
| commit | a4eb86ee39e858d5f7c036cc70be8603d5f420bb (patch) | |
| tree | d2256c257ea184770379118a5c7716aca0b5c408 /POLICY-SDK-APP/src | |
| parent | 3710a41879717441884c75262015c536819a34c2 (diff) | |
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 <peyton.puckett@att.com>
Diffstat (limited to 'POLICY-SDK-APP/src')
| -rw-r--r-- | POLICY-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties | 4 | ||||
| -rw-r--r-- | POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
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; |