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/b6caae1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b6caae1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b6caae1b Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: b6caae1b72a0880b5c6a0e5b98a1270008ac68b1 Parents: f11c07a 5a92b65 Author: Lionel Liu <[email protected]> Authored: Wed Mar 28 19:10:47 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Mar 28 19:10:47 2018 +0800 ---------------------------------------------------------------------- KEYS | 58 +++ LICENSE | 356 +++++++++------- NOTICE | 4 +- licenses/BSD-2-Clause | 22 + licenses/BSD-3-Clause | 26 ++ licenses/CDDL-1.0 | 363 ++++++++++++++++ licenses/CDDL-1.1 | 362 ++++++++++++++++ licenses/EPL | 86 ++++ licenses/JSON | 26 ++ licenses/MIT | 19 + licenses/PostgreSQL | 12 + licenses/SIL-OFL-1.1 | 84 ++++ licenses/WTFPL | 13 + measure/src/main/resources/META-INF/LICENSE | 256 ++++++++++++ pom.xml | 117 +++--- .../core/config/EclipseLinkJpaConfig.java | 19 + service/src/main/resources/Init_quartz.sql | 190 --------- .../src/main/resources/Init_quartz_derby.sql | 343 +++++++-------- .../main/resources/Init_quartz_derby.sql.bak | 187 +++++++++ .../src/main/resources/Init_quartz_mysql.sql | 190 +++++++++ .../src/main/resources/Init_quartz_postgres.sql | 203 +++++++++ service/src/main/resources/META-INF/LICENSE | 414 +++++++++++++++++++ .../src/main/resources/init_quartz_postgres.sql | 203 --------- .../config/EclipseLinkJpaConfigForTest.java | 19 + ui/LICENSE | 310 ++++++++++++++ 25 files changed, 3104 insertions(+), 778 deletions(-) ----------------------------------------------------------------------
