summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-12-18 02:26:48 +0000
committerliamfallon <liam.fallon@est.tech>2022-12-18 02:26:52 +0000
commit7c48007486d0d1ee47a5eea81135e49737677155 (patch)
tree9a3dbb92092461de20324851f919c13fdcabe217 /main
parentfa1e2fc847b5ef2aca7d9a2a2c2380bc58320527 (diff)
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>
Diffstat (limited to 'main')
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/rest/TestActuatorEndpoints.java3
-rw-r--r--main/src/test/resources/application-test-e2e.yaml3
-rw-r--r--main/src/test/resources/application-test.yaml2
3 files changed, 4 insertions, 4 deletions
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 967da6c3..06875556 100644
--- 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
@@ -58,9 +58,6 @@ public class TestActuatorEndpoints {
private WebApplicationContext context;
@Autowired
- private TestSecurityConfig securityConfig;
-
- @Autowired
private MockMvc mock;
@BeforeClass
diff --git a/main/src/test/resources/application-test-e2e.yaml b/main/src/test/resources/application-test-e2e.yaml
index 09a2ca6a..2191a116 100644
--- 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 093ce437..06d4c3ac 100644
--- 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: