[FOray-commit] SF.net SVN: foray:[11816] trunk/foray

[<vic...@us...>]

Revision: 11816
          http://sourceforge.net/p/foray/code/11816
Author:   victormote
Date:     2021-01-17 23:01:33 +0000 (Sun, 17 Jan 2021)
Log Message:
-----------
Remove no-longer needed dependency on Xerces.

Modified Paths:
--------------
    trunk/foray/foray-graphic/build.gradle
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java
    trunk/foray/master/build.gradle

Modified: trunk/foray/foray-graphic/build.gradle
===================================================================
--- trunk/foray/foray-graphic/build.gradle	2021-01-17 22:51:43 UTC (rev 11815)
+++ trunk/foray/foray-graphic/build.gradle	2021-01-17 23:01:33 UTC (rev 11816)
@@ -3,7 +3,6 @@
 dependencies {
     api group: 'org.slf4j',               name: 'slf4j-api',           version: slf4jVersion
     api group: 'commons-io',              name: 'commons-io',          version: commonsIoVersion
-    api group: 'xerces',                  name: 'xercesImpl',          version: xercesVersion
     api group: 'org.apache.xmlgraphics',  name: 'xmlgraphics-commons', version: xmlgraphicsCommonsVersion
     api group: 'org.apache.xmlgraphics',  name: 'batik-bridge',        version: batikVersion
     api group: 'org.apache.xmlgraphics',  name: 'batik-gvt',           version: batikVersion

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java	2021-01-17 22:51:43 UTC (rev 11815)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java	2021-01-17 23:01:33 UTC (rev 11816)
@@ -30,7 +30,7 @@
 
 import org.foray.common.MathMlUtil;
 
-import org.apache.xerces.dom.DocumentImpl;
+import org.apache.batik.dom.GenericDocument;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
@@ -43,7 +43,7 @@
 /**
  * An implementation of the DOM MathMLDocument interface.
  */
-public final class MathMlDocument4a extends DocumentImpl  implements MathMLDocument {
+public final class MathMlDocument4a extends GenericDocument  implements MathMLDocument {
 
     /** Constant needed for serialization. */
     private static final long serialVersionUID = -2103887514402824538L;
@@ -75,10 +75,8 @@
      * See {@link #getReferrer()}.
      * See {@link #makeDocumentType()}.
      */
-    private MathMlDocument4a(final DocumentType documentType,
-            final String referrer, final String domain, final String uri) {
-        super(documentType);
-//        super(new MathBase(new HashMap<ParameterKey, String>()));
+    private MathMlDocument4a(final DocumentType documentType, final String referrer, final String domain,
+            final String uri) {
         this.referrer = referrer;
         this.domain = domain;
         this.uri = uri;

Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle	2021-01-17 22:51:43 UTC (rev 11815)
+++ trunk/foray/master/build.gradle	2021-01-17 23:01:33 UTC (rev 11816)
@@ -41,7 +41,6 @@
     ext.xmlResolverVersion = '1.2'                // Latest is 1.2          as of 2021-01-12. See Note 4.
     ext.antVersion = '1.9.15'                     // Latest is 1.10.9       as of 2021-01-12. See Note 5.
     ext.servletApiVersion = '3.1.0'               // Latest is 4.0.1        as of 2021-01-12. See Note 6.
-    ext.xercesVersion = '2.12.1'                  // Latest is 2.12.1       as of 2021-01-12.
     ext.xmlgraphicsCommonsVersion = '2.4'         // Latest is 2.4          as of 2021-01-12.
     ext.batikVersion = '1.13'                     // Latest is 1.13         as of 2021-01-12.
     ext.jeuclidVersion = '3.0.3'                  // Latest is 3.1.9        as of 2021-01-12. See Note 7.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.