Repository: syncope Updated Branches: refs/heads/master 496a02a51 -> 66a119333
[SYNCOPE-156] Updating relevant LICENSE / NOTICE files Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/66a11933 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/66a11933 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/66a11933 Branch: refs/heads/master Commit: 66a119333ebbc3f3f35267377f05504efa5c17dd Parents: 496a02a Author: Francesco Chicchiriccò <[email protected]> Authored: Tue May 5 11:59:30 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue May 5 11:59:30 2015 +0200 ---------------------------------------------------------------------- deb/console/LICENSE | 25 +++++++++++++++++++++++++ deb/console/NOTICE | 38 ++++++++++++++++++++++++++++++++++---- standalone/LICENSE | 27 ++++++++++++++++++++++++++- standalone/NOTICE | 35 ++++++++++++++++++++++++++++++++--- 4 files changed, 117 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/66a11933/deb/console/LICENSE ---------------------------------------------------------------------- diff --git a/deb/console/LICENSE b/deb/console/LICENSE index b0d70b0..384add2 100644 --- a/deb/console/LICENSE +++ b/deb/console/LICENSE @@ -684,6 +684,31 @@ This is licensed under the terms of the MIT license, see above. == +For Admin LTE (https://github.com/almasaeed2010/AdminLTE/): +This is licensed under the terms of the MIT license, see above. + +== + +For Bootstrap (http://getbootstrap.com/): +This is licensed under the terms of the MIT license, see above. + +== + +For Bootstrap-select (https://silviomoreto.github.io/bootstrap-select/): +This is licensed under the terms of the MIT license, see above. + +== + +For Font Awesome (https://fortawesome.github.io/Font-Awesome/icons/): +This is licensed under the terms of the MIT license, see above. + +== + +For ionicons (http://ionicons.com/): +This is licensed under the terms of the MIT license, see above. + +== + For Simple Logging Facade for Java - SLF4J (http://www.slf4j.org/): This is licensed under the MIT license, see above. http://git-wip-us.apache.org/repos/asf/syncope/blob/66a11933/deb/console/NOTICE ---------------------------------------------------------------------- diff --git a/deb/console/NOTICE b/deb/console/NOTICE index 356cdb9..7b559f7 100644 --- a/deb/console/NOTICE +++ b/deb/console/NOTICE @@ -36,11 +36,13 @@ All rights reserved. == -This product includes software developed by the Jackson project (http://wiki.fasterxml.com/JacksonHome). +This product includes software developed by the Jackson project. +http://wiki.fasterxml.com/JacksonHome == -This product includes software developed by the Joda Time project (http://www.joda.org/joda-time/). +This product includes software developed by the Joda Time project. +http://www.joda.org/joda-time == @@ -56,12 +58,40 @@ https://jquery.org/ == -This products includes software developed by SLF4J (http://www.slf4j.org) +This product includes software developed by Almsaeed Studio. +Copyright 2014-2015 Almsaeed Studio. All rights reserved. +https://almsaeedstudio.com/ + +== + +This products includes software developed by Twitter Bootstrap. +http://twitter.github.com/bootstrap/ + +== + +This products includes software developed by bootstrap-select. +Copyright (C) 2013-2015 bootstrap-select. +https://silviomoreto.github.io/bootstrap-select/ + +== + +This products includes software developed by Font Awesome. +https://fortawesome.github.io/Font-Awesome/icons/ + +== + +This products includes software developed by ionicons. +http://ionicons.com/ + +== + +This products includes software developed by SLF4J. Copyright (c) 2004-2013 QOS.ch. +http://www.slf4j.org == -This product includes software developed by SpringSource +This product includes software developed by SpringSource. Copyright (c) 2004-2015 SpringSource All rights reserved. http://git-wip-us.apache.org/repos/asf/syncope/blob/66a11933/standalone/LICENSE ---------------------------------------------------------------------- diff --git a/standalone/LICENSE b/standalone/LICENSE index d9d9568..2e16fbf 100644 --- a/standalone/LICENSE +++ b/standalone/LICENSE @@ -826,6 +826,31 @@ This is licensed under the terms of the MIT license, see above. == +For Admin LTE (https://github.com/almasaeed2010/AdminLTE/): +This is licensed under the terms of the MIT license, see above. + +== + +For Bootstrap (http://getbootstrap.com/): +This is licensed under the terms of the MIT license, see above. + +== + +For Bootstrap-select (https://silviomoreto.github.io/bootstrap-select/): +This is licensed under the terms of the MIT license, see above. + +== + +For Font Awesome (https://fortawesome.github.io/Font-Awesome/icons/): +This is licensed under the terms of the MIT license, see above. + +== + +For ionicons (http://ionicons.com/): +This is licensed under the terms of the MIT license, see above. + +== + For jstl (http://www.oracle.com/) This is licensed under CDDL 1.0, see above. @@ -1084,4 +1109,4 @@ This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. \ No newline at end of file +any resulting litigation. http://git-wip-us.apache.org/repos/asf/syncope/blob/66a11933/standalone/NOTICE ---------------------------------------------------------------------- diff --git a/standalone/NOTICE b/standalone/NOTICE index c66645f..4743fbd 100644 --- a/standalone/NOTICE +++ b/standalone/NOTICE @@ -82,11 +82,13 @@ Copyright (c) 2006, Ivan Sagalaev == -This product includes software developed by the Jackson project (http://wiki.fasterxml.com/JacksonHome). +This product includes software developed by the Jackson project. +http://wiki.fasterxml.com/JacksonHome == -This product includes software developed by the Joda Time project (http://www.joda.org/joda-time/). +This product includes software developed by the Joda Time project. +http://www.joda.org/joda-time == @@ -102,6 +104,33 @@ https://jquery.org/ == +This product includes software developed by Almsaeed Studio. +Copyright 2014-2015 Almsaeed Studio. All rights reserved. +https://almsaeedstudio.com/ + +== + +This products includes software developed by Twitter Bootstrap. +http://twitter.github.com/bootstrap/ + +== + +This products includes software developed by bootstrap-select. +Copyright (C) 2013-2015 bootstrap-select. +https://silviomoreto.github.io/bootstrap-select/ + +== + +This products includes software developed by Font Awesome. +https://fortawesome.github.io/Font-Awesome/icons/ + +== + +This products includes software developed by ionicons. +http://ionicons.com/ + +== + This product includes software developed by the MyBatis project. == @@ -122,7 +151,7 @@ Copyright (c) 2004-2013 QOS.ch. == -This product includes software developed by SpringSource +This product includes software developed by SpringSource. Copyright (c) 2004-2015 SpringSource All rights reserved.
