commit d335d0239dd05ab2f12e276ce6858f6993836a06
author Aurélien Pupier <apupier@redhat.com> Mon Jan 04 12:09:11 2021 +0100
committer Nitin Dahyabhai <thatnitind@gmail.com> Sat Jan 16 03:23:35 2021 -0500
tree 265f6767cd75178d63bf107a31cdf4bcbd167c49
parent a8ca144309a03f8aada83464a2af2d866421bfe5

[566183] Upgrade xerces dependency to a Java 11 compatible version

Change-Id: I6fa6c9aae4d2457923cad27fb43ace6295aa40b1
Signed-off-by: Aurélien Pupier <apupier@redhat.com>

xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF

diff --git a/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
index fb7e1fc..6c265ef 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -310,7 +310,7 @@
  org.eclipse.wst.xml.core.text
 Import-Package: com.ibm.icu.util; version="3.8",
  com.ibm.icu.text; version="3.8"
-Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.apache.xerces;bundle-version="[2.12.1,3.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.filebuffers;bundle-version="[3.6.200,4.0.0)";resolution:=optional,
@@ -324,5 +324,5 @@
  org.eclipse.wst.common.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0)"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.core.internal.contenttype"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.wst.xml.core

xml/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java

diff --git a/xml/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java b/xml/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
index 0841cec..f35bc13 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
+++ b/xml/bundles/org.eclipse.wst.xml.core/src-validation/org/eclipse/wst/xml/core/internal/validation/XMLValidator.java
@@ -868,7 +868,8 @@
             /* (non-Javadoc)
              * @see org.apache.xerces.impl.XMLErrorReporter#reportError(java.lang.String, java.lang.String, java.lang.Object[], short)
              */
-            public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
+    		@Override
+            public String reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
             {
 		      boolean reportError = true;
               valinfo.setCurrentErrorKey(key);  
@@ -903,8 +904,13 @@
               }          
 		      if (reportError)
 		      {
-		        super.reportError(domain, key, arguments, severity);
+		        String formattedError = super.reportError(domain, key, arguments, severity);
 		        valinfo.getErrorCustomizationManager().considerReportedError(valinfo, key, arguments);
+		        return formattedError;
+		      }
+		      else
+		      {
+		    	return null;
 		      }
 		    }
 		};