Repository: oozie Updated Branches: refs/heads/master 8343eccf8 -> 5b3766809
OOZIE-2608 Comma in oozie.service.JPAService.jdbc.password value results in authentication error (gezapeti via asasvari) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5b376680 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5b376680 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5b376680 Branch: refs/heads/master Commit: 5b3766809a48700d6044f3e28706e5da77ae30c1 Parents: 8343ecc Author: Attila Sasvari <asasv...@cloudera.com> Authored: Thu Aug 10 12:10:30 2017 +0200 Committer: Attila Sasvari <asasv...@cloudera.com> Committed: Thu Aug 10 12:10:30 2017 +0200 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/service/JPAService.java | 8 +++++--- release-log.txt | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5b376680/core/src/main/java/org/apache/oozie/service/JPAService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/JPAService.java b/core/src/main/java/org/apache/oozie/service/JPAService.java index 415dc96..cefcb43 100644 --- a/core/src/main/java/org/apache/oozie/service/JPAService.java +++ b/core/src/main/java/org/apache/oozie/service/JPAService.java @@ -193,8 +193,9 @@ public class JPAService implements Service, Instrumentable { LOG.info("A jdbc replication url is provided. Url: [{0}]", url); } - String connProps = "DriverClassName={0},Url={1},Username={2},Password={3},MaxActive={4}"; - connProps = MessageFormat.format(connProps, driver, url, user, password, maxConn); + + String connProps = "DriverClassName={0},Url={1},MaxActive={2}"; + connProps = MessageFormat.format(connProps, driver, url, maxConn); final Properties props = new Properties(); if (autoSchemaCreation) { connProps += ",TestOnBorrow=false,TestOnReturn=false,TestWhileIdle=false"; @@ -216,7 +217,8 @@ public class JPAService implements Service, Instrumentable { connProps += "," + connPropsConfig; } props.setProperty("openjpa.ConnectionProperties", connProps); - + props.setProperty("openjpa.ConnectionPassword", password); + props.setProperty("openjpa.ConnectionUserName", user); props.setProperty("openjpa.ConnectionDriverName", dataSource); if (!StringUtils.isEmpty(brokerImplConfig)) { props.setProperty("openjpa.BrokerImpl", brokerImplConfig); http://git-wip-us.apache.org/repos/asf/oozie/blob/5b376680/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 3b6d78c..4113b2d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2608 Comma in oozie.service.JPAService.jdbc.password value results in authentication error (gezapeti via asasvari) OOZIE-3009 amend Number of Oozie tests executed dropped after OOZIE-2854 (andras.piros via gezapeti) OOZIE-2999 minioozie can't compile (Artem Ervits via gezapeti) OOZIE-2978 Remove code that handles Pig versions before 0.8 (asasvari)
