Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated for java11 and clojure 1.10.0 with JAXB Runtime from Glassfish #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
(defproject clj-docx "0.0.3"
:description "Wrapper for docx4j"
:dependencies [[org.clojure/clojure "1.5.1"]
[org.docx4j/docx4j "2.8.1"]])
:dependencies [[org.clojure/clojure "1.10.0"]
[org.docx4j/docx4j "6.1.2"]
[javax.xml.bind/jaxb-api "2.3.1"]
[org.glassfish.jaxb/jaxb-runtime "2.3.2"]])
4 changes: 2 additions & 2 deletions src/clj_docx/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
(org.docx4j.wml Body P R Br Text STBrType)
(org.docx4j XmlUtils))
(:require
[clojure.java.io :refer [input-stream resource]]))
[clojure.java.io :refer [input-stream resource file]]))

(defn load-wordml-pkg [filename]
"Loads up a WordML Package object from a file"
(WordprocessingMLPackage/load (-> filename resource input-stream)))
(WordprocessingMLPackage/load (file filename)))

(defn extract-body-from-pkg
"Extracts Body from a WordML Package"
Expand Down