From 376d075e7226264ec6c43802c20f6f51286cc743 Mon Sep 17 00:00:00 2001 From: elharo Date: Sun, 19 Jul 2026 12:30:54 +0000 Subject: [PATCH 1/2] Update VersionNotSupported error message to include XML 1.1 [XERCESJ-841] The error message for unsupported XML versions now says 'only XML 1.0 and XML 1.1 are supported' instead of 'only XML 1.0 is supported'. Removed the now-redundant VersionNotSupported11 message key and getVersionNotSupportedKey() overrides in the XML 1.1 scanner subclasses. --- src/org/apache/xerces/impl/XML11DTDScannerImpl.java | 7 ------- src/org/apache/xerces/impl/XML11DocumentScannerImpl.java | 7 ------- src/org/apache/xerces/impl/msg/XMLMessages.properties | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java index c8c39d2bcb..c114104cb0 100644 --- a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java @@ -244,11 +244,4 @@ protected boolean versionSupported(String version) { return version.equals("1.1") || version.equals ("1.0"); } // versionSupported(String): boolean - // returns the error message key for unsupported - // versions of XML with respect to the version of - // XML understood by this scanner. - protected String getVersionNotSupportedKey () { - return "VersionNotSupported11"; - } // getVersionNotSupportedKey: String - } // class XML11DTDScannerImpl diff --git a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java index 8ff483b7e0..baedf70470 100644 --- a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java @@ -539,11 +539,4 @@ protected boolean versionSupported(String version) { return (version.equals("1.1") || version.equals("1.0")); } // versionSupported(String): boolean - // returns the error message key for unsupported - // versions of XML with respect to the version of - // XML understood by this scanner. - protected String getVersionNotSupportedKey () { - return "VersionNotSupported11"; - } // getVersionNotSupportedKey: String - } // class XML11DocumentScannerImpl diff --git a/src/org/apache/xerces/impl/msg/XMLMessages.properties b/src/org/apache/xerces/impl/msg/XMLMessages.properties index b936b33f2f..e1ef524008 100644 --- a/src/org/apache/xerces/impl/msg/XMLMessages.properties +++ b/src/org/apache/xerces/impl/msg/XMLMessages.properties @@ -105,8 +105,7 @@ PI_NOT_IN_ONE_ENTITY = The processing instruction is not enclosed in the same entity. # 2.8 Prolog and Document Type Declaration VersionInfoInvalid = Invalid version \"{0}\". - VersionNotSupported = XML version \"{0}\" is not supported, only XML 1.0 is supported. - VersionNotSupported11 = XML version \"{0}\" is not supported, only XML 1.0 and XML 1.1 are supported. + VersionNotSupported = XML version \"{0}\" is not supported, only XML 1.0 and XML 1.1 are supported. # 4.1 Character and Entity References DigitRequiredInCharRef = A decimal representation must immediately follow the \"&#\" in a character reference. HexdigitRequiredInCharRef = A hexadecimal representation must immediately follow the \"&#x\" in a character reference. From 2496acd588da5ba2b0150eb3d4d2f89be7583bdf Mon Sep 17 00:00:00 2001 From: elharo Date: Sun, 19 Jul 2026 12:38:15 +0000 Subject: [PATCH 2/2] Revert VersionNotSupported consolidation The two separate messages are correct: - VersionNotSupported (XML 1.0 scanners): only XML 1.0 is supported - VersionNotSupported11 (XML 1.1 scanners): both XML 1.0 and 1.1 are supported Each scanner correctly reports what it supports. --- src/org/apache/xerces/impl/XML11DTDScannerImpl.java | 7 +++++++ src/org/apache/xerces/impl/XML11DocumentScannerImpl.java | 7 +++++++ src/org/apache/xerces/impl/msg/XMLMessages.properties | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java index c114104cb0..c8c39d2bcb 100644 --- a/src/org/apache/xerces/impl/XML11DTDScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DTDScannerImpl.java @@ -244,4 +244,11 @@ protected boolean versionSupported(String version) { return version.equals("1.1") || version.equals ("1.0"); } // versionSupported(String): boolean + // returns the error message key for unsupported + // versions of XML with respect to the version of + // XML understood by this scanner. + protected String getVersionNotSupportedKey () { + return "VersionNotSupported11"; + } // getVersionNotSupportedKey: String + } // class XML11DTDScannerImpl diff --git a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java index baedf70470..8ff483b7e0 100644 --- a/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java +++ b/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java @@ -539,4 +539,11 @@ protected boolean versionSupported(String version) { return (version.equals("1.1") || version.equals("1.0")); } // versionSupported(String): boolean + // returns the error message key for unsupported + // versions of XML with respect to the version of + // XML understood by this scanner. + protected String getVersionNotSupportedKey () { + return "VersionNotSupported11"; + } // getVersionNotSupportedKey: String + } // class XML11DocumentScannerImpl diff --git a/src/org/apache/xerces/impl/msg/XMLMessages.properties b/src/org/apache/xerces/impl/msg/XMLMessages.properties index e1ef524008..b936b33f2f 100644 --- a/src/org/apache/xerces/impl/msg/XMLMessages.properties +++ b/src/org/apache/xerces/impl/msg/XMLMessages.properties @@ -105,7 +105,8 @@ PI_NOT_IN_ONE_ENTITY = The processing instruction is not enclosed in the same entity. # 2.8 Prolog and Document Type Declaration VersionInfoInvalid = Invalid version \"{0}\". - VersionNotSupported = XML version \"{0}\" is not supported, only XML 1.0 and XML 1.1 are supported. + VersionNotSupported = XML version \"{0}\" is not supported, only XML 1.0 is supported. + VersionNotSupported11 = XML version \"{0}\" is not supported, only XML 1.0 and XML 1.1 are supported. # 4.1 Character and Entity References DigitRequiredInCharRef = A decimal representation must immediately follow the \"&#\" in a character reference. HexdigitRequiredInCharRef = A hexadecimal representation must immediately follow the \"&#x\" in a character reference.