This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a commit to branch ROL-2138 in repository https://gitbox.apache.org/repos/asf/roller.git
commit 596a84fd7b555806769e6a6e6a00266b7b4c8988 Author: Aditya Sharma <iamadityashar...@gmail.com> AuthorDate: Wed Jun 12 15:05:29 2019 +0530 Fixed: NOTICE file does not have standard content (ROL-2138) 1. Rearranged the content as per the standard for Notice and License files 2. Removed credits from Notice file --- LICENSE.txt | 57 +++++++++++++++++++++++++++------------------------------ NOTICE.txt | 28 +++++----------------------- 2 files changed, 32 insertions(+), 53 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 7d51cb3..a433533 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,33 +1,3 @@ -LICENSE.txt - Roller licensing terms - -Roller is licensed under the Apache License Version 2.0, see below. - -Roller also uses the JDOM XML parser library, licensed under the -terms of the JDOM license (an Apache-like license listed at end of this file). - -Roller includes the YUI (BSD license) and JQuery (MIT) front end libraries: - -YUI 3.17.2 (build 9c3c78e) -Copyright 2014 Yahoo! Inc. All rights reserved. -Licensed under the BSD License. -http://yuilibrary.com/license/ - -jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license - -Roller contains some snippets of code from the Blojsom and Pebble -blog servers, which are both licensed under the terms of the BSD license -(http://www.opensource.org/licenses/bsd-license.php). - -------------------------------------------------------------------------------- - -Some themes packaged with Roller use Font Awesome by Dave Gandy -(http://fontawesome.io), whose licensing is subject to the SIL OFL 1.1: -http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL - -Some themes packaged with Roller use the MIT-licensed Bootstrap: -https://github.com/twbs/bootstrap/blob/master/LICENSE - -------------------------------------------------------------------------------- Apache License Version 2.0, January 2004 @@ -233,6 +203,33 @@ https://github.com/twbs/bootstrap/blob/master/LICENSE ------------------------------------------------------------------------------- +Roller also uses the JDOM XML parser library, licensed under the +terms of the JDOM license (an Apache-like license listed at end of this file). + +Roller includes the YUI (BSD license) and JQuery (MIT) front end libraries: + +YUI 3.17.2 (build 9c3c78e) +Copyright 2014 Yahoo! Inc. All rights reserved. +Licensed under the BSD License. +http://yuilibrary.com/license/ + +jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license + +Roller contains some snippets of code from the Blojsom and Pebble +blog servers, which are both licensed under the terms of the BSD license +(http://www.opensource.org/licenses/bsd-license.php). + +------------------------------------------------------------------------------- + +Some themes packaged with Roller use Font Awesome by Dave Gandy +(http://fontawesome.io), whose licensing is subject to the SIL OFL 1.1: +http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL + +Some themes packaged with Roller use the MIT-licensed Bootstrap: +https://github.com/twbs/bootstrap/blob/master/LICENSE + +------------------------------------------------------------------------------- + The JDOM license /*-- diff --git a/NOTICE.txt b/NOTICE.txt index 490d7b4..cd63dc0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,9 @@ -NOTICE.txt - Roller copyright notices and credits +Apache Roller +Copyright 2001-2019 The Apache Software Foundation +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). +------------------------------------------------------------------------------- COPYRIGHT NOTICES @@ -35,25 +39,3 @@ OTHER NOTICES COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. https://glassfish.java.net/public/CDDL+GPL_1_1.html - -CREDITS - -Roller committers (in chronological order): - -David M Johnson -Lance Lanvandowska (emeritus) -Matt Raible -Mindaguas Idzelis (emeritus) -Jaap Van Der Molen (emeritus) -Anil Gangolli -Henri Yandell (emeritus) -Allen Gilliland (emeritus) -Elias Torres (emeritus) -Matt Schmidt (emeritus) -Jeff Blattman (emeritus) -Craig Russell -Greg Huber -Ganesh Mathrerootham (emeritus) -Shelan Perera (emeritus) -Glen Mazza (emeritus) -Gaurav Saini