CMR-5387: Reverted the use of xslt v2.0 in common-lib so that legacy …

…services can still use xslt v1.0
doug-newman-nasa · Jan 21, 2019 · a57bdf6 · a57bdf6
1 parent f43a9dd
commit a57bdf6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/common-lib/project.clj b/common-lib/project.clj
@@ -28,7 +28,6 @@
     [environ "1.1.0"]
     [instaparse "1.4.10"]
     [net.jpountz.lz4/lz4 "1.3.0"]
-    [net.sf.saxon/Saxon-HE "9.9.0-2"]
     [org.clojure/clojure "1.10.0"]
     [org.clojure/core.async "0.4.490"]
     [org.clojure/core.cache "0.7.2"]

diff --git a/common-lib/src/cmr/common/xml/xslt.clj b/common-lib/src/cmr/common/xml/xslt.clj
@@ -5,8 +5,7 @@
   (:import
    (java.io StringReader StringWriter)
    (javax.xml.transform TransformerFactory Templates URIResolver)
-   (javax.xml.transform.stream StreamSource StreamResult)
-   (net.sf.saxon TransformerFactoryImpl)))
+   (javax.xml.transform.stream StreamSource StreamResult)))
 
 (defn- create-uri-resolver
   "Creates an instance of the URIResolver interface that will direct all paths within the xslt
@@ -22,7 +21,7 @@
   [f]
   (with-open [r (io/reader f)]
     (let [xsl-resource (StreamSource. r)
-          factory (TransformerFactoryImpl.)]
+          factory (TransformerFactory/newInstance)]
       (.setURIResolver factory (create-uri-resolver))
       (.newTemplates factory xsl-resource))))
 

diff --git a/ingest-app/project.clj b/ingest-app/project.clj
@@ -24,6 +24,7 @@
     [nasa-cmr/cmr-transmit-lib "0.1.0-SNAPSHOT"]
     [nasa-cmr/cmr-umm-lib "0.1.0-SNAPSHOT"]
     [nasa-cmr/cmr-umm-spec-lib "0.1.0-SNAPSHOT"]
+    [net.sf.saxon/Saxon-HE "9.9.0-2"]
     [org.apache.httpcomponents/httpclient "4.5.6"]
     [org.apache.httpcomponents/httpcore "4.4.10"]
     [org.clojure/clojure "1.10.0"]