Merge pull request #29 from apache/ROL-2138

Fixed: NOTICE file does not have standard content (ROL-2138)
diff --git a/LICENSE.txt b/LICENSE.txt
index 7d51cb3..f7d3e4d 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
@@ -232,21 +202,19 @@
    limitations under the License.
 
 -------------------------------------------------------------------------------
-
-The JDOM license
-
-/*--
+This product bundles JDOM XML parser library, which is available under a
+"JDOM" license. For details, see http://www.jdom.org/.
 
  Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
  All rights reserved.
- 
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
- 
+
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions, and the following disclaimer.
- 
+
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions, and the disclaimer that follows
     these conditions in the documentation and/or other materials
@@ -255,11 +223,11 @@
  3. The name "JDOM" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact <request_AT_jdom_DOT_org>.
- 
+
  4. Products derived from this software may not be called "JDOM", nor
     may "JDOM" appear in their name, without prior written permission
     from the JDOM Project Management <request_AT_jdom_DOT_org>.
- 
+
  In addition, we request (but do not require) that you include in the
  end-user documentation provided with the redistribution and/or in the
  software itself an acknowledgement equivalent to the following:
@@ -287,6 +255,115 @@
  Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
  on the JDOM Project, please see <http://www.jdom.org/>.
 
- */
 
+-------------------------------------------------------------------------------
+This product bundles YUI, which is available under a "BSD" license.
+For details, see
+app/src/main/webapp/roller-ui/yui3
+http://yuilibrary.com/license/
 
+Software License Agreement (BSD License)
+========================================
+
+Copyright (c) 2013, Yahoo! Inc. All rights reserved.
+----------------------------------------------------
+
+Redistribution and use of this software in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be
+    used to endorse or promote products derived from this software without
+    specific prior written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+This product bundles jQuery and jQuery plugins, which are available under a "MIT" license.
+For details, see
+roller-ui/scripts/jquery-2.1.1.min.js.
+roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
+
+-------------------------------------------------------------------------------
+
+This product bundles 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).
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which 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
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which use the MIT-licensed Bootstrap:
+For details, see
+themes/gaurav/js/bootstrap.js
+https://github.com/twbs/bootstrap/blob/master/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2011-2019 Twitter, Inc.
+Copyright (c) 2011-2019 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-------------------------------------------------------------------------------
+This product bundles Summernote WYSIWYG editor, which is available under a
+"MIT" license. For details, see
+/webjars/summernote/0.8.11/dist/summernote.min.js
+https://github.com/summernote/summernote/blob/develop/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-------------------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9ef79e3..0dd038d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,54 +1,27 @@
-NOTICE.txt - Roller copyright notices and credits
+Apache Roller
+Copyright 2001-2019 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
-COPYRIGHT NOTICES
+The product includes snippets of code from the Blojsom blog server
+Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
 
-This product includes:
+The product includes snippets of code from the Pebble blog server
+Copyright 2003 Simon Brown, All rights reserved.
 
-* Snippets of code from the Blojsom blog server
-    Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
+The product includes snippets of code written by Sun Microsystems, Inc.
+Copyright 2009 Sun Microsystems, Inc.
 
-* Snippets of code from the Pebble blog server
-    Copyright 2003 Simon Brown, All rights reserved.
+The product includes snippets of code written by Dave Johnson for RSS and Atom in Action
+Copyright 2005 David M Johnson (For RSS and Atom In Action)
 
-* Code written by Sun Microsystems, Inc. 
-    Copyright 2009 Sun Microsystems, Inc.
+The product includes snippets of code from Spring Mobile
+Copyright (c) 2010-2014 Pivotal, Inc. All Rights Reserved.
 
-* Code written by Dave Johnson for RSS and Atom in Action
-    Copyright 2005 David M Johnson (For RSS and Atom In Action)
+The product includes icons by Mark James (http://www.famfamfam.com/lab/icons)
 
-* The Summernote WYSIWYG editor, MIT license
-
-* Snippets of code from Spring Mobile
-    Copyright (c) 2010-2014 Pivotal, Inc. All Rights Reserved. 
-
-OTHER NOTICES
-
-* Roller includes icons by Mark James (http://www.famfamfam.com/lab/icons)
-
-* Roller uses JavaMail
-     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
+The product includes snippets of code from the JavaMail
+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
diff --git a/binary-includes/LICENSE.txt b/binary-includes/LICENSE.txt
new file mode 100644
index 0000000..558b7e3
--- /dev/null
+++ b/binary-includes/LICENSE.txt
@@ -0,0 +1,449 @@
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-------------------------------------------------------------------------------
+This product bundles JDOM XML parser library, which is available under a
+"JDOM" license. For details, see http://www.jdom.org/.
+
+ Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission. For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+
+-------------------------------------------------------------------------------
+This product bundles YUI, which is available under a "BSD" license.
+For details, see
+app/src/main/webapp/roller-ui/yui3
+http://yuilibrary.com/license/
+
+Software License Agreement (BSD License)
+========================================
+
+Copyright (c) 2013, Yahoo! Inc. All rights reserved.
+----------------------------------------------------
+
+Redistribution and use of this software in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be
+    used to endorse or promote products derived from this software without
+    specific prior written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+This product bundles jQuery and jQuery plugins, which are available under a "MIT" license.
+For details, see
+roller-ui/scripts/jquery-2.1.1.min.js.
+roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
+
+-------------------------------------------------------------------------------
+
+This product bundles 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).
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which 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
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which use the MIT-licensed Bootstrap:
+For details, see
+themes/gaurav/js/bootstrap.js
+https://github.com/twbs/bootstrap/blob/master/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2011-2019 Twitter, Inc.
+Copyright (c) 2011-2019 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-------------------------------------------------------------------------------
+This product bundles Summernote WYSIWYG editor, which is available under a
+"MIT" license. For details, see
+/webjars/summernote/0.8.11/dist/summernote.min.js
+https://github.com/summernote/summernote/blob/develop/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+Binary distribution specific license
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+
+This product bundles Spring Framework 4.1.4.RELEASE, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/spring-projects/spring-framework
+
+-------------------------------------------------------------------------------
+
+This product bundles Google Guice 4.2.2, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/google/guice/blob/master/COPYING
+
+-------------------------------------------------------------------------------
+
+This product bundles SLF4J 1.7.26, which is available under a
+"MIT" license. For details, see
+https://www.slf4j.org/license.html
+
+-------------------------------------------------------------------------------
+
+This product bundles struts2-bootstrap 2.5.2, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/struts-community-plugins/struts2-bootstrap/blob/release/2.5.x/LICENSE
+
+-------------------------------------------------------------------------------
+
+This product bundles romtools 1.12.0, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/rometools/rome/blob/master/LICENSE
+
+-------------------------------------------------------------------------------
+
+This product bundles webjars-servlet-2.x 1.5, which is available under a
+"MIT" license. For details, see
+https://github.com/webjars/webjars-servlet-2.x/blob/master/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Angel Ruiz Calvo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+This product bundles oauth-provider 20100527, which is available under a
+"Apache 2.0" license. For details, see
+https://mvnrepository.com/artifact/net.oauth.core/oauth-provider
+
+-------------------------------------------------------------------------------
+
+This product bundles Apache Ant 1.10.5 , which is available under a
+"Apache 2.0" license. For details, see
+https://ant.apache.org/license.html
+-------------------------------------------------------------------------------
+
+This product bundles Apache Derby 10.11.1.1 , which is available under a
+"Apache 2.0" license. For details, see
+https://db.apache.org/derby/license.html
+
+-------------------------------------------------------------------------------
diff --git a/binary-includes/NOTICE.txt b/binary-includes/NOTICE.txt
new file mode 100644
index 0000000..0dd038d
--- /dev/null
+++ b/binary-includes/NOTICE.txt
@@ -0,0 +1,27 @@
+Apache Roller
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The product includes snippets of code from the Blojsom blog server
+Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
+
+The product includes snippets of code from the Pebble blog server
+Copyright 2003 Simon Brown, All rights reserved.
+
+The product includes snippets of code written by Sun Microsystems, Inc.
+Copyright 2009 Sun Microsystems, Inc.
+
+The product includes snippets of code written by Dave Johnson for RSS and Atom in Action
+Copyright 2005 David M Johnson (For RSS and Atom In Action)
+
+The product includes snippets of code from Spring Mobile
+Copyright (c) 2010-2014 Pivotal, Inc. All Rights Reserved.
+
+The product includes icons by Mark James (http://www.famfamfam.com/lab/icons)
+
+The product includes snippets of code from the JavaMail
+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