Upgrade the H2 database to the latest version

The latest verison of H2 does not allow colums called "user" or indexes
using an underscore in their name.

Issue-ID: POLICY-4488
Change-Id: I9ce7435b5dfa81daaf04e7f7a50f9db6582cdc0b
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestActuatorEndpoints.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestActuatorEndpoints.java
index 967da6c..0687555 100644 (file)
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestActuatorEndpoints.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestActuatorEndpoints.java
@@ -57,9 +57,6 @@ public class TestActuatorEndpoints {
     @Autowired
     private WebApplicationContext context;
 
-    @Autowired
-    private TestSecurityConfig securityConfig;
-
     @Autowired
     private MockMvc mock;
 

diff --git a/main/src/test/resources/application-test-e2e.yaml b/main/src/test/resources/application-test-e2e.yaml
index 09a2ca6..2191a11 100644 (file)
--- a/main/src/test/resources/application-test-e2e.yaml
+++ b/main/src/test/resources/application-test-e2e.yaml
@@ -10,15 +10,16 @@ spring:
     url: jdbc:h2:mem:testdb
     driverClassName: org.h2.Driver
   jpa:
+#    show-sql: true
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
+#        format_sql: true
     hibernate:
       ddl-auto: create-drop
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-
 server:
   port: 6969
 

diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml
index 093ce43..06d4c3a 100644 (file)
--- a/main/src/test/resources/application-test.yaml
+++ b/main/src/test/resources/application-test.yaml
@@ -10,9 +10,11 @@ spring:
     url: jdbc:h2:mem:testdb
     driverClassName: org.h2.Driver
   jpa:
+#    show-sql: true
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
+#        format_sql: true
     hibernate:
       ddl-auto: create-drop
       naming: