Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2022-02-13 19:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xerces-j2" Sun Feb 13 19:50:33 2022 rev:45 rq:953792 version:2.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2021-12-31 13:44:24.833263822 +0100 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new.1956/xerces-j2.changes 2022-02-13 19:50:53.742189198 +0100 @@ -1,0 +2,33 @@ +Fri Feb 11 13:00:17 UTC 2022 - David Anes <david.a...@suse.com> + +- Update to 2.12.2 [bsc#1195108, CVE-2022-23437]: + * This release is a bug fix release. It fixes few bugs which were + present in Xerces-J 2.12.1 and also includes a few other minor + enhancements. + + Implemented a fix, that solves rarely occurring XML parsing + performance issue. + + Improved compliance, of XPath 2.0 processor's regex + implementation (that's used within XML Schema 1.1 + implementation). + + XML Schema validation error message improvements, when XML + attributes are validated. + + Improved the JAXP SourceValidator sample, related to XML + Schema 1.1 assertion evaluations on list types. + + Solved an XML Schema implementation issue, where + combination of restrictions 'length' and 'minLength' was + leading to error. + + Made minor, improvements to few XML Schema 1.1 validation + error messages. + + Fixed a rarely occurring issue during XML Schema 1.1 + xs:assert evaluation, where adjacent text values within + XML instance document, were resulting in more than one + adjacent XPath 2.0 text nodes. + + Upgraded the minimum, Java requirement to use XercesJ to + Java version 1.7. + + Upgraded XalanJ serializer dependency to version 2.7.2 + from 2.7.1, which is required by XercesJ. + + Re-built, "XML Commons External" and "XML Commons + Resolver" codebases (which are dependencies for XercesJ) + using Java 1.7. + +------------------------------------------------------------------- Old: ---- Xerces-J-src.2.12.1.tar.gz xercesImpl-2.12.1.pom New: ---- Xerces-J-src.2.12.2.tar.gz xercesImpl-2.12.2.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.M0bxmJ/_old 2022-02-13 19:50:55.050192683 +0100 +++ /var/tmp/diff_new_pack.M0bxmJ/_new 2022-02-13 19:50:55.054192693 +0100 @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%global cvs_version 2_12_1 +%global cvs_version 2_12_2 %define __requires_exclude system.bundle Name: xerces-j2 -Version: 2.12.1 +Version: 2.12.2 Release: 0 Summary: Java XML parser License: Apache-2.0 AND W3C ++++++ Xerces-J-src.2.12.1.tar.gz -> Xerces-J-src.2.12.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/NOTICE new/xerces-2_12_2/NOTICE --- old/xerces-2_12_1/NOTICE 2020-01-01 07:58:54.000000000 +0100 +++ new/xerces-2_12_2/NOTICE 2022-01-21 01:21:02.000000000 +0100 @@ -4,7 +4,7 @@ ========================================================================= Apache Xerces Java - Copyright 1999-2020 The Apache Software Foundation + Copyright 1999-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/NOTICE.serializer.txt new/xerces-2_12_2/NOTICE.serializer.txt --- old/xerces-2_12_1/NOTICE.serializer.txt 2020-01-01 07:58:54.000000000 +0100 +++ new/xerces-2_12_2/NOTICE.serializer.txt 2022-01-21 01:21:02.000000000 +0100 @@ -4,7 +4,7 @@ ========================================================================= Apache Xalan (Xalan serializer) - Copyright 1999-2006 The Apache Software Foundation + Copyright 1999-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/build.xml new/xerces-2_12_2/build.xml --- old/xerces-2_12_1/build.xml 2020-01-01 07:58:54.000000000 +0100 +++ new/xerces-2_12_2/build.xml 2022-01-21 01:21:02.000000000 +0100 @@ -24,7 +24,7 @@ Anupam Bagchi <abag...@apache.org> Andy Clark, IBM - $Id: build.xml 1871489 2019-12-14 12:42:17Z mukulg $ + $Id: build.xml 1897201 2022-01-19 12:23:24Z mukulg $ ==================================================================== --> <project default="usage" basedir="."> @@ -57,9 +57,9 @@ <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.1'/> - <property name='parser.version' value='2.12.1'/> - <property name='parser_version' value='2_12_1'/> + <property name='parser.Version' value='2.12.2'/> + <property name='parser.version' value='2.12.2'/> + <property name='parser_version' value='2_12_2'/> <property name='deprecatedjar.parser' value='xerces.jar'/> <property name='jar.apis' value='xml-apis.jar'/> @@ -76,7 +76,7 @@ <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-2020"/> + <property name="year" value="1999-2022"/> <property name="copyright" value="Copyright © ${year} The Apache Software Foundation. All Rights Reserved."/> <echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/> @@ -87,8 +87,11 @@ <property name="optimize" value="on"/> <property name="deprecation" value="off"/> - <property name="javac.source" value="${ant.java.version}"/> - <property name="javac.target" value="${ant.java.version}"/> + <!--<property name="javac.source" value="${ant.java.version}"/> + <property name="javac.target" value="${ant.java.version}"/>--> + + <property name="javac.source" value="1.7"/> + <property name="javac.target" value="1.7"/> <property name="docs.book" value="${docs.dir}/docs-book.xml"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/docs-book.xml new/xerces-2_12_2/docs/docs-book.xml --- old/xerces-2_12_1/docs/docs-book.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/docs-book.xml 2022-01-21 01:21:02.000000000 +0100 @@ -17,7 +17,7 @@ --> <!DOCTYPE book SYSTEM 'dtd/book.dtd'> <book title='&ParserName; Documentation' - copyright='1999-2020 The Apache Software Foundation'> + copyright='1999-2022 The Apache Software Foundation'> <external label='Home' href='http://xerces.apache.org/'/> <separator/> <document label='Readme' title='&ParserNameLong; Readme' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/dtd/entities.ent new/xerces-2_12_2/docs/dtd/entities.ent --- old/xerces-2_12_1/docs/dtd/entities.ent 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/dtd/entities.ent 2022-01-21 01:21:02.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- upper case versions of names and versions --> -<!ENTITY ParserNameLong 'Xerces2 Java Parser'> +<!ENTITY ParserNameLong 'Xerces2 Java XML Parser'> <!ENTITY ParserName 'Xerces-J'> <!ENTITY ParserVersion '@@VERSION@@'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/faq-grammars.xml new/xerces-2_12_2/docs/faq-grammars.xml --- old/xerces-2_12_1/docs/faq-grammars.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/faq-grammars.xml 2022-01-21 01:21:02.000000000 +0100 @@ -35,7 +35,7 @@ <code>org.apache.xerces.xni.grammars.Grammar</code> interface; simply differentiates objects that are Xerces grammars from other objects, as well as providing a means - to get at the location information (<code>XMLGrammarDescription</code>) for the grammar represented..</li> + to get at the location information (<code>XMLGrammarDescription</code>) for the grammar represented.</li> <li><code>XMLGrammarDescription</code>: defined by the <code>org.apache.xerces.xni.grammars.XMLGrammarDescription</code> interface, holds some basic location information common to all grammars. @@ -184,11 +184,11 @@ are instances of <code>org.apache.xerces.impl.dtd.XMLDTDDescription</code>.</li> <li>If their publicId or expandedSystemId fields are - non-null they must be identical;</li> + non-null they must be identical.</li> <li>If one of the descriptions has a root element defined, it must be the same as the root element defined in the other description, or be in the list of global - elements stored in that description;</li> + elements stored in that description.</li> <li>If neither has a root element defined, then they must share at least one global element declaration in common.</li> @@ -369,15 +369,15 @@ <link idref="api" anchor="xml-schema-api-documentation">API</link> docs for the <code>org.apache.xerces.xs</code> package. Assuming you have produced a Grammar object from an XML Schema - document by some means, to turn that object + document by some means. To turn that object into an object usable in this API, do the following: </p> <ol> <li> - Cast the Grammar object to <code>org.apache.xerces.xni.grammars.XSGrammar</code>; + Cast the Grammar object to <code>org.apache.xerces.xni.grammars.XSGrammar</code>. </li> <li> - Call the <code>toXSModel()</code> method on the casted object; + Call the <code>toXSModel()</code> method on the casted object. </li> <li> Use the methods in the <code>org.apache.xerces.xs.XSModel</code> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/faq-xcatalogs.xml new/xerces-2_12_2/docs/faq-xcatalogs.xml --- old/xerces-2_12_1/docs/faq-xcatalogs.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/faq-xcatalogs.xml 2022-01-21 01:21:02.000000000 +0100 @@ -40,7 +40,7 @@ XNI entity resolver, the (<code>org.xml.sax.EntityResolver</code>) SAX entity resolver and the (<code>org.w3c.dom.ls.LSResourceResolver</code>) DOM resource resolver interfaces. In <code>XMLCatalogResolver</code> the resolveEntity methods only query the - catalog for a mapping of the given identifier. These methods may be overrided if + catalog for a mapping of the given identifier. These methods may be overridden if other behaviour is required. </p> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/faq-xs.xml new/xerces-2_12_2/docs/faq-xs.xml --- old/xerces-2_12_1/docs/faq-xs.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/faq-xs.xml 2022-01-21 01:21:02.000000000 +0100 @@ -75,7 +75,12 @@ </document></source> <p>Review the sample file, 'data/personal.xsd' for an example of an XML Schema grammar.</p> - + We've also deployed an XML Schema validator service on a public web + site at <jump href="https://www.softwarebytes.org/xmlvalidation/">Online XML Schema validator service</jump>. + This online XML Schema validator service uses Xerces-J as backend, and supports both 1.0 and 1.1 versions + of the XML Schema language. Users may use this service, to test their XML Schema validation examples, + either with a goal to integrate XML schemas to their production applications or may be to learn the + XML Schema language. </a> </faq> <faq title="Using Entities and CDATA Sections"> @@ -99,22 +104,22 @@ <q>How an XPath 2.0 engine is used for XML Schema 1.1 assertions and CTAs?</q> <a> <p>XML Schema 1.1 assertions and CTAs require an XPath processor during evaluation. For XSD 1.1 assertions, - full <jump href="http://www.w3.org/TR/xpath20/">XPath 2.0</jump> support is required. For XSD 1.1 CTAs the XSD schema engines can + full <jump href="http://www.w3.org/TR/xpath20">XPath 2.0</jump> support is required. For XSD 1.1 CTAs the XSD schema engines can provide full XPath 2.0 support, or they can implement a <jump href="http://www.w3.org/TR/xmlschema11-1/#coss-ta">smaller XPath subset</jump> - as defined by the XSD 1.1 language. For CTAs Xerces uses the XSD 1.1 CTA XPath subset language by default, but can be made to use the full XPath 2.0 support by - setting the value of Xerces feature <code>http://apache.org/xml/features/validation/cta-full-xpath-checking</code> to 'true'. + as defined by the XSD 1.1 language. For CTAs Xerces uses the XSD 1.1 CTA XPath subset language by default, but can be made to use the + full XPath 2.0 support by setting the value of Xerces feature <code>http://apache.org/xml/features/validation/cta-full-xpath-checking</code> to 'true'. The native CTA XPath processor in Xerces-J was written for efficiency, so you will likely get better performance if your XPath expressions fall within the minimum subset defined by the XML Schema 1.1 specification. For full XPath 2.0 evaluation - (for XSD 1.1 assertions, and optionally for CTAs), Xerces-J uses the <jump href="http://wiki.eclipse.org/PsychoPathXPathProcessor">Eclipse/PsychoPath XPath 2.0 engine</jump>. - Xerces-J does bundle along a PsychoPath XPath 2.0 jar (which requires JDK 1.4 or later). + (for XSD 1.1 assertions, and optionally for CTAs), Xerces-J uses an <jump href="https://www.eclipse.org/webtools">XPath 2.0 engine</jump>. + Xerces-J does bundle along an XPath 2.0 engine jar for these features (that requires JDK 1.4 or later). </p> <p> We would like to acknowledge, work of following people for the XPath 2.0 support that comes with Xerces's XML Schema 1.1 processor: Andrea Bittau (responsible for the original design and implementation, of XPath 2.0 processor that's been used by Xerces. Andrea donated his XPath 2.0 processor to the Eclipse Foundation, that - Xerces uses.), Dave Carver (Dave helped to set up software infrastructure at Eclipse Foundation's Web Tools Platform project, + Xerces uses), Dave Carver (Dave helped to set up software infrastructure at Eclipse Foundation's Web Tools Platform project, for testing the XPath 2.0 processor as per W3C XPath 2.0 test suite. He also helped to improve compliance of - XPath 2.0 processor, to the W3C XPath 2.0 test suite by providing numerous bug fixes and implementation.), + XPath 2.0 processor, to the W3C XPath 2.0 test suite by providing numerous bug fixes and implementation), Jesper Steen Moeller (Jesper as an Eclipse's Web Tools Platform committer, helped to improve the implementation of the XPath 2.0 processor). </p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/install.xml new/xerces-2_12_2/docs/install.xml --- old/xerces-2_12_1/docs/install.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/install.xml 2022-01-21 01:21:02.000000000 +0100 @@ -84,7 +84,7 @@ <tr> <td>serializer.jar</td> <td>Jar file containing the Apache Xalan serializer. Currently - the serializer included in Xalan 2.7.1 is distributed with &ParserName;.</td> + the serializer included in Xalan 2.7.2 is distributed with &ParserName;.</td> </tr> <tr> <td>xercesImpl.jar</td> @@ -260,7 +260,7 @@ <tr> <td>serializer.jar</td> <td>Jar file containing the Apache Xalan serializer. Currently - the serializer included in Xalan 2.7.1 is distributed with &ParserName;.</td> + the serializer included in Xalan 2.7.2 is distributed with &ParserName;.</td> </tr> <tr> <td>serializer.LICENSE.txt</td> @@ -281,16 +281,16 @@ </tr> <tr> <td>xalan.jar</td> - <td>Jar file containing Apache Xalan 2.7.1 (required by + <td>Jar file containing Apache Xalan 2.7.2 (required by the Apache Stylebook for building the Xerces-J documentation)</td> </tr> <tr> <td>xalan.LICENSE.txt</td> - <td>License for Apache Xalan 2.7.1</td> + <td>License for Apache Xalan 2.7.2</td> </tr> <tr> <td>xalan.NOTICE.txt</td> - <td>NOTICE file for Apache Xalan 2.7.1</td> + <td>NOTICE file for Apache Xalan 2.7.2</td> </tr> <tr> <td>xercesImpl.jar</td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/readme.xml new/xerces-2_12_2/docs/readme.xml --- old/xerces-2_12_1/docs/readme.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/readme.xml 2022-01-21 01:21:02.000000000 +0100 @@ -34,8 +34,8 @@ </p> <p> 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) + "<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'> XML Schema</link> page. </p> @@ -64,8 +64,7 @@ </s2> <s2 title='Features of This Release'> <p> - The &ParserNameLong; &ParserVersion; supports the - following standards and APIs: + The &ParserNameLong; &ParserVersion; supports the following standards and APIs: </p> <ul> <li> @@ -137,6 +136,17 @@ (XSD): Component Designators</jump> (SCD) Candidate Recommendation (January 2010) </li> </ul> + From the above mentioned features, all the features mentioned except the last two (i.e XML Schema 1.1 and SCD + implementations), are available with both the following Xerces2 Java packages: + <ul> + <li>Xerces2 Java 2.12.2 - tar.gz / Xerces2 Java 2.12.2 - zip</li> + <li>Xerces2 Java 2.12.2 (XML Schema 1.1) - tar.gz / Xerces2 Java 2.12.2 (XML Schema 1.1) - zip</li> + </ul> + Whereas, the feature implementations for 'XML Schema 1.1' and 'XML Schema Definition Language (XSD): + Component Designators (SCD)', are available only within the Xerces2 Java package 'Xerces2 Java 2.12.2 + (XML Schema 1.1) - tar.gz / Xerces2 Java 2.12.2 (XML Schema 1.1) - zip'. Please visit the page + <jump href='http://xerces.apache.org/mirrors.cgi'>Xerces downloads</jump>, to download the Xerces2 + Java package that is needed. </s2> <s2 title='Backwards compatibility'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/releases.xml new/xerces-2_12_2/docs/releases.xml --- old/xerces-2_12_1/docs/releases.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/releases.xml 2022-01-21 01:21:02.000000000 +0100 @@ -15,9 +15,86 @@ * See the License for the specific language governing permissions and * limitations under the License. --> -<!-- $Id: releases.xml 1872100 2019-12-30 08:33:21Z mukulg $ --> +<!-- $Id: releases.xml 1897227 2022-01-20 04:44:56Z mukulg $ --> <!DOCTYPE releases SYSTEM 'dtd/releases.dtd'> <releases> + <release version='&ParserName; 2.12.2'> + <desc> + <p> + This release is a bug fix release. It fixes few bugs which were present in Xerces-J 2.12.1 + and also includes a few other minor enhancements. + </p> + </desc> + <changes> + <fix> + <note> + Implemented a fix, that solves rarely occurring XML parsing performance issue. + </note> + <submitter name='Michael Glavassevich'/> + </fix> + <fix> + <note> + Improved compliance, of XPath 2.0 processor's regex implementation (that's used + within XML Schema 1.1 implementation). + </note> + <submitter name='Mukul Gandhi'/> + </fix> + <fix> + <note> + XML Schema validation error message improvements, when XML attributes are validated. + </note> + <submitter name='Mukul Gandhi'/> + </fix> + <fix> + <note> + Improved the JAXP SourceValidator sample, related to XML Schema 1.1 assertion evaluations + on list types. + </note> + <submitter name='Mukul Gandhi'/> + </fix> + <fix> + <note> + Solved an XML Schema implementation issue, where combination of restrictions 'length' + and 'minLength' was leading to error. + </note> + <submitter name='Mukul Gandhi'/> + </fix> + <fix> + <note> + Made minor, improvements to few XML Schema 1.1 validation error messages. + </note> + <submitter name='Mukul Gandhi'/> + </fix> + <fix> + <note> + Fixed a rarely occurring issue during XML Schema 1.1 xs:assert evaluation, where adjacent text + values within XML instance document, were resulting in more than one adjacent XPath 2.0 text + nodes. + </note> + <submitter name='Mukul Gandhi, John Morris'/> + </fix> + <add> + <note> + Upgraded the minimum, Java requirement to use XercesJ to Java version 1.7. + </note> + <submitter name='XercesJ team'/> + </add> + <add> + <note> + Upgraded XalanJ serializer dependency to version 2.7.2 from 2.7.1, which is + required by XercesJ. + </note> + <submitter name='XercesJ team'/> + </add> + <add> + <note> + Re-built, "XML Commons External" and "XML Commons Resolver" codebases + (which are dependencies for XercesJ) using Java 1.7. + </note> + <submitter name='XercesJ team'/> + </add> + </changes> + </release> <release version='&ParserName; 2.12.1'> <desc> <p> @@ -51,19 +128,19 @@ </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). + When XML Schema 1.1 documents having xs:assert are used for XML document validation, for certain use cases + error messages appeared like following 'FOAR0001 - Division by zero'. Modified such error messages, to now + contain the character ':' instead of '-' (since, the character '-' may 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. + The 'XML Schema 1.1 structures' Recommendation 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> @@ -86,7 +163,7 @@ <note> Fixed minor bugs and made various improvements. </note> - <submitter name='Michael Glavassevich, Mukul Gandhi, Octavian Nadolu'/> + <submitter name='Mukul Gandhi, Michael Glavassevich, Octavian Nadolu'/> </fix> <add> <note> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/samples-jaxp.xml new/xerces-2_12_2/docs/samples-jaxp.xml --- old/xerces-2_12_1/docs/samples-jaxp.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/samples-jaxp.xml 2022-01-21 01:21:02.000000000 +0100 @@ -119,6 +119,27 @@ </td> </tr> <tr><td>-m | -M</td><td>Turn on/off memory usage report.</td></tr> + <tr> + <td>-xsd11</td> + <td> + Turn on/off XSD 1.1 support.<br/> + <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution. + </td> + </tr> + <tr> + <td>-fx</td> + <td> + Turn on/off full XPath 2.0 checks with CTA when working with XSD 1.1.<br/> + <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution. + </td> + </tr> + <tr> + <td>-acp</td> + <td> + Turn on/off assert comments and PI processing when working with XSD 1.1.<br/> + <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution. + </td> + </tr> <tr><td>-h</td><td>Display help screen.</td></tr> </table> </s3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/source-repository.xml new/xerces-2_12_2/docs/source-repository.xml --- old/xerces-2_12_1/docs/source-repository.xml 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/source-repository.xml 2022-01-21 01:21:02.000000000 +0100 @@ -51,8 +51,15 @@ svn co <jump href="https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_6_2">https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_6_2</jump> </source> - <p>You can also browse the repository and examine individual + <p>You may also browse above cited Xerces2 repository and examine individual files using the <jump href="http://svn.apache.org/viewcvs.cgi/xerces/java/trunk/">Web - interface</jump>.</p> + interface</jump>.</p> + <p> + Xerces2 also includes an XML Schema 1.1 processor. For some of its implementation, an XML Schema 1.1 + processor requires an XPath 2.0 engine. Apache Xerces in collaboration with <jump href="https://www.eclipse.org/webtools">Eclipse Foundation's Web + Tools Platform (WTP) project</jump>, has contributed to the development of an XPath 2.0 engine that is + used within XercesJ's XML Schema 1.1 processor. The XercesJ specific source code of this + XPath 2.0 engine, is located on following GitHub repository : <jump href="https://github.com/xercesj/xpath20">https://github.com/xercesj/xpath20</jump>. + </p> </s2> </s1> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/docs/style/stylesheets/document2html.xsl new/xerces-2_12_2/docs/style/stylesheets/document2html.xsl --- old/xerces-2_12_1/docs/style/stylesheets/document2html.xsl 2020-01-01 07:58:53.000000000 +0100 +++ new/xerces-2_12_2/docs/style/stylesheets/document2html.xsl 2022-01-21 01:21:02.000000000 +0100 @@ -31,8 +31,19 @@ <img width="29" height="60" src="resources/right.gif" hspace="0" vspace="0" border="0"/></td> </tr> <tr> - <td width="456" height="35" valign="top" align="left" colspan="4" bgcolor="#0086b2"> - <img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{s1/@title}"/></td> + <xsl:choose> + <xsl:when test="$id = 'index'"> + <!-- revisit : get the value 'Xerces2 Java XML Parser' from file entities.ent --> + <td align="center" bgcolor="#0086b2" colspan="4" height="35" valign="middle" width="456"> + <font color="#f8fefd" face="arial,helvetica,sanserif" size="+2">Xerces2 Java XML Parser Readme</font> + </td> + </xsl:when> + <xsl:otherwise> + <td width="456" height="35" valign="top" align="left" colspan="4" bgcolor="#0086b2"> + <img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{s1/@title}"/> + </td> + </xsl:otherwise> + </xsl:choose> </tr> <tr> <td width="168" height="20" valign="top" align="left"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/src/org/apache/xerces/impl/XML11EntityScanner.java new/xerces-2_12_2/src/org/apache/xerces/impl/XML11EntityScanner.java --- old/xerces-2_12_1/src/org/apache/xerces/impl/XML11EntityScanner.java 2020-01-01 07:58:47.000000000 +0100 +++ new/xerces-2_12_2/src/org/apache/xerces/impl/XML11EntityScanner.java 2022-01-21 01:21:00.000000000 +0100 @@ -35,7 +35,7 @@ * * @author Michael Glavassevich, IBM * @author Neil Graham, IBM - * @version $Id: XML11EntityScanner.java 1707341 2015-10-07 17:34:01Z mrglavas $ + * @version $Id: XML11EntityScanner.java 1897159 2022-01-17 20:48:22Z mrglavas $ */ public class XML11EntityScanner extends XMLEntityScanner { @@ -108,9 +108,11 @@ load(1, false); } if (c == '\r' && external) { - int cc = fCurrentEntity.ch[fCurrentEntity.position++]; - if (cc != '\n' && cc != 0x85) { - fCurrentEntity.position--; + if (fCurrentEntity.position < fCurrentEntity.count) { + int cc = fCurrentEntity.ch[fCurrentEntity.position++]; + if (cc != '\n' && cc != 0x85) { + fCurrentEntity.position--; + } } } c = '\n'; @@ -968,7 +970,7 @@ c = fCurrentEntity.ch[fCurrentEntity.position++]; // In internal entities control characters are allowed to appear unescaped. if ((c == quote && !fCurrentEntity.literal) - || c == '%' || !XML11Char.isXML11InternalEntityContent(c)) { + || c == '%' || !(XML11Char.isXML11InternalEntityContent(c) || c == '\r' )) { fCurrentEntity.position--; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/src/org/apache/xerces/impl/XMLEntityScanner.java new/xerces-2_12_2/src/org/apache/xerces/impl/XMLEntityScanner.java --- old/xerces-2_12_1/src/org/apache/xerces/impl/XMLEntityScanner.java 2020-01-01 07:58:49.000000000 +0100 +++ new/xerces-2_12_2/src/org/apache/xerces/impl/XMLEntityScanner.java 2022-01-21 01:21:00.000000000 +0100 @@ -37,7 +37,7 @@ * * @author Andy Clark, IBM * @author Neil Graham, IBM - * @version $Id: XMLEntityScanner.java 1707346 2015-10-07 17:46:10Z mrglavas $ + * @version $Id: XMLEntityScanner.java 1897159 2022-01-17 20:48:22Z mrglavas $ */ public class XMLEntityScanner implements XMLLocator { @@ -257,8 +257,10 @@ load(1, false); } if (c == '\r' && external) { - if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') { - fCurrentEntity.position--; + if (fCurrentEntity.position < fCurrentEntity.count) { + if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') { + fCurrentEntity.position--; + } } c = '\n'; } @@ -904,7 +906,7 @@ c = fCurrentEntity.ch[fCurrentEntity.position++]; if ((c == quote && (!fCurrentEntity.literal || external)) - || c == '%' || !XMLChar.isContent(c)) { + || c == '%' || !(XMLChar.isContent(c) || c == '\r' && !external)) { fCurrentEntity.position--; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java new/xerces-2_12_2/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java --- old/xerces-2_12_1/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java 2020-01-01 07:58:51.000000000 +0100 +++ new/xerces-2_12_2/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java 2022-01-21 01:21:01.000000000 +0100 @@ -59,7 +59,7 @@ * @author Sandy Gao, IBM * @author Neeraj Bajaj, Sun Microsystems, inc. * - * @version $Id: XSSimpleTypeDecl.java 1026362 2010-10-22 15:15:18Z sandygao $ + * @version $Id: XSSimpleTypeDecl.java 1891772 2021-07-24 11:51:11Z mukulg $ */ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo { @@ -1164,10 +1164,12 @@ // check 4.3.1.c1 error: fBase.length & (maxLength | minLength) if((fBase.fFacetsDefined & FACET_LENGTH) != 0 || (fFacetsDefined & FACET_LENGTH) != 0){ if ((fFacetsDefined & FACET_MINLENGTH) != 0){ - if (fBase.fLength < fMinLength) { - // fBase.length, minLength and maxLength defined + if ((fBase.fFacetsDefined & FACET_LENGTH) != 0 && fBase.fLength < fMinLength) { reportError("length-minLength-maxLength.1.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMinLength)}); } + if ((fFacetsDefined & FACET_LENGTH) != 0 && fLength < fMinLength) { + reportError("length-minLength-maxLength.1.1", new Object[]{fTypeName, Integer.toString(fLength), Integer.toString(fMinLength)}); + } if ((fBase.fFacetsDefined & FACET_MINLENGTH) == 0){ reportError("length-minLength-maxLength.1.2.a", new Object[]{fTypeName}); } @@ -1176,10 +1178,12 @@ } } if ((fFacetsDefined & FACET_MAXLENGTH) != 0){ - if (fBase.fLength > fMaxLength) { - // fBase.length, minLength and maxLength defined + if ((fBase.fFacetsDefined & FACET_LENGTH) != 0 && fBase.fLength > fMaxLength) { reportError("length-minLength-maxLength.2.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMaxLength)}); } + if ((fFacetsDefined & FACET_LENGTH) != 0 && fLength > fMaxLength) { + reportError("length-minLength-maxLength.2.1", new Object[]{fTypeName, Integer.toString(fLength), Integer.toString(fMaxLength)}); + } if ((fBase.fFacetsDefined & FACET_MAXLENGTH) == 0){ reportError("length-minLength-maxLength.2.2.a", new Object[]{fTypeName}); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties new/xerces-2_12_2/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties --- old/xerces-2_12_1/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties 2020-01-01 07:58:50.000000000 +0100 +++ new/xerces-2_12_2/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties 2022-01-21 01:21:00.000000000 +0100 @@ -18,7 +18,7 @@ # This file contains error and warning messages related to XML Schema # The messages are arranged in key and value tuples in a ListResourceBundle. # -# @version $Id: XMLSchemaMessages.properties 1869198 2019-10-31 05:21:00Z mukulg $ +# @version $Id: XMLSchemaMessages.properties 1894472 2021-10-22 10:17:43Z mukulg $ BadMessageKey = The error message corresponding to the message key can not be found. FormatFailed = An internal error occurred while formatting the following message:\n @@ -69,6 +69,7 @@ cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Element ''{0}'' does not have an attribute wildcard for attribute ''{1}''. cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attribute ''{1}'' is not allowed to appear in element ''{0}''. cvc-complex-type.4 = cvc-complex-type.4: Attribute ''{1}'' must appear on element ''{0}''. + cvc-complex-type.4_ns = cvc-complex-type.4: Attribute ''{1}'' belonging to namespace ''{2}'', must appear on element ''{0}''. cvc-complex-type.5.1 = cvc-complex-type.5.1: In element ''{0}'', attribute ''{1}'' is a Wild ID. But there is already a Wild ID ''{2}''. There can be only one. cvc-complex-type.5.2 = cvc-complex-type.5.2: In element ''{0}'', attribute ''{1}'' is a Wild ID. But there is already an attribute ''{2}'' derived from ID among the '{'attribute uses'}'. cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' is not a valid value for ''{1}''. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xerces-2_12_1/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java new/xerces-2_12_2/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java --- old/xerces-2_12_1/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java 2020-01-01 07:58:46.000000000 +0100 +++ new/xerces-2_12_2/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java 2022-01-21 01:21:00.000000000 +0100 @@ -107,7 +107,7 @@ * @author Elena Litani IBM * @author Andy Clark IBM * @author Neeraj Bajaj, Sun Microsystems, inc. - * @version $Id: XMLSchemaValidator.java 1871903 2019-12-22 06:45:03Z mukulg $ + * @version $Id: XMLSchemaValidator.java 1894472 2021-10-22 10:17:43Z mukulg $ */ public class XMLSchemaValidator implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper { @@ -3224,10 +3224,18 @@ // {required} is true matches one of the attribute information items in the element // information item's [attributes] as per clause 3.1 above. if (currUse.fUse == SchemaSymbols.USE_REQUIRED) { - if (!isSpecified) - reportSchemaError( - "cvc-complex-type.4", - new Object[] { element.rawname, currDecl.fName }); + if (!isSpecified) { + if (currDecl.fTargetNamespace != null) { + reportSchemaError( + "cvc-complex-type.4_ns", + new Object[] { element.rawname, currDecl.fName, currDecl.fTargetNamespace }); + } + else { + reportSchemaError( + "cvc-complex-type.4", + new Object[] { element.rawname, currDecl.fName }); + } + } } // if the attribute is not specified, then apply the value constraint if (!isSpecified && constType != XSConstants.VC_NONE) { ++++++ xercesImpl-2.12.1.pom -> xercesImpl-2.12.2.pom ++++++ --- /work/SRC/openSUSE:Factory/xerces-j2/xercesImpl-2.12.1.pom 2021-12-31 13:44:24.925263901 +0100 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new.1956/xercesImpl-2.12.2.pom 2022-02-13 19:50:53.766189262 +0100 @@ -3,17 +3,17 @@ <modelVersion>4.0.0</modelVersion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.12.1</version> + <version>2.12.2</version> <description> - 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. + 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. - The Apache Xerces2 parser is the reference implementation of XNI but other parser components, configurations, and parsers can be written using the Xerces Native Interface. For complete design and implementation documents, refer to the XNI Manual. + The Apache Xerces2 parser is the reference implementation of XNI but other parser components, configurations, and parsers can be written using the Xerces Native Interface. For complete design and implementation documents, refer to the XNI Manual. - Xerces2 is a fully conforming XML Schema 1.0 processor. A partial experimental implementation of the XML Schema 1.1 Structures and Datatypes Working Drafts (December 2009) and an experimental implementation of the XML Schema Definition Language (XSD): Component Designators (SCD) Candidate Recommendation (January 2010) are provided for evaluation. For more information, refer to the XML Schema page. + Xerces2 provides fully conforming XML Schema 1.0 and 1.1 processors. An experimental implementation of the "XML Schema Definition Language (XSD): Component Designators (SCD) Candidate Recommendation (January 2010)" is also provided for evaluation. For more information, refer to the XML Schema page. - Xerces2 also provides a complete implementation of the Document Object Model Level 3 Core and Load/Save W3C Recommendations and provides a complete implementation of the XML Inclusions (XInclude) W3C Recommendation. It also provides support for OASIS XML Catalogs v1.1. + Xerces2 also provides a complete implementation of the Document Object Model Level 3 Core and Load/Save W3C Recommendations and provides a complete implementation of the XML Inclusions (XInclude) W3C Recommendation. It also provides support for OASIS XML Catalogs v1.1. - Xerces2 is able to parse documents written according to the XML 1.1 Recommendation, except that it does not yet provide an option to enable normalization checking as described in section 2.13 of this specification. It also handles namespaces according to the XML Namespaces 1.1 Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save APIs are in use. + Xerces2 is able to parse documents written according to the XML 1.1 Recommendation, except that it does not yet provide an option to enable normalization checking as described in section 2.13 of this specification. It also handles namespaces according to the XML Namespaces 1.1 Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save APIs are in use. </description> <url>https://xerces.apache.org/xerces2-j/</url> <licenses> @@ -25,7 +25,7 @@ </licenses> <scm> <url>https://svn.apache.org/repos/asf/xerces/java/</url> - <connection>https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_12_1/</connection> + <connection>https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_12_2/</connection> </scm> <dependencies> <dependency>