diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-02-09 11:01:43 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2021-02-09 15:45:13 -0500 |
| commit | 6127b4d50fccaa2e59f9e40910861260eb695c15 (patch) | |
| tree | 0bd2ee574316e82db5538332bb7bd87f4b479a10 /feature-distributed-locking/src/main | |
| parent | 208be1c545895cf61bc38fbc7bc5e9e45d085016 (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-distributed-locking/src/main')
2 files changed, 8 insertions, 6 deletions
diff --git a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties index 9acea3c0..2b1e06f7 100644 --- a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties +++ b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # feature-distributed-locking # ================================================================================ -# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-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 @@ ### #Database properties +eclipselink.target-database=MySQL javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver javax.persistence.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/pooling javax.persistence.jdbc.user=${env:SQL_USER} diff --git a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockProperties.java b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockProperties.java index fff19447..3093ad49 100644 --- a/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockProperties.java +++ b/feature-distributed-locking/src/main/java/org/onap/policy/distributed/locking/DistributedLockProperties.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * feature-distributed-locking * ================================================================================ - * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-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. @@ -23,6 +23,7 @@ package org.onap.policy.distributed.locking; import java.util.Properties; import lombok.Getter; import lombok.Setter; +import org.eclipse.persistence.config.PersistenceUnitProperties; import org.onap.policy.common.utils.properties.BeanConfigurator; import org.onap.policy.common.utils.properties.Property; import org.onap.policy.common.utils.properties.exception.PropertyException; @@ -33,10 +34,10 @@ import org.onap.policy.common.utils.properties.exception.PropertyException; public class DistributedLockProperties { public static final String PREFIX = "distributed.locking."; - public static final String DB_DRIVER = "javax.persistence.jdbc.driver"; - public static final String DB_URL = "javax.persistence.jdbc.url"; - public static final String DB_USER = "javax.persistence.jdbc.user"; - public static final String DB_PASS = "javax.persistence.jdbc.password"; + public static final String DB_DRIVER = PersistenceUnitProperties.JDBC_DRIVER; + public static final String DB_URL = PersistenceUnitProperties.JDBC_URL; + public static final String DB_USER = PersistenceUnitProperties.JDBC_USER; + public static final String DB_PASS = PersistenceUnitProperties.JDBC_PASSWORD; public static final String EXPIRE_CHECK_SEC = PREFIX + "expire.check.seconds"; public static final String RETRY_SEC = PREFIX + "retry.seconds"; public static final String MAX_RETRIES = PREFIX + "max.retries"; |