Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/a555664b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/a555664b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/a555664b Branch: refs/heads/griffin-0.2.0-incubating-spark1 Commit: a555664b74f755f0a5b1198384b6e654e01737e4 Parents: a6f1369 359bfe2 Author: Lionel Liu <[email protected]> Authored: Thu May 10 18:57:24 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu May 10 18:57:24 2018 +0800 ---------------------------------------------------------------------- .../service/hibernate_eclipselink_switch.md | 5 +- griffin-doc/service/mysql_postgresql_switch.md | 52 +++-- service/hibernate_mysql_pom.xml | 223 +++++++++++++++++++ .../griffin/core/util/PropertiesUtil.java | 12 +- .../src/main/resources/application.properties | 6 +- service/src/main/resources/quartz.properties | 2 + .../core/config/PropertiesConfigTest.java | 10 - .../core/measure/MeasureOrgServiceImplTest.java | 11 +- .../griffin/core/util/PropertiesUtilTest.java | 8 - 9 files changed, 270 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
