Cleaned up licensing matters (also considering a binary release with …

…dependencies included, though that's unlikely to ever happen).

LICENSE

@@ -204,11 +204,7 @@
 ==============================================================================
 
 The "icomoon" font files (icomoon.eot, icomoon.svg, icomoon.ttf, and
-icomoon.woff) under the "documentation" directory of the FreeMarker
-distribution contains a selection from the fonts listed below. Note that
-the fonts are only used as part of the included documentation, and
-aren't used for the operation of FreeMarker, nor are they included in
-the binary, freemarker.jar. The fonts are:
+icomoon.woff) contains a selection from these fonts:
 
 * Entypo pictograms, version 2.0, by Daniel Bruce (www.entypo.com).
   Each included pictogram is either licensed under Creative
@@ -226,5 +222,12 @@ the binary, freemarker.jar. The fonts are:
 
 ==============================================================================
 
-See the license of the src/main/org/freemarker/docgen/schema/docbook.rng file
-in the following file: LICENSE-DOCBOOK-RNG
+Binary distributions of this product might bundles ISO-RELAX, which
+is available under the MIT license. See LICENSE-ISO-RELAX for more details.
+
+==============================================================================
+
+Binary distributions of this product might bundles Thai Opensource Jing, which
+is available under the 3-Clause BSD license. See LICENSE-JING for more details.
+
+==============================================================================

LICENSE-ISO-RELAX

@@ -0,0 +1,7 @@
+Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
+
+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.

LICENSE-JING

@@ -0,0 +1,31 @@
+Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
+All rights reserved.
+
+Redistribution and use 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 the Thai Open Source Software Center Ltd nor
+    the names of its contributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+
+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 REGENTS 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.

NOTICE

@@ -28,12 +28,3 @@ Creative Common Attribution 4.0 International License (CC-BY 4.0)
 (https://creativecommons.org/licenses/by/4.0/).
 
 =========================================================================
-
-This product includes the DocBook V5.0 RELAX NG schema, Copyright
-1992-2008 HaL Computer Systems, Inc., O'Reilly & Associates, Inc.,
-ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, Sun
-Microsystems, Inc., and the Organization for the Advancement of
-Structured Information Standards (OASIS). See license details in the
-LICENSE-DOCBOOK-RNG file.
-
-=========================================================================

freemarker-docgen-core/pom.xml

@@ -48,6 +48,47 @@
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- Apparently, it's not needed for what we do, so we avoid license complications. -->
+                    <groupId>net.sf.saxon</groupId>
+                    <artifactId>saxon</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.docbook</groupId>
+            <artifactId>docbook-schemas</artifactId>
+            <version>5.1-1</version>
+            <!-- We just need the docbook.rng resource from this artifact, so we exclude all dependencies: -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.saxon</groupId>
+                    <artifactId>Saxon-HE</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.xmlresolver</groupId>
+                    <artifactId>xmlresolver</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

freemarker-docgen-core/src/main/java/org/freemarker/docgen/core/RelaxNGValidator.java

@@ -104,7 +104,7 @@ public static Document load(File f, DocgenValidationOptions validationOps)
             schema = scemaReader.createSchema(
                     ValidationDriver.uriOrFileInputSource(
                             RelaxNGValidator.class.getResource(
-                                "schema/docbook.rng").toString()),
+                                "/schema/5.0/rng/docbook.rng").toString()),
                     schemaProps.toPropertyMap());
         } catch (IncorrectSchemaException e) {
             throw new BugException(