From f1aeb78020d09b490e4e15dae697a7a8e148c330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20Hu=C3=9F?= <roland@ro14nd.de>
Date: Mon, 30 May 2016 21:42:50 +0200
Subject: [PATCH 01/18] Fixed wrong delegation for ns()

---
 src/main/java/com/jamesmurty/utils/XMLBuilder2.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
index 013ad7c..7d6e5d7 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
@@ -526,7 +526,7 @@ public XMLBuilder2 namespace(String prefix, String namespaceURI) {
 
     @Override
     public XMLBuilder2 ns(String prefix, String namespaceURI) {
-        return attribute(prefix, namespaceURI);
+        return namespace(prefix, namespaceURI);
     }
 
     @Override

From 5630c494f922a3007d8b8ec5b9bd923fe571a731 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 22:36:42 +1000
Subject: [PATCH 02/18] Permit disabling of namespace awareness

Permit users to disable namespace-awareness in the underlying
`DocumentBuilderFactory` when constructing the builder with extended
`create()` and `parse()` methods added in this commit.

Namespace awareness is enabled by default unless you use the more
explicit versions of these methods that take additional
`enableExternalEntities` and `isNamespaceAware` parameters.
---
 CHANGES.md                                    |  8 +++
 .../com/jamesmurty/utils/BaseXMLBuilder.java  | 20 +++++--
 .../java/com/jamesmurty/utils/XMLBuilder.java | 55 +++++++++++++-----
 .../com/jamesmurty/utils/XMLBuilder2.java     | 56 +++++++++++++------
 .../jamesmurty/utils/BaseXMLBuilderTests.java | 47 ++++++++++++++--
 5 files changed, 146 insertions(+), 40 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5154782..12b586b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,14 @@ Fixes:
   are now only parsed if this feature is explicitly enabled by passing a boolean
   flag value to the #create and #parse methods.  
   WARNING: This will break code that expects external entities to be parsed.
+  
+Enhancements:
+
+* Permit users to disable namespace-awareness in the underlying
+  DocumentBuilderFactory when constructing the builder with extended `create()`
+  and `parse()` methods. Namespace awareness is enabled by default unless you
+  use the more explicit versions of these methods that take additional
+  `enableExternalEntities` and `isNamespaceAware` parameters. 
 
 Version 1.1 - 22 July 2014
 --------------------------
diff --git a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
index 90e26d5..c9466f7 100644
--- a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2017 James Murty (www.jamesmurty.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,8 +74,6 @@ public abstract class BaseXMLBuilder {
      */
     private Node xmlNode = null;
 
-    private static boolean isNamespaceAware = true;
-
     /**
      * If true, the builder will raise an {@link XMLBuilderRuntimeException}
      * if external general and parameter entities cannot be explicitly enabled
@@ -199,6 +197,11 @@ protected static void enableOrDisableExternalEntityParsing(
      * the name of the document's root element.
      * @param namespaceURI
      * default namespace URI for document, ignored if null or empty.
+     * @param enableExternalEntities
+     * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * an XML Document.
      *
@@ -206,7 +209,8 @@ protected static void enableOrDisableExternalEntityParsing(
      * @throws ParserConfigurationException
      */
     protected static Document createDocumentImpl(
-        String name, String namespaceURI, boolean enableExternalEntities)
+        String name, String namespaceURI, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, FactoryConfigurationError
     {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -229,6 +233,11 @@ protected static Document createDocumentImpl(
      *
      * @param inputSource
      * an XML document input source that will be parsed into a DOM.
+     * @param enableExternalEntities
+     * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws ParserConfigurationException
@@ -239,7 +248,8 @@ protected static Document createDocumentImpl(
      * @throws SAXException
      */
     protected static Document parseDocumentImpl(
-        InputSource inputSource, boolean enableExternalEntities)
+        InputSource inputSource, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, SAXException, IOException
     {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder.java b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
index 5663b44..77c50b0 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2017 James Murty (www.jamesmurty.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,6 +101,9 @@ protected XMLBuilder(Node myNode, Node parentNode) {
      * default namespace URI for document, ignored if null or empty.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
@@ -108,11 +111,12 @@ protected XMLBuilder(Node myNode, Node parentNode) {
      * @throws ParserConfigurationException
      */
     public static XMLBuilder create(String name, String namespaceURI,
-        boolean enableExternalEntities)
+        boolean enableExternalEntities, boolean isNamespaceAware)
         throws ParserConfigurationException, FactoryConfigurationError
     {
         return new XMLBuilder(
-            createDocumentImpl(name, namespaceURI, enableExternalEntities));
+            createDocumentImpl(
+                name, namespaceURI, enableExternalEntities, isNamespaceAware));
     }
 
     /**
@@ -124,16 +128,20 @@ public static XMLBuilder create(String name, String namespaceURI,
      * the name of the document's root element.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
      * @throws FactoryConfigurationError
      * @throws ParserConfigurationException
      */
-    public static XMLBuilder create(String name, boolean enableExternalEntities)
+    public static XMLBuilder create(String name, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, FactoryConfigurationError
     {
-        return create(name, null, enableExternalEntities);
+        return create(name, null, enableExternalEntities, isNamespaceAware);
     }
 
     /**
@@ -146,6 +154,7 @@ public static XMLBuilder create(String name, boolean enableExternalEntities)
      * the name of the document's root element.
      * @param namespaceURI
      * default namespace URI for document, ignored if null or empty.
+
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
@@ -155,7 +164,7 @@ public static XMLBuilder create(String name, boolean enableExternalEntities)
     public static XMLBuilder create(String name, String namespaceURI)
         throws ParserConfigurationException, FactoryConfigurationError
     {
-        return create(name, namespaceURI, false);
+        return create(name, namespaceURI, false, true);
     }
 
     /**
@@ -186,6 +195,9 @@ public static XMLBuilder create(String name)
      * an XML document input source that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws ParserConfigurationException
@@ -196,11 +208,13 @@ public static XMLBuilder create(String name)
      * @throws SAXException
      */
     public static XMLBuilder parse(
-        InputSource inputSource, boolean enableExternalEntities)
+        InputSource inputSource, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, SAXException, IOException
     {
         return new XMLBuilder(
-            parseDocumentImpl(inputSource, enableExternalEntities));
+            parseDocumentImpl(
+                inputSource, enableExternalEntities, isNamespaceAware));
     }
 
     /**
@@ -212,6 +226,9 @@ public static XMLBuilder parse(
      * an XML document string that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
@@ -222,12 +239,14 @@ public static XMLBuilder parse(
      * @throws SAXException
      */
     public static XMLBuilder parse(
-        String xmlString, boolean enableExternalEntities)
+        String xmlString, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, SAXException, IOException
     {
         return XMLBuilder.parse(
             new InputSource(new StringReader(xmlString)),
-            enableExternalEntities);
+            enableExternalEntities,
+            isNamespaceAware);
     }
 
     /**
@@ -239,6 +258,9 @@ public static XMLBuilder parse(
      * an XML document file that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
@@ -248,11 +270,14 @@ public static XMLBuilder parse(
      * @throws IOException
      * @throws SAXException
      */
-    public static XMLBuilder parse(File xmlFile, boolean enableExternalEntities)
+    public static XMLBuilder parse(File xmlFile, boolean enableExternalEntities,
+        boolean isNamespaceAware)
         throws ParserConfigurationException, SAXException, IOException
     {
         return XMLBuilder.parse(
-            new InputSource(new FileReader(xmlFile)), enableExternalEntities);
+            new InputSource(new FileReader(xmlFile)),
+            enableExternalEntities,
+            isNamespaceAware);
     }
 
     /**
@@ -274,7 +299,7 @@ public static XMLBuilder parse(File xmlFile, boolean enableExternalEntities)
     public static XMLBuilder parse(InputSource inputSource)
         throws ParserConfigurationException, SAXException, IOException
     {
-        return XMLBuilder.parse(inputSource, false);
+        return XMLBuilder.parse(inputSource, false, true);
     }
 
     /**
@@ -296,7 +321,7 @@ public static XMLBuilder parse(InputSource inputSource)
     public static XMLBuilder parse(String xmlString)
         throws ParserConfigurationException, SAXException, IOException
     {
-        return XMLBuilder.parse(xmlString, false);
+        return XMLBuilder.parse(xmlString, false, true);
     }
 
     /**
@@ -318,7 +343,7 @@ public static XMLBuilder parse(String xmlString)
     public static XMLBuilder parse(File xmlFile)
         throws ParserConfigurationException, SAXException, IOException
     {
-        return XMLBuilder.parse(xmlFile, false);
+        return XMLBuilder.parse(xmlFile, false, true);
     }
 
     @Override
diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
index 013ad7c..fcfb492 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2017 James Murty (www.jamesmurty.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,17 +120,22 @@ private static RuntimeException wrapExceptionAsRuntimeException(Exception e) {
      * default namespace URI for document, ignored if null or empty.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws XMLBuilderRuntimeException
      * to wrap {@link ParserConfigurationException}
      */
     public static XMLBuilder2 create(
-        String name, String namespaceURI, boolean enableExternalEntities)
+        String name, String namespaceURI, boolean enableExternalEntities,
+        boolean isNamespaceAware)
     {
         try {
             return new XMLBuilder2(
-                createDocumentImpl(name, namespaceURI, enableExternalEntities));
+                createDocumentImpl(
+                    name, namespaceURI, enableExternalEntities, isNamespaceAware));
         } catch (ParserConfigurationException e) {
             throw wrapExceptionAsRuntimeException(e);
         }
@@ -145,14 +150,19 @@ public static XMLBuilder2 create(
      * the name of the document's root element.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws XMLBuilderRuntimeException
      * to wrap {@link ParserConfigurationException}
      */
-    public static XMLBuilder2 create(String name, boolean enableExternalEntities)
+    public static XMLBuilder2 create(String name,
+        boolean enableExternalEntities, boolean isNamespaceAware)
     {
-        return XMLBuilder2.create(name, null, enableExternalEntities);
+        return XMLBuilder2.create(
+            name, null, enableExternalEntities, isNamespaceAware);
     }
 
     /**
@@ -172,7 +182,7 @@ public static XMLBuilder2 create(String name, boolean enableExternalEntities)
      */
     public static XMLBuilder2 create(String name, String namespaceURI)
     {
-        return XMLBuilder2.create(name, namespaceURI, false);
+        return XMLBuilder2.create(name, namespaceURI, false, true);
     }
 
     /**
@@ -189,7 +199,7 @@ public static XMLBuilder2 create(String name, String namespaceURI)
      */
     public static XMLBuilder2 create(String name)
     {
-        return XMLBuilder2.create(name, null, false);
+        return XMLBuilder2.create(name, null, false, true);
     }
 
     /**
@@ -201,6 +211,9 @@ public static XMLBuilder2 create(String name)
      * an XML document input source that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws XMLBuilderRuntimeException
@@ -208,11 +221,13 @@ public static XMLBuilder2 create(String name)
      * {@link IOException}
      */
     public static XMLBuilder2 parse(
-        InputSource inputSource, boolean enableExternalEntities)
+        InputSource inputSource, boolean enableExternalEntities,
+        boolean isNamespaceAware)
     {
         try {
             return new XMLBuilder2(
-                parseDocumentImpl(inputSource, enableExternalEntities));
+                parseDocumentImpl(
+                    inputSource, enableExternalEntities, isNamespaceAware));
         } catch (ParserConfigurationException e) {
             throw wrapExceptionAsRuntimeException(e);
         } catch (SAXException e) {
@@ -231,15 +246,19 @@ public static XMLBuilder2 parse(
      * an XML document string that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      */
     public static XMLBuilder2 parse(
-        String xmlString, boolean enableExternalEntities)
+        String xmlString, boolean enableExternalEntities, boolean isNamespaceAware)
     {
         return XMLBuilder2.parse(
             new InputSource(new StringReader(xmlString)),
-            enableExternalEntities);
+            enableExternalEntities,
+            isNamespaceAware);
     }
 
     /**
@@ -251,18 +270,23 @@ public static XMLBuilder2 parse(
      * an XML document file that will be parsed into a DOM.
      * @param enableExternalEntities
      * enable external entities; beware of XML External Entity (XXE) injection.
+     * @param isNamespaceAware
+     * enable or disable namespace awareness in the underlying
+     * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      * @throws XMLBuilderRuntimeException
      * to wrap {@link ParserConfigurationException}, {@link SAXException},
      * {@link IOException}, {@link FileNotFoundException}
      */
-    public static XMLBuilder2 parse(File xmlFile, boolean enableExternalEntities)
+    public static XMLBuilder2 parse(File xmlFile, boolean enableExternalEntities,
+        boolean isNamespaceAware)
     {
         try {
             return XMLBuilder2.parse(
                 new InputSource(new FileReader(xmlFile)),
-                enableExternalEntities);
+                enableExternalEntities,
+                isNamespaceAware);
         } catch (FileNotFoundException e) {
             throw wrapExceptionAsRuntimeException(e);
         }
@@ -283,7 +307,7 @@ public static XMLBuilder2 parse(File xmlFile, boolean enableExternalEntities)
      */
     public static XMLBuilder2 parse(InputSource inputSource)
     {
-        return XMLBuilder2.parse(inputSource, false);
+        return XMLBuilder2.parse(inputSource, false, true);
     }
 
     /**
@@ -298,7 +322,7 @@ public static XMLBuilder2 parse(InputSource inputSource)
      */
     public static XMLBuilder2 parse(String xmlString)
     {
-        return XMLBuilder2.parse(xmlString, false);
+        return XMLBuilder2.parse(xmlString, false, true);
     }
 
     /**
@@ -316,7 +340,7 @@ public static XMLBuilder2 parse(String xmlString)
      */
     public static XMLBuilder2 parse(File xmlFile)
     {
-        return XMLBuilder2.parse(xmlFile, false);
+        return XMLBuilder2.parse(xmlFile, false, true);
     }
 
     /**
diff --git a/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java b/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
index 54959fc..ca8876f 100644
--- a/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
+++ b/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
@@ -54,11 +54,12 @@ protected BaseXMLBuilder XMLBuilder_parse(InputSource source) throws Exception {
     }
 
     protected BaseXMLBuilder XMLBuilder_parse(
-        String documentString, boolean enableExternalEntities) throws Exception
+        String documentString, boolean enableExternalEntities,
+        boolean isNamespaceAware) throws Exception
     {
         return (BaseXMLBuilder) XMLBuilderToTest().getMethod(
-            "parse", String.class, boolean.class).invoke(
-                null, documentString, enableExternalEntities);
+            "parse", String.class, boolean.class, boolean.class).invoke(
+                null, documentString, enableExternalEntities, isNamespaceAware);
     }
 
     protected BaseXMLBuilder XMLBuilder_parse(String documentString) throws Exception {
@@ -469,6 +470,44 @@ public void testNamespaces() throws Exception {
         builder.element("undefined-prefix:ElementName");
     }
 
+    public void testNamespaceUnawareBuilder() throws Exception {
+        String XML_WITH_NAMESPACES =
+            "<ns1:NamespaceUnwareTest xmlns:ns1=\"urn:1\" xmlns:ns2=\"urn:2\">" +
+                "<ns2:NestedElement>Found me</ns2:NestedElement>" +
+            "</ns1:NamespaceUnwareTest>";
+
+        // Builder set to be unaware of namespaces can traverse DOM with
+        // namespaces without using namespace prefixes
+        BaseXMLBuilder result = XMLBuilder_parse(
+            XML_WITH_NAMESPACES,
+            false,  // enableExternalEntities
+            false  // isNamespaceAware
+        ).xpathFind("/NamespaceUnwareTest/NestedElement");
+        assertEquals("Found me", result.getElement().getTextContent());
+
+        // Builder set to be aware of namespaces (per default) cannot traverse
+        // DOM with namespaces without using namespace prefixes
+        try {
+            result = XMLBuilder_parse(XML_WITH_NAMESPACES)
+                .xpathFind("/NamespaceUnwareTest/NestedElement");
+        } catch (Exception ex) {
+            Throwable cause = null;
+            if (this instanceof TestXMLBuilder2) {
+                cause = ex.getCause();  // Exception wrapped in runtime ex
+            } else {
+                cause = ex;
+            }
+            assertEquals(
+                cause.getClass(), XPathExpressionException.class);
+            assertTrue(
+                cause.getMessage().contains(
+                    "XPath expression \"/NamespaceUnwareTest/NestedElement\""
+                    + " does not resolve to an Element in context"
+                ));
+        }
+        assertEquals("Found me", result.getElement().getTextContent());
+    }
+
     public void testElementBefore() throws Exception {
         BaseXMLBuilder builder = XMLBuilder_create("TestDocument", "urn:default")
                 .namespace("custom", "urn:custom")
@@ -648,7 +687,7 @@ public void testXMLBuilderParserImmuneToXXEAttackByDefault() throws Exception {
         String parsedXml = builder.asString();
         assertFalse(parsedXml.indexOf("Injected XXE Data") >= 0);
         // If you enable external entity processing, builder becomes subject to XXE injection
-        builder = XMLBuilder_parse(XML_DOC_WITH_XXE, true);
+        builder = XMLBuilder_parse(XML_DOC_WITH_XXE, true, true);
         parsedXml = builder.asString();
         assertTrue(parsedXml.indexOf("Injected XXE Data") >= 0);
     }

From 6483a913a5ee3561e8ebe0b23e5716f96eb447fb Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 22:43:29 +1000
Subject: [PATCH 03/18] Mention advanced features of create & parse
 constructors in readme

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 0740c1c..1b579ec 100644
--- a/README.md
+++ b/README.md
@@ -351,6 +351,22 @@ To produce:
 </Projects>
 ```
 
+### Configuring advanced features
+
+When creating or parsing a document you can enable and disable advanced
+features by using the more explicit versions of the `parse()` and `create()`
+constructors.
+
+You can:
+
+* use the `enableExternalEntities` flag to enable or disable external entities.  
+  NOTE: you should leave these disabled, as they are by default, unless you
+  really need them because they open you to XML External Entity (XXE) injection
+  attacks.
+* use the `isNamespaceAware` flag to enable or disable namespace awareness in
+  the underlying `DocumentBuilderFactory`.
+ 
+
 Release History
 ---------------
 

From 4ce85f5a8d2db6f31d474aa3c13d0dd86bae3a82 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 22:52:15 +1000
Subject: [PATCH 04/18] [maven-release-plugin] prepare release v1.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a84930..e91d5f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>java-xmlbuilder</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
   <name>java-xmlbuilder</name>
   <description>XML Builder is a utility that creates simple XML documents using relatively sparse Java code</description>
   <url>https://github.com/jmurty/java-xmlbuilder</url>
@@ -21,7 +21,7 @@
     <connection>scm:git:github.com/jmurty/java-xmlbuilder.git</connection>
     <developerConnection>scm:git:git@github.com:jmurty/java-xmlbuilder.git</developerConnection>
     <url>https://github.com/jmurty/java-xmlbuilder</url>
-    <tag>HEAD</tag>
+    <tag>v1.2</tag>
   </scm>
   
   <developers>

From 557e1ee332ab569344050934a822cc7da590c17b Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 22:52:16 +1000
Subject: [PATCH 05/18] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e91d5f6..88d5285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>java-xmlbuilder</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.2</version>
+  <version>1.3-SNAPSHOT</version>
   <name>java-xmlbuilder</name>
   <description>XML Builder is a utility that creates simple XML documents using relatively sparse Java code</description>
   <url>https://github.com/jmurty/java-xmlbuilder</url>
@@ -21,7 +21,7 @@
     <connection>scm:git:github.com/jmurty/java-xmlbuilder.git</connection>
     <developerConnection>scm:git:git@github.com:jmurty/java-xmlbuilder.git</developerConnection>
     <url>https://github.com/jmurty/java-xmlbuilder</url>
-    <tag>v1.2</tag>
+    <tag>HEAD</tag>
   </scm>
   
   <developers>

From f396a241f64c12d159dc7b8baba7616552516922 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 23:06:23 +1000
Subject: [PATCH 06/18] Correct status of version 1.2 in changelog

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 12b586b..53f8b53 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,8 @@
 Release Notes for java-xmlbuilder
 =================================
 
-Version 1.2 - Pending
----------------------
+Version 1.2 - 1 September 2017
+------------------------------
 
 Fixes:
 

From 7c224b8e8ed79808509322cb141dab5a88dd3cec Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 1 Sep 2017 23:08:07 +1000
Subject: [PATCH 07/18] Update Maven reference and direct download link to
 version 1.2

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1b579ec..9181ecb 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ See further example usage below and in the
 [JavaDoc documentation](http://s3.jamesmurty.com/java-xmlbuilder/index.html).
 
 Download a Jar file containing the latest version
-[java-xmlbuilder-1.1.jar](http://s3.jamesmurty.com/java-xmlbuilder/java-xmlbuilder-1.1.jar).
+[java-xmlbuilder-1.2.jar](http://s3.jamesmurty.com/java-xmlbuilder/java-xmlbuilder-1.2.jar).
 
 Maven users can add this project as a dependency with the following additions
 to a POM.xml file:
@@ -88,7 +88,7 @@ to a POM.xml file:
   <dependency>
     <groupId>com.jamesmurty.utils</groupId>
     <artifactId>java-xmlbuilder</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </dependency>
   . . .
 </dependencies>

From 13a78bcf436daa8ff9c3e515e4599342cc5f1b38 Mon Sep 17 00:00:00 2001
From: harkue <harkue@hotmail.com>
Date: Wed, 8 Jul 2020 11:29:58 +0800
Subject: [PATCH 08/18] add maven central badge in `README.md`

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 9181ecb..2572c92 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 java-xmlbuilder
 ===============
 
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jamesmurty.utils/java-xmlbuilder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jamesmurty.utils/java-xmlbuilder)
+
 XML Builder is a utility that allows simple XML documents to be constructed
 using relatively sparse Java code.
 

From 0b53d5c77101a61058d39baf5b2d26080a4e0e09 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:12:24 +1000
Subject: [PATCH 09/18] Remove unused `javax.annotation` import which breaks
 Java 11+

---
 src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java b/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
index ca8876f..274d461 100644
--- a/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
+++ b/src/test/java/com/jamesmurty/utils/BaseXMLBuilderTests.java
@@ -6,7 +6,6 @@
 import java.io.StringWriter;
 import java.util.Properties;
 
-import javax.annotation.Resource;
 import javax.xml.transform.OutputKeys;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;

From 4c44a34bafbee864dbdfd1e232268cfbb246cde4 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:14:48 +1000
Subject: [PATCH 10/18] Update build source & target to version 7

Versions <7 is no longer supported by Maven
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 88d5285..c887b62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,11 @@
   <name>java-xmlbuilder</name>
   <description>XML Builder is a utility that creates simple XML documents using relatively sparse Java code</description>
   <url>https://github.com/jmurty/java-xmlbuilder</url>
+
+  <properties>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
   
   <licenses>
     <license>

From 42109b9bea60861410f87a9cec1f8e72d4f62cc3 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:36:43 +1000
Subject: [PATCH 11/18] Update links previously to my defunct jamesmurty.com
 site

---
 .gitignore                                    |  2 +-
 README.md                                     | 26 +++++++++----------
 pom.xml                                       |  2 +-
 .../com/jamesmurty/utils/BaseXMLBuilder.java  |  4 +--
 .../java/com/jamesmurty/utils/XMLBuilder.java |  2 +-
 .../com/jamesmurty/utils/XMLBuilder2.java     |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 762f6e9..84a1064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 /.classpath
 /.project
 /.settings
+/.envrc
 /mvn
-/HOWTO_RELEASE.txt
 /bin
 /target
 /java-xmlbuilder
diff --git a/README.md b/README.md
index 2572c92..1d0495d 100644
--- a/README.md
+++ b/README.md
@@ -26,14 +26,14 @@ Since version 1.1 this library provides two builder implementations and APIs:
 
  * `XMLBuilder` – the original API – follows standard Java practice of
    re-throwing lower level checked exceptions when you do things like create a
-   new document.  
+   new document.
    You must explicitly `catch` these checked exceptions in your codebase, even
-   though they are unlikely to occur in tested code. 
+   though they are unlikely to occur in tested code.
  * `XMLBuilder2` is a newer API that removes checked exceptions altogether, and
    will instead wrap and propagate lower level exceptions in an unchecked
-   `XMLBuilderRuntimeException`.  
+   `XMLBuilderRuntimeException`.
    Use this class if you don't like the code mess or overhead of try/catching
-   many low-level exceptions that are unlikely to occur in practice. 
+   many low-level exceptions that are unlikely to occur in practice.
 
 Both these versions work identically apart from the handling of errors, so you
 can use whichever version you prefer or "upgrade" from one to the other in
@@ -75,11 +75,11 @@ Produces this XML document:
 Getting Started
 ---------------
 
-See further example usage below and in the 
-[JavaDoc documentation](http://s3.jamesmurty.com/java-xmlbuilder/index.html).
+See further example usage below and in the
+[JavaDoc documentation](http://s3.james.murty.com/java-xmlbuilder/index.html).
 
 Download a Jar file containing the latest version
-[java-xmlbuilder-1.2.jar](http://s3.jamesmurty.com/java-xmlbuilder/java-xmlbuilder-1.2.jar).
+[java-xmlbuilder-1.2.jar](http://s3.james.murty.com/java-xmlbuilder/java-xmlbuilder-1.2.jar).
 
 Maven users can add this project as a dependency with the following additions
 to a POM.xml file:
@@ -195,7 +195,7 @@ methods.
 XMLBuilder builder = XMLBuilder.create("Projects")
     .e("java-xmlbuilder")
         .a("language", "Java")
-        .a("scm","SVN")                    
+        .a("scm","SVN")
         .e("Location")
             .a("type", "URL")
             .t("http://code.google.com/p/java-xmlbuilder/")
@@ -223,7 +223,7 @@ The following methods are available for adding items to the XML document:
 
 ### Output
 
-XMLBuilder includes two convenient methods for outputting a document. 
+XMLBuilder includes two convenient methods for outputting a document.
 
 You can use the `toWriter` method to print the document to an output stream or
 file:
@@ -240,7 +240,7 @@ builder.asString(outputProperties);
 Both of these output methods take an `outputProperties` parameter that you can
 use to control how the output is generated. Any output properties you provide
 are forwarded to the underlying Transformer object that is used to serialize
-the XML document. 
+the XML document.
 
 You might specify any non-standard properties like so:
 
@@ -286,7 +286,7 @@ represents the document's root element, no matter deep an element hierarchy
 your code has built:
 
 ```java
-org.w3c.dom.Element rootElement = 
+org.w3c.dom.Element rootElement =
     XMLBuilder.create("This")
         .e("Element")
             .e("Hierarchy")
@@ -361,13 +361,13 @@ constructors.
 
 You can:
 
-* use the `enableExternalEntities` flag to enable or disable external entities.  
+* use the `enableExternalEntities` flag to enable or disable external entities.
   NOTE: you should leave these disabled, as they are by default, unless you
   really need them because they open you to XML External Entity (XXE) injection
   attacks.
 * use the `isNamespaceAware` flag to enable or disable namespace awareness in
   the underlying `DocumentBuilderFactory`.
- 
+
 
 Release History
 ---------------
diff --git a/pom.xml b/pom.xml
index c887b62..7150194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <developer>
       <id>jmurty</id>
       <name>James Murty</name>
-      <url>http://jamesmurty.com</url>
+      <url>https://github.com/jmurty</url>
       <roles>
         <role>developer</role>
       </roles>
diff --git a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
index c9466f7..f5cabd8 100644
--- a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2017 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2020 James Murty (github.com/jmurty)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1438,4 +1438,4 @@ protected String getPrefixFromQualifiedName(String qualifiedName) {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder.java b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
index 77c50b0..2679002 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2017 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2020 James Murty (github.com/jmurty)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
index 96473d7..6f0cda6 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2017 James Murty (www.jamesmurty.com)
+ * Copyright 2008-2020 James Murty (github.com/jmurty)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From e39ad5f26f7bf706d6f61f2878a26dc2cb4a07ae Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:51:37 +1000
Subject: [PATCH 12/18] Various hacks to get Docs to build with Java 12

---
 pom.xml                                       |  3 +
 .../com/jamesmurty/utils/BaseXMLBuilder.java  | 36 +++++----
 .../java/com/jamesmurty/utils/XMLBuilder.java | 76 +++++++++----------
 3 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7150194..55dcd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.9</version>
+        <configuration>
+          <source>7</source>
+        </configuration>
         <executions>
           <execution>
             <id>attach-javadocs</id>
diff --git a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
index f5cabd8..3122a30 100644
--- a/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/BaseXMLBuilder.java
@@ -205,8 +205,8 @@ protected static void enableOrDisableExternalEntityParsing(
      * @return
      * an XML Document.
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
      */
     protected static Document createDocumentImpl(
         String name, String namespaceURI, boolean enableExternalEntities,
@@ -240,12 +240,12 @@ protected static Document createDocumentImpl(
      * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
-     * @throws ParserConfigurationException
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     protected static Document parseDocumentImpl(
         InputSource inputSource, boolean enableExternalEntities,
@@ -268,7 +268,7 @@ protected static Document parseDocumentImpl(
      * Uses approach I documented on StackOverflow:
      * http://stackoverflow.com/a/979606/4970
      *
-     * @throws XPathExpressionException
+     * @throws XPathExpressionException xyz
      */
     protected void stripWhitespaceOnlyTextNodesImpl()
         throws XPathExpressionException
@@ -297,7 +297,7 @@ protected void stripWhitespaceOnlyTextNodesImpl()
      *
      * @return
      * a builder node at the same location as before the operation.
-     * @throws XPathExpressionException
+     * @throws XPathExpressionException xyz
      */
     public abstract BaseXMLBuilder stripWhitespaceOnlyTextNodes()
         throws XPathExpressionException;
@@ -533,7 +533,7 @@ protected String lookupNamespaceURIImpl(String name) {
      * the name of the XML element.
      * @param namespaceURI
      * a namespace URI
-     * @return
+     * @return xyz
      *
      * @throws IllegalStateException
      * if you attempt to add a child element to an XML node that already
@@ -757,6 +757,7 @@ protected Element elementImpl(String name, String namespaceURI) {
      *
      * @param name
      * the name of the XML element.
+     * @return xyz
      *
      * @throws IllegalStateException
      * if you attempt to add a sibling element to a node where there are already
@@ -776,6 +777,7 @@ protected Element elementBeforeImpl(String name) {
      * the name of the XML element.
      * @param namespaceURI
      * a namespace URI
+     * @return xyz
      *
      * @throws IllegalStateException
      * if you attempt to add a sibling element to a node where there are already
@@ -1253,6 +1255,8 @@ protected Node upImpl(int steps) {
     }
 
     /**
+     * @param anXmlElement xyz
+     *
      * @throws IllegalStateException
      * if the current element contains any child text nodes that aren't pure whitespace.
      * We allow whitespace so parsed XML documents containing indenting or pretty-printing
@@ -1298,7 +1302,7 @@ protected void assertElementContainsNoOrWhitespaceOnlyTextNodes(Node anXmlElemen
      * null or an empty Properties object, in which case the default output
      * properties will be applied.
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public void toWriter(boolean wholeDocument, Writer writer, Properties outputProperties)
         throws TransformerException {
@@ -1337,7 +1341,7 @@ public void toWriter(boolean wholeDocument, Writer writer, Properties outputProp
      * null or an empty Properties object, in which case the default output
      * properties will be applied.
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public void toWriter(Writer writer, Properties outputProperties)
         throws TransformerException {
@@ -1358,7 +1362,7 @@ public void toWriter(Writer writer, Properties outputProperties)
      * @return
      * the XML document as a string
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public String asString(Properties outputProperties) throws TransformerException {
         StringWriter writer = new StringWriter();
@@ -1380,7 +1384,7 @@ public String asString(Properties outputProperties) throws TransformerException
      * @return
      * the XML document as a string
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public String elementAsString(Properties outputProperties) throws TransformerException {
         StringWriter writer = new StringWriter();
@@ -1395,7 +1399,7 @@ public String elementAsString(Properties outputProperties) throws TransformerExc
      * the XML document as a string without the XML declaration at the
      * beginning of the output.
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public String asString() throws TransformerException {
         Properties outputProperties = new Properties();
@@ -1411,7 +1415,7 @@ public String asString() throws TransformerException {
      * the XML document as a string without the XML declaration at the
      * beginning of the output.
      *
-     * @throws TransformerException
+     * @throws TransformerException xyz
      */
     public String elementAsString() throws TransformerException {
         Properties outputProperties = new Properties();
diff --git a/src/main/java/com/jamesmurty/utils/XMLBuilder.java b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
index 2679002..144293f 100644
--- a/src/main/java/com/jamesmurty/utils/XMLBuilder.java
+++ b/src/main/java/com/jamesmurty/utils/XMLBuilder.java
@@ -107,8 +107,8 @@ protected XMLBuilder(Node myNode, Node parentNode) {
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
      */
     public static XMLBuilder create(String name, String namespaceURI,
         boolean enableExternalEntities, boolean isNamespaceAware)
@@ -134,8 +134,8 @@ public static XMLBuilder create(String name, String namespaceURI,
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
      */
     public static XMLBuilder create(String name, boolean enableExternalEntities,
         boolean isNamespaceAware)
@@ -158,8 +158,8 @@ public static XMLBuilder create(String name, boolean enableExternalEntities,
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
      */
     public static XMLBuilder create(String name, String namespaceURI)
         throws ParserConfigurationException, FactoryConfigurationError
@@ -177,8 +177,8 @@ public static XMLBuilder create(String name, String namespaceURI)
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
      */
     public static XMLBuilder create(String name)
         throws ParserConfigurationException, FactoryConfigurationError
@@ -200,12 +200,12 @@ public static XMLBuilder create(String name)
      * {@link DocumentBuilderFactory}
      * @return
      * a builder node that can be used to add more nodes to the XML document.
-     * @throws ParserConfigurationException
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(
         InputSource inputSource, boolean enableExternalEntities,
@@ -232,11 +232,11 @@ public static XMLBuilder parse(
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws ParserConfigurationException
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(
         String xmlString, boolean enableExternalEntities,
@@ -264,11 +264,11 @@ public static XMLBuilder parse(
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws ParserConfigurationException
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(File xmlFile, boolean enableExternalEntities,
         boolean isNamespaceAware)
@@ -289,12 +289,12 @@ public static XMLBuilder parse(File xmlFile, boolean enableExternalEntities,
      * an XML document input source that will be parsed into a DOM.
      * @return
      * a builder node that can be used to add more nodes to the XML document.
-     * @throws ParserConfigurationException
      *
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(InputSource inputSource)
         throws ParserConfigurationException, SAXException, IOException
@@ -312,11 +312,11 @@ public static XMLBuilder parse(InputSource inputSource)
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws ParserConfigurationException
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(String xmlString)
         throws ParserConfigurationException, SAXException, IOException
@@ -334,11 +334,11 @@ public static XMLBuilder parse(String xmlString)
      * @return
      * a builder node that can be used to add more nodes to the XML document.
      *
-     * @throws ParserConfigurationException
-     * @throws FactoryConfigurationError
-     * @throws ParserConfigurationException
-     * @throws IOException
-     * @throws SAXException
+     * @throws ParserConfigurationException xyz
+     * @throws FactoryConfigurationError xyz
+     * @throws ParserConfigurationException xyz
+     * @throws IOException xyz
+     * @throws SAXException xyz
      */
     public static XMLBuilder parse(File xmlFile)
         throws ParserConfigurationException, SAXException, IOException

From 564a3297d9c3737bf36f32d8886a7dde45d45c6e Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:54:08 +1000
Subject: [PATCH 13/18] Release 1.3 to Maven repository

---
 CHANGES.md | 28 ++++++++++++++++++++--------
 README.md  |  4 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 53f8b53..4b2435f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,18 @@
 Release Notes for java-xmlbuilder
 =================================
 
+Version 1.3 - 8 July 2020
+-------------------------
+
+Fixes:
+
+* Update source version from 1.5 to 1.7 to work with Java versions 11+ which no
+  longer supports `javax.annotation` and because 6 no longer builds with Maven.
+
+* Tweaks to pom.xml to get Maven builds to work with Java 12.
+
+* Replace references to my defunct website with working alternatives.
+
 Version 1.2 - 1 September 2017
 ------------------------------
 
@@ -9,16 +21,16 @@ Fixes:
 * Prevent XML External Entity (XXE) injection attacks by disabling parsing of
   general and parameter external entities by default (#6). External entities
   are now only parsed if this feature is explicitly enabled by passing a boolean
-  flag value to the #create and #parse methods.  
+  flag value to the #create and #parse methods.
   WARNING: This will break code that expects external entities to be parsed.
-  
+
 Enhancements:
 
 * Permit users to disable namespace-awareness in the underlying
   DocumentBuilderFactory when constructing the builder with extended `create()`
   and `parse()` methods. Namespace awareness is enabled by default unless you
   use the more explicit versions of these methods that take additional
-  `enableExternalEntities` and `isNamespaceAware` parameters. 
+  `enableExternalEntities` and `isNamespaceAware` parameters.
 
 Version 1.1 - 22 July 2014
 --------------------------
@@ -27,12 +39,12 @@ Added a new `XMLBuilder2` implementation that avoids checked exceptions in the
 API and throws runtime exceptions instead. This should make the library much
 more pleasant to use, and your code much cleaner, in situations where low-level
 exceptions are unlikely -- which is probably most situations where you would
-use this library.  
+use this library.
 
 For example when creating a new document with the `#create` method, instead of
 needing to explicitly catch the unlikely `ParserConfigurationException`, if you
 use `XMLBuilder2` this exception automatically gets wrapped in the new
-`XMLBuilderRuntimeException` class and can be left to propagate out.  
+`XMLBuilderRuntimeException` class and can be left to propagate out.
 
 Aside from the removal of checked exceptions, `XMLBuilder2` has the same API as
 the original `XMLBuilder` and should therefore be a drop-in replacement in
@@ -45,9 +57,9 @@ Version 1.0 - 6 March 2014
 --------------------------
 
 Jumped version number from 0.7 to 1.0 to better reflect this project's age
-and stability, as well as to celebrate the move to GitHub. 
+and stability, as well as to celebrate the move to GitHub.
 
-* Migrated project from 
+* Migrated project from
   [Google Code](https://code.google.com/p/java-xmlbuilder/) to
   [GitHub](https://github.com/jmurty/java-xmlbuilder). Whew, that's better!
 * Test cases for edge-case issues and questions reported by users.
@@ -91,7 +103,7 @@ Version 0.3 - 2 July 2010
 
 * First release to Maven repository.
 * Parse existing XML documents with `parse` method.
-* Find specific nodes in document with an XPath with `xpathFind`. 
+* Find specific nodes in document with an XPath with `xpathFind`.
 * Added JUnit tests
 
 Version 0.2 - 6 January 2009
diff --git a/README.md b/README.md
index 1d0495d..7465cc8 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ See further example usage below and in the
 [JavaDoc documentation](http://s3.james.murty.com/java-xmlbuilder/index.html).
 
 Download a Jar file containing the latest version
-[java-xmlbuilder-1.2.jar](http://s3.james.murty.com/java-xmlbuilder/java-xmlbuilder-1.2.jar).
+[java-xmlbuilder-1.3.jar](http://s3.james.murty.com/java-xmlbuilder/java-xmlbuilder-1.3.jar).
 
 Maven users can add this project as a dependency with the following additions
 to a POM.xml file:
@@ -90,7 +90,7 @@ to a POM.xml file:
   <dependency>
     <groupId>com.jamesmurty.utils</groupId>
     <artifactId>java-xmlbuilder</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </dependency>
   . . .
 </dependencies>

From b1d49f7dd5a2374c4dcedfc05a1164a943d8c75f Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:58:11 +1000
Subject: [PATCH 14/18] [maven-release-plugin] prepare release v1.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55dcd8b..c7c4c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>java-xmlbuilder</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.3-SNAPSHOT</version>
+  <version>1.3</version>
   <name>java-xmlbuilder</name>
   <description>XML Builder is a utility that creates simple XML documents using relatively sparse Java code</description>
   <url>https://github.com/jmurty/java-xmlbuilder</url>
@@ -26,7 +26,7 @@
     <connection>scm:git:github.com/jmurty/java-xmlbuilder.git</connection>
     <developerConnection>scm:git:git@github.com:jmurty/java-xmlbuilder.git</developerConnection>
     <url>https://github.com/jmurty/java-xmlbuilder</url>
-    <tag>HEAD</tag>
+    <tag>v1.3</tag>
   </scm>
   
   <developers>

From 6c5a027dd49d4d52915125a66f96423d43c44568 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Wed, 8 Jul 2020 23:58:11 +1000
Subject: [PATCH 15/18] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7c4c3c..ec4603a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>java-xmlbuilder</artifactId>
   <packaging>jar</packaging>
 
-  <version>1.3</version>
+  <version>1.4-SNAPSHOT</version>
   <name>java-xmlbuilder</name>
   <description>XML Builder is a utility that creates simple XML documents using relatively sparse Java code</description>
   <url>https://github.com/jmurty/java-xmlbuilder</url>
@@ -26,7 +26,7 @@
     <connection>scm:git:github.com/jmurty/java-xmlbuilder.git</connection>
     <developerConnection>scm:git:git@github.com:jmurty/java-xmlbuilder.git</developerConnection>
     <url>https://github.com/jmurty/java-xmlbuilder</url>
-    <tag>v1.3</tag>
+    <tag>HEAD</tag>
   </scm>
   
   <developers>

From 01d118fd43c720741089a5d7a47cd8e7d28d9ee8 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Thu, 9 Jul 2020 00:48:30 +1000
Subject: [PATCH 16/18] Fix faulty links to docs and 1.3 Jar file

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7465cc8..f85ff71 100644
--- a/README.md
+++ b/README.md
@@ -76,10 +76,10 @@ Getting Started
 ---------------
 
 See further example usage below and in the
-[JavaDoc documentation](http://s3.james.murty.com/java-xmlbuilder/index.html).
+[JavaDoc documentation](http://s3.james.murty.co/java-xmlbuilder/index.html).
 
 Download a Jar file containing the latest version
-[java-xmlbuilder-1.3.jar](http://s3.james.murty.com/java-xmlbuilder/java-xmlbuilder-1.3.jar).
+[java-xmlbuilder-1.3.jar](http://s3.james.murty.co/java-xmlbuilder/java-xmlbuilder-1.3.jar).
 
 Maven users can add this project as a dependency with the following additions
 to a POM.xml file:

From e6e817dddb10173bd6b27073038f3db5ae97b177 Mon Sep 17 00:00:00 2001
From: harkue <harkue@hotmail.com>
Date: Fri, 10 Jul 2020 08:44:03 +0800
Subject: [PATCH 17/18] set up github action for CI build and codecov add build
 and codecov badge in README.md

---
 .github/workflows/codecov.yml | 28 ++++++++++++++++++++++++++++
 .github/workflows/maven.yml   | 31 +++++++++++++++++++++++++++++++
 README.md                     |  4 ++++
 pom.xml                       | 14 +++++++++++++-
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/codecov.yml
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
new file mode 100644
index 0000000..5b388a8
--- /dev/null
+++ b/.github/workflows/codecov.yml
@@ -0,0 +1,28 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Codecov
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+  pull_request:
+
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    - name: Run cobertura
+      run: mvn cobertura:cobertura
+
+    - name: Upload report
+      run: bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..87ce66d
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [7, 8, 9.0.x, 10, 11, 12, 13]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Clean Build
+        run: mvn clean
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index f85ff71..51bda75 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,10 @@ java-xmlbuilder
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.jamesmurty.utils/java-xmlbuilder/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.jamesmurty.utils/java-xmlbuilder)
 
+![Build](https://github.com/jmurty/java-xmlbuilder/workflows/Build/badge.svg) ![Codecov](https://github.com/jmurty/java-xmlbuilder/workflows/Codecov/badge.svg)
+
+[![codecov](https://codecov.io/gh/jmurty/java-xmlbuilder/branch/master/graph/badge.svg)](https://codecov.io/gh/jmurty/java-xmlbuilder)
+
 XML Builder is a utility that allows simple XML documents to be constructed
 using relatively sparse Java code.
 
diff --git a/pom.xml b/pom.xml
index ec4603a..36d109a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,19 @@
           </execution>
         </executions>
       </plugin>
-      
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <formats>
+            <format>html</format>
+            <format>xml</format>
+          </formats>
+          <check />
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

From 0215c9b89fc404626afc5d37589727b488c37e96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Oct 2020 03:14:30 +0000
Subject: [PATCH 18/18] Bump junit from 4.11 to 4.13.1

Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 36d109a..cecbdb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>    
   </dependencies>