NOTICE

@@ -4,7 +4,7 @@
    =========================================================================
 
    Apache Xerces Java
-   Copyright 1999-2018 The Apache Software Foundation
+   Copyright 1999-2020 The Apache Software Foundation
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).

build.xml

@@ -24,7 +24,7 @@ Authors:
   Anupam Bagchi     <abagchi@apache.org>
   Andy Clark, IBM
 
-   $Id: build.xml 1829239 2018-04-16 06:17:53Z mukulg $
+   $Id: build.xml 1871489 2019-12-14 12:42:17Z mukulg $
 
 ==================================================================== -->
 <project default="usage" basedir=".">
@@ -57,9 +57,9 @@ Authors:
     <property name='parser.Name' value='Xerces-J'/>
     <property name='parser.name' value='xerces-j'/>
     <property name='parser.shortname' value='xerces'/>
-    <property name='parser.Version' value='2.12.0'/>
-    <property name='parser.version' value='2.12.0'/>
-    <property name='parser_version' value='2_12_0'/>
+    <property name='parser.Version' value='2.12.1'/>
+    <property name='parser.version' value='2.12.1'/>
+    <property name='parser_version' value='2_12_1'/>
 
     <property name='deprecatedjar.parser' value='xerces.jar'/>
     <property name='jar.apis' value='xml-apis.jar'/>
@@ -76,7 +76,7 @@ Authors:
     <property name='default.parser.config.name' value='XIncludeAwareParserConfiguration'/>
     <property name='default.parser.config.qualified' value='org.apache.xerces.parsers.XIncludeAwareParserConfiguration'/>
 
-    <property name="year" value="1999-2018"/>
+    <property name="year" value="1999-2020"/>
     <property name="copyright" value="Copyright &#169; ${year} The Apache Software Foundation. All Rights Reserved."/>
 
     <echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/>
@@ -921,6 +921,12 @@ Authors:
           failOnError="yes">
         <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
     </java>
+    <echo message="Running idc.AllTests ..." />
+    <java fork="yes"
+          classname="idc.AllTests"
+          failOnError="yes">
+        <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
+    </java>    
   </target>
 
   <!-- =================================================================== -->

debian/changelog

+libxerces2-java (2.12.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Removed getContentDocument.patch (fixed upstream)
+  * Standards-Version updated to 4.5.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 26 Jan 2020 10:56:59 +0100
+
 libxerces2-java (2.12.0-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -15,7 +15,7 @@ Build-Depends:
  libxml-commons-external-java (>= 1.4.01-2),
  libxml-commons-resolver1.1-java,
  maven-repo-helper
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/libxerces2-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libxerces2-java
 Homepage: http://xerces.apache.org/xerces2-j/

debian/patches/02_build_dont_unzip.patch

@@ -17,7 +17,7 @@
      
      <!-- substitute tokens as needed -->
      <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-@@ -1233,7 +1234,7 @@
+@@ -1239,7 +1240,7 @@
      <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
               token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
   
@@ -26,7 +26,7 @@
      <unzip src="${src.apis.zip}" dest="${build.src}">
          <patternset
              includes="org/xml/sax/** 
-@@ -1256,7 +1257,7 @@
+@@ -1262,7 +1263,7 @@
                  org/w3c/dom/xpath/**"
          />
      </unzip>

debian/patches/03_bootclasspath.patch

@@ -26,7 +26,7 @@
             debug="${debug}" nowarn="true"
             debuglevel="${debuglevel}"
             includeAntRuntime="false"
-@@ -1302,7 +1303,7 @@
+@@ -1308,7 +1309,7 @@
             destdir="${build.dest}"
             source="${javac.source}"
             target="${javac.target}"

debian/patches/getContentDocument.patch

-From: Markus Koschany <apo@debian.org>
-Date: Sat, 12 May 2018 22:12:44 +0200
-Subject: getContentDocument
-
-Fix FTBFS with Java10 due to missing method getContentDocument.
-
-Forwarded: no
----
- src/org/apache/html/dom/HTMLFrameElementImpl.java  | 7 +++++++
- src/org/apache/html/dom/HTMLIFrameElementImpl.java | 5 +++++
- src/org/apache/html/dom/HTMLObjectElementImpl.java | 5 +++++
- 3 files changed, 17 insertions(+)
-
-diff --git a/src/org/apache/html/dom/HTMLFrameElementImpl.java b/src/org/apache/html/dom/HTMLFrameElementImpl.java
-index 18ab953..e90a592 100644
---- a/src/org/apache/html/dom/HTMLFrameElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLFrameElementImpl.java
-@@ -17,6 +17,8 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLFrameElement;
-+import org.w3c.dom.Document;
-+
- 
- /**
-  * @xerces.internal
-@@ -127,6 +129,11 @@ public class HTMLFrameElementImpl
-         setAttribute( "src", src );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-+
-     
-     /**
-      * Constructor requires owner document.
-diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-index c326557..287ba9e 100644
---- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLIFrameElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -150,6 +151,10 @@ public class HTMLIFrameElementImpl
-         setAttribute( "width", width );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-     
-     /**
-      * Constructor requires owner document.
-diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java
-index b065e69..cd27fc8 100644
---- a/src/org/apache/html/dom/HTMLObjectElementImpl.java
-+++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
- 
- import org.w3c.dom.html.HTMLObjectElement;
-+import org.w3c.dom.Document;
- 
- /**
-  * @xerces.internal
-@@ -239,6 +240,10 @@ public class HTMLObjectElementImpl
-         setAttribute( "width", width );
-     }
- 
-+    public Document getContentDocument()
-+    {
-+        return null;
-+    }
-     
-     
-     /**

debian/patches/java10.patch

@@ -154,7 +154,7 @@ Forwarded: no
          <arg value="testSchemaLanguageSAX"/>
          <arg value="testSchemaSourceSAX"/>
          <arg value="testSchemaLanguageDOM"/>
-@@ -909,19 +908,19 @@
+@@ -909,25 +908,25 @@
      <java fork="yes"
            classname="xinclude.Test"
            failOnError="yes">
@@ -175,5 +175,12 @@ Forwarded: no
 -        <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
 +        <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${build.dir}/classes"/>
      </java>
+     <echo message="Running idc.AllTests ..." />
+     <java fork="yes"
+           classname="idc.AllTests"
+           failOnError="yes">
+-        <jvmarg value="-Xbootclasspath/p:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
++        <jvmarg value="-Xbootclasspath/a:${tools.dir}/${jar.apis}${path.separator}${tools.dir}/${jar.resolver}${path.separator}${tools.dir}/${jar.serializer}${path.separator}${tools.dir}/${jar.junit}${path.separator}${build.dir}/classes${path.separator}${build.dir}/tests"/>
+     </java>    
    </target>
  

debian/patches/series

@@ -3,4 +3,3 @@
 03_bootclasspath.patch
 04_manifest_classpath.patch
 java10.patch
-getContentDocument.patch

docs/api.xml

@@ -158,7 +158,9 @@
    specification defines a set of interfaces for accessing and querying the post schema 
    validation infoset (PSVI) defined in 
    <jump href="http://www.w3.org/TR/xmlschema-1/#PSVI_contributions">Contributions 
-   to the post-schema-validation infoset (Appendix C.2)</jump>. These interfaces
+   to the post-schema-validation infoset (Appendix C.2) [XML Schema 1.0]</jump> and 
+   <jump href="http://www.w3.org/TR/xmlschema11-1/#PSVI_contributions">Contributions 
+   to the post-schema-validation infoset (Appendix B.2) [XML Schema 1.1]</jump>. These interfaces
    provide access to the XML Schema components, which follow as a consequence of 
    validation and/or assessment and also provide a means for accessing the PSVI 
    from a document instance.
@@ -195,4 +197,12 @@
    <li><jump href='javadocs/other/index.html'>Other Classes</jump></li>
   </ul>
  </s2>
+ <s2 title='XML Schema 1.1 API Documentation'>
+  <p>
+   Xerces-J's XML Schema 1.1 API documentation would have some differences as compared to 
+   API documentation of XML Schema 1.0 implementation. To view the API documentation of
+   Xerces-J's XML Schema 1.1 implementation, you would have to view 'docs' folder within 
+   Xerces's XML Schema 1.1 download package.
+  </p>
+ </s2>
 </s1>

docs/docs-book.xml

@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE book SYSTEM 'dtd/book.dtd'>
 <book title='&ParserName; Documentation' 
-      copyright='1999-2018 The Apache Software Foundation'>
+      copyright='1999-2020 The Apache Software Foundation'>
  <external label='Home' href='http://xerces.apache.org/'/>
  <separator/>
  <document label='Readme' title='&ParserNameLong; Readme'

docs/faq-common.xml

@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE faqs SYSTEM 'dtd/faqs.dtd'>
 <faqs title='Common Problems FAQs'>
- <faq title='Parsing HTML Generated an Error.'>
+ <faq title='Parsing HTML Generated an Error'>
   <q>
    I tried to use &ParserName; to parse an HTML file and it
    generated an error. What did I do wrong?

docs/faq-xs.xml

@@ -51,8 +51,8 @@ v.validate(instanceDocument);
          and do the subsequent validation. 
       </p>
       <p>You can also refer to the JAXP sample, SourceValidator, where you
-         can validate XML documents against 1.1 schemas by specifying the "-xsd11"
-         flag when running the sample.</p>
+         can validate XML documents against 1.1 schemas by specifying an option "-xsd11"
+         when running the sample.</p>
       <p>Each document that uses XML Schema grammars must specify the location of the
 	grammars it uses by using an xsi:schemaLocation attribute if they use
 	namespaces, and an xsi:noNamespaceSchemaLocation attribute
@@ -78,6 +78,23 @@ v.validate(instanceDocument);
       
     </a>
   </faq>
+  <faq title="Using Entities and CDATA Sections">
+    <q>How does the XML Schema processor treat entities and CDATA sections?</q>
+    <a> 
+      <p>According to the XML Infoset the infoset items contributing to the 
+	<jump href='http://www.w3.org/TR/xml-infoset/#infoitem.character'>[character
+	  information item]</jump> are: characters in the document, whether literally, as
+	a character reference, or within a CDATA section, or within Entity
+	Reference. The XML Schema specification 
+	"requires as a precondition for assessment
+	an information set as defined in [XML-Infoset]" 
+	<jump href='http://www.w3.org/TR/xmlschema-1/#infoset'>(Appendix D)</jump> and thus Xerces might attempt to normalize data in an entity
+	reference or CDATA section.  To preserve character data within entity references and 
+	CDATA sections, 
+	turn off http://apache.org/xml/features/validation/schema/normalized-value feature.
+      </p>
+    </a>
+  </faq>
   <faq title="XPath 2.0 support for XML Schema 1.1 validation">
   	<q>How an XPath 2.0 engine is used for XML Schema 1.1 assertions and CTAs?</q>
   	<a>
@@ -103,23 +120,6 @@ v.validate(instanceDocument);
   	   </p>
   	</a>
   </faq>
-  <faq title="Using Entities and CDATA Sections">
-    <q>How does the XML Schema processor treat entities and CDATA sections?</q>
-    <a> 
-      <p>According to the XML Infoset the infoset items contributing to the 
-	<jump href='http://www.w3.org/TR/xml-infoset/#infoitem.character'>[character
-	  information item]</jump> are: characters in the document, whether literally, as
-	a character reference, or within a CDATA section, or within Entity
-	Reference. The XML Schema specification 
-	"requires as a precondition for assessment
-	an information set as defined in [XML-Infoset]" 
-	<jump href='http://www.w3.org/TR/xmlschema-1/#infoset'>(Appendix D)</jump> and thus Xerces might attempt to normalize data in an entity
-	reference or CDATA section.  To preserve character data within entity references and 
-	CDATA sections, 
-	turn off http://apache.org/xml/features/validation/schema/normalized-value feature.
-      </p>
-    </a>
-  </faq>
   <faq title="User defined error messages, for XML Schema 1.1 assertion failures">
      <q>How to specify a user defined error message, when an XML Schema 1.1 assertion returns a 'false' result?</q>
      <a>

docs/features.xml

@@ -320,6 +320,37 @@ catch (SAXException e) {
    <see idref='validation'/>
    <see idref='validation.schema'/>
   </feature>
+  <feature name='http://apache.org/xml/features/validation/cta-full-xpath-checking'
+           id='validation.xs11-cta-fullxpath-checking'>
+   <true>Enable XSD 1.1 CTA full XPath 2.0 checking.</true>
+   <false>Disable XSD 1.1 CTA full XPath 2.0 checking.</false>
+   <default value='false'/>
+   <access parsing='read-only' not-parsing='read-write'/>
+   <since value='&ParserName; 2.12.0'/>
+   <note>
+     Setting this feature to 'true', would allow CTA XPath expressions to have full XPath 2.0 syntax. The default
+     is to recognize the CTA XPath subset, defined by XSD 1.1 language. If the CTA XPath expressions in a schema document
+     falls within the XPath subset, then the use of default Xerces CTA XPath processor may result in an efficient schema 
+     processing. 
+   </note>
+   <see idref='validation'/>
+   <see idref='validation.schema'/>
+  </feature>
+  <feature name='http://apache.org/xml/features/validation/assert-comments-and-pi-checking'
+           id='validation.xs11-assert-comments-pi-checking'>
+   <true>Enable occurrence of comments and PIs within XPath Data Model (XDM) instance, for XSD 1.1 assertion processing.</true>
+   <false>Disable occurrence of comments and PIs within XPath Data Model (XDM) instance, for XSD 1.1 assertion processing.</false>
+   <default value='false'/>
+   <access parsing='read-only' not-parsing='read-write'/>
+   <since value='&ParserName; 2.12.0'/>
+   <note>
+     Setting this feature to 'true', would allow assertions to access comments and PIs from an XML instance document
+     and correspondingly test for their absence, presence or do string processing on them for the purpose of XSD 
+     validation.
+   </note>
+   <see idref='validation'/>
+   <see idref='validation.schema'/>
+  </feature>
   <feature name='http://apache.org/xml/features/validation/unparsed-entity-checking'
            id='validation.unparsed-entity-checking'>
    <true>Check that each value of type ENTITY matches the name of an unparsed entity declared in the DTD.</true>

docs/readme.xml

@@ -19,12 +19,11 @@
 <s1 title='&ParserNameLong; Readme'>
   <s2 title='&ParserNameLong; &ParserVersion; Release'>
     <p>
-      Welcome to the future! Xerces2 is the next generation of
-      high performance, fully compliant XML parsers in the Apache
-      Xerces family. This new version of Xerces introduces the
-      Xerces Native Interface (XNI), a complete framework for
-      building parser components and configurations that is
-      extremely modular and easy to program. 
+      Welcome to the home of Xerces Java. Xerces2 provides high performance, 
+      fully compliant XML parsers in the Apache Xerces family. This new version 
+      of Xerces continues to build upon the Xerces Native Interface (XNI), a 
+      complete framework for building parser components and configurations that 
+      is extremely modular and easy to program. 
     </p>
     <p>
       The Apache Xerces2 parser is the reference implementation 
@@ -34,7 +33,7 @@
       <link idref='xni'>XNI Manual</link>.
     </p>
     <p>
-      Xerces2 is a fully conforming XML Schema 1.0 and 1.1 processor. An experimental implementation of the 
+      Xerces2 provides fully conforming XML Schema 1.0 and 1.1 processors. An experimental implementation of the 
 	  <jump href='http://www.w3.org/TR/2010/CR-xmlschema-ref-20100119/'>XML Schema Definition
 	  Language (XSD): Component Designators</jump> (SCD) Candidate Recommendation (January 2010)	  
 	  is also provided for evaluation. For more information, refer to the <link idref='xml-schema'>
@@ -149,11 +148,10 @@
   </s2>
   
   <s2 title='Changes from Previous Release'>
-
     <p>
-      The &ParserNameLong; &ParserVersion; expands on its experimental support for XML Schema 1.1
-      by providing fully compliant XML Schema 1.1 implementation. It fixes several bugs which
-      were present in the previous release and also includes a few other minor enhancements.
+      The &ParserNameLong; &ParserVersion; is a bug fix release, and is largely compatible with
+      the previous release in terms of broad functionality offered. It fixes few bugs which were 
+      present in the previous release and also includes a few other minor enhancements.
     </p>
     <p>
       For a more complete list of changes, refer to the 

docs/releases.xml

@@ -15,15 +15,94 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<!-- $Id: releases.xml 1829634 2018-04-20 08:38:24Z mukulg $ -->
+<!-- $Id: releases.xml 1872100 2019-12-30 08:33:21Z mukulg $ -->
 <!DOCTYPE releases SYSTEM 'dtd/releases.dtd'>
 <releases>
+  <release version='&ParserName; 2.12.1'>
+   <desc>
+    <p>
+      This release is a bug fix release. It fixes few bugs which were present in Xerces-J 2.12.0 
+      and also includes a few other minor enhancements.      
+    </p>
+   </desc>
+   <changes>                
+     <fix>
+        <note>
+      	   Implemented few fixes for XML Schema identity constraints, within Xerces's XML Schema 1.0 and 1.1
+      	   validators. 
+     	</note>
+     	<submitter name='Sandy Gao, Mukul Gandhi'/>
+     </fix>
+     <fix>
+        <note>
+      	   When XML Schema 1.1 validations are done, where xs:assert are contained within xs:override, the XPath
+      	   expressions within xs:assert can't see XML namespace bindings specified at certain locations in schema
+      	   documents. This release fixes this.
+     	</note>
+     	<submitter name='Mukul Gandhi, Patrick Gratz'/>
+     </fix>
+     <fix>
+        <note>
+      	   When XML Schema 1.1 validations are done, when the schema document is specified via xsi:schemaLocation 
+      	   attribute in the XML document, when full XPath 2.0 is used with CTA, for certain use cases
+      	   validation was not occurring correctly. This release fixes this.
+     	</note>
+     	<submitter name='Mukul Gandhi, Yitzhak Khabinsky'/>
+     </fix>
+     <fix>
+       <note>
+      	  For certain cases, while doing XML Schema 1.1 xs:assert validations, error messages appeared
+      	  like following 'FOAR0001 - Division by zero'. Modified such error messages, to now contain
+      	  the character ':' instead of '-' (since, the character '-' can be confused with a negation symbol).	
+       </note>
+       <submitter name='Mukul Gandhi'/>
+     </fix>           
+     <fix>
+        <note>
+      	   The 'XML Schema 1.1 structures' REC in the section, "3.2.3 Constraints on XML Representations of 
+      	   Attribute Declarations (Schema Representation Constraint: Attribute Declaration 
+      	   Representation)" mentions, '5 If fixed and use are both present, use must not have the actual value 
+      	   prohibited'. This functionality is newly introduced in XML Schema 1.1. Fixed a runtime validation issue 
+      	   for this XSD clause, when XSD 1.1 implementation is invoked in XSD 1.0 mode.
+     	</note>
+     	<submitter name='Mukul Gandhi'/>
+     </fix>     
+     <fix>
+        <note>
+      	   Xerces-J was previously not building from sources when Java 9+ was used. This release fixes this.
+     	</note>
+     	<submitter name='Mukul Gandhi, Michael Glavassevich, Thomas Pasch'/>
+     </fix>     
+     <fix>
+        <note>
+      	   XML Schema 1.1 has introduced the attribute 'ref' on xs:key, xs:unique and xs:keyref. When certain such
+      	   schema documents were processed by Xerces-J's XSD 1.1 implementation in XSD 1.0 mode, a 
+      	   java.lang.NullPointerException was displayed to the user when the schema document is processed with Xerces 
+      	   sample jaxp.SourceValidator. This release fixes this.
+     	</note>
+     	<submitter name='Michael Glavassevich, Mukul Gandhi'/>
+     </fix>
+     <fix>
+        <note>
+      	   Fixed minor bugs and made various improvements.
+     	</note>
+     	<submitter name='Michael Glavassevich, Mukul Gandhi, Octavian Nadolu'/>
+     </fix>
+     <add>
+        <note>
+           Added many new tests to the regression since the previous Xerces release, for Xerces's
+           XML Schema 1.0 and 1.1 implementations.
+     	</note>
+     	<submitter name='Mukul Gandhi'/>
+     </add>                        
+   </changes>
+  </release>
   <release version='&ParserName; 2.12.0'>
    <desc>
     <p>
-     This release expands on Xerces-J's experimental support for XML Schema 1.1
-      by providing a fully compliant XML Schema 1.1 implementation. It fixes several bugs 
-      which were present in &ParserName; 2.11.0 and also includes a few other minor enhancements.      
+     This release expands on Xerces-J's experimental support for XML Schema 1.1 by providing a 
+     fully compliant XML Schema 1.1 implementation. It fixes several bugs which were present in 
+     Xerces-J 2.11.0 and also includes a few other enhancements and performance improvements.      
     </p>
    </desc>
    <changes>       
@@ -63,6 +142,14 @@
      	</note>
      	<submitter name='Mukul Gandhi'/>
        </fix>
+       <fix>
+     	<note>
+      		Fixed possible security issue: an implementation of the NamedNodeMapImpl class in the JAXP component did not 
+      		limit the amount of memory allocated when creating object instance from a serialized form. A specially-crafted 
+      		input could cause a java application to use an excessive amount of memory when deserialized.
+     	</note>
+     	<submitter name='David Dillard, Michael Glavassevich, Mukul Gandhi'/>
+       </fix>
        <fix>
      	<note>
       		Implemented minor and major fixes in certain areas, to XML Schema 1.0 and 1.1 implementations.
@@ -95,10 +182,9 @@
        </fix>
        <fix>
      	<note>
-      	   Octavian and Radu, from Oxygen XML Editor team have contributed much by way of intimating numerous bugs
-      	   and implementation ideas, for Xerces-J's XML Schema 1.0 and 1.1 implementations.
+      	   Fixed various bugs and made various improvements.
      	</note>
-     	<submitter name='Octavian Nadolu, Radu Coravu'/>
+     	<submitter name='Mukul Gandhi, Jorge L. Williams, Octavian Nadolu, Radu Coravu'/>
        </fix>       
    </changes>
   </release>

docs/xml-schema.xml

@@ -128,13 +128,14 @@
             Javadoc for javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING for
             more details.
             </li>
-            <li> The JAXP class javax.xml.validation.Schema is defined to be thread safe, i.e.
-            applications are encouraged to share it across many threads. There are few cases
-            observed while doing XML Schema 1.1 validation, where the thread safe definition
-            of javax.xml.validation.Schema is not honored. This problem is observed, while
-            using the XSD 1.1 syntax &lt;assert&gt; in the XSD documents. But there are also, various
-            cases observed while using XSD 1.1 syntax &lt;assert&gt;, when thread safety of javax.xml.validation.Schema
-            is honored correctly.
+            <li> The JAXP class javax.xml.validation.Schema is defined to be thread 
+            safe. That is, applications are encouraged to share javax.xml.validation.Schema objects 
+            across multiple threads. Some Xerces users have reported that, while doing XML Schema 1.1 
+            validation javax.xml.validation.Schema is seen to be not thread safe. This problem was 
+            observed in certain use cases, while using the XSD 1.1 construct &lt;assert&gt; in the 
+            XSD documents. But there are also, various cases observed while using XSD 1.1 
+            construct &lt;assert&gt;, when thread safety of javax.xml.validation.Schema is 
+            seen to be working correctly.
             </li>
         </ul>
     </s2>

samples/jaxp/SourceValidator.java

@@ -65,10 +65,9 @@ import org.xml.sax.helpers.XMLReaderFactory;
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: SourceValidator.java 1335920 2012-05-09 04:15:35Z mrglavas $
+ * @version $Id: SourceValidator.java 1838308 2018-08-18 05:47:11Z mukulg $
  */
-public class SourceValidator 
-    implements ErrorHandler {
+public class SourceValidator implements ErrorHandler {
     
     //
     // Constants

src/org/apache/html/dom/HTMLFrameElementImpl.java

@@ -16,11 +16,12 @@
  */
 package org.apache.html.dom;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.html.HTMLFrameElement;
 
 /**
  * @xerces.internal
- * @version $Revision: 1029415 $ $Date: 2010-10-31 22:32:22 +0530 (Sun, 31 Oct 2010) $
+ * @version $Revision: 1866821 $ $Date: 2019-09-12 09:55:36 +0530 (Thu, 12 Sep 2019) $
  * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a>
  * @see org.w3c.dom.html.HTMLFrameElement
  * @see org.apache.xerces.dom.ElementImpl
@@ -128,6 +129,12 @@ public class HTMLFrameElementImpl
     }
     
     
+    // method added, so that xerces can be built with JDK 9 & above
+    public Document getContentDocument() {
+        return null;
+    }
+
+    
     /**
      * Constructor requires owner document.
      * 

src/org/apache/html/dom/HTMLIFrameElementImpl.java

@@ -16,11 +16,12 @@
  */
 package org.apache.html.dom;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.html.HTMLIFrameElement;
 
 /**
  * @xerces.internal
- * @version $Revision: 1029415 $ $Date: 2010-10-31 22:32:22 +0530 (Sun, 31 Oct 2010) $
+ * @version $Revision: 1866821 $ $Date: 2019-09-12 09:55:36 +0530 (Thu, 12 Sep 2019) $
  * @author <a href="mailto:arkin@exoffice.com">Assaf Arkin</a>
  * @see org.w3c.dom.html.HTMLIFrameElement
  * @see org.apache.xerces.dom.ElementImpl
@@ -151,6 +152,12 @@ public class HTMLIFrameElementImpl
     }
     
     
+    // method added, so that xerces can be built with JDK 9 & above
+    public Document getContentDocument() {
+        return null;
+    }
+
+    
     /**
      * Constructor requires owner document.
      *