aboutsummaryrefslogtreecommitdiffstats
path: root/feature-active-standby-management/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-02-09 11:01:43 -0500
committerJim Hahn <jrh3@att.com>2021-02-09 15:45:13 -0500
commit6127b4d50fccaa2e59f9e40910861260eb695c15 (patch)
tree0bd2ee574316e82db5538332bb7bd87f4b479a10 /feature-active-standby-management/src/test
parent208be1c545895cf61bc38fbc7bc5e9e45d085016 (diff)
Upgrade dependencies
Changes to eclipselink are incompatible with javax-persistence-api so removed the latter. Also added target-database property. Also replaced string constants with eclipselink constants. Per review comments, moved target-database values to property files. Issue-ID: POLICY-3005 Change-Id: I043203a952d54406a5996c1e8b5ba8936bf558c0 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-active-standby-management/src/test')
-rw-r--r--feature-active-standby-management/src/test/resources/asw/feature-active-standby-management.properties5
-rw-r--r--feature-active-standby-management/src/test/resources/asw/feature-state-management.properties3
-rw-r--r--feature-active-standby-management/src/test/resources/feature-active-standby-management.properties5
-rw-r--r--feature-active-standby-management/src/test/resources/feature-state-management.properties3
4 files changed, 10 insertions, 6 deletions
diff --git a/feature-active-standby-management/src/test/resources/asw/feature-active-standby-management.properties b/feature-active-standby-management/src/test/resources/asw/feature-active-standby-management.properties
index 9b01736c..23a1f6db 100644
--- a/feature-active-standby-management/src/test/resources/asw/feature-active-standby-management.properties
+++ b/feature-active-standby-management/src/test/resources/asw/feature-active-standby-management.properties
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# feature-active-standby-management
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
###
# DB properties
+eclipselink.target-database=Auto
javax.persistence.jdbc.driver = org.h2.Driver
javax.persistence.jdbc.url = jdbc:h2:mem:asw_activestandbymanagement
javax.persistence.jdbc.user = sa
@@ -36,4 +37,4 @@ pdp.updateInterval=1000
# Need long timeout, because testTransaction is only run every 1 seconds.
pdp.timeout=3000
#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=1000 \ No newline at end of file
+pdp.initialWait=1000
diff --git a/feature-active-standby-management/src/test/resources/asw/feature-state-management.properties b/feature-active-standby-management/src/test/resources/asw/feature-state-management.properties
index a5403c9f..e03ebd2b 100644
--- a/feature-active-standby-management/src/test/resources/asw/feature-state-management.properties
+++ b/feature-active-standby-management/src/test/resources/asw/feature-state-management.properties
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# feature-active-standby-management
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
###
# DB properties
+eclipselink.target-database=Auto
javax.persistence.jdbc.driver = org.h2.Driver
javax.persistence.jdbc.url = jdbc:h2:mem:asw_statemanagement
javax.persistence.jdbc.user = sa
diff --git a/feature-active-standby-management/src/test/resources/feature-active-standby-management.properties b/feature-active-standby-management/src/test/resources/feature-active-standby-management.properties
index 9e481b59..5a1f9607 100644
--- a/feature-active-standby-management/src/test/resources/feature-active-standby-management.properties
+++ b/feature-active-standby-management/src/test/resources/feature-active-standby-management.properties
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# feature-active-standby-management
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
###
# DB properties
+eclipselink.target-database=Auto
javax.persistence.jdbc.driver = org.h2.Driver
javax.persistence.jdbc.url = jdbc:h2:mem:activestandbymanagement
javax.persistence.jdbc.user = sa
@@ -35,4 +36,4 @@ pdp.updateInterval=1000
# Need long timeout, because testTransaction is only run every 10 seconds.
pdp.timeout=3000
#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=1000 \ No newline at end of file
+pdp.initialWait=1000
diff --git a/feature-active-standby-management/src/test/resources/feature-state-management.properties b/feature-active-standby-management/src/test/resources/feature-state-management.properties
index d6843919..6e4f61f3 100644
--- a/feature-active-standby-management/src/test/resources/feature-state-management.properties
+++ b/feature-active-standby-management/src/test/resources/feature-state-management.properties
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# feature-active-standby-management
# ================================================================================
-# Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2019, 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
###
# DB properties
+eclipselink.target-database=Auto
javax.persistence.jdbc.driver = org.h2.Driver
javax.persistence.jdbc.url = jdbc:h2:mem:statemanagement
javax.persistence.jdbc.user = sa