Merge from master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c7e81931 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c7e81931 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c7e81931 Branch: refs/heads/2_0_X Commit: c7e819311b287f47ed90852871dce6f01cee57f8 Parents: 2b7dd5d 6975441 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Feb 2 14:55:24 2015 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Feb 2 14:55:24 2015 +0100 ---------------------------------------------------------------------- CHANGES | 23 +++ NOTICE | 2 +- build-tools/NOTICE | 8 +- console/NOTICE | 12 +- core/NOTICE | 12 +- core/pom.xml | 38 ++++ .../main/resources/quartz/tables_mariadb.sql | 206 +++++++++++++++++++ .../core/rest/ConfigurationTestITCase.java | 8 +- .../resources/mariadb/persistence.properties | 28 +++ pom.xml | 5 +- src/site/xdoc/building.xml | 5 + src/site/xdoc/downloads.xml | 88 ++++---- standalone/NOTICE | 14 +- 13 files changed, 375 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c7e81931/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c7e81931/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 0ed97d7,1ebeb19..d8d0712 --- a/pom.xml +++ b/pom.xml @@@ -1434,7 -1434,7 +1434,8 @@@ under the License <exclude>**/.*</exclude> <exclude>**/deb/control/conffiles</exclude> <exclude>**/deb/control/control</exclude> + <exclude>**/*.lst</exclude> + <exclude>**/syncope620/**</exclude> </excludes> </configuration> <executions>
