update to org.docx4j:docx4j-JAXB-ReferenceImpl:11.4.9

vsch · May 2, 2023 · 237b1b0 · 237b1b0
1 parent dff663d
commit 237b1b0
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 23 deletions.
diff --git a/.idea/libraries/apache_xmlgraphics_commons.xml b/.idea/libraries/apache_xmlgraphics_commons.xml
diff --git a/.idea/libraries/docx4j_JAXB_ReferenceImpl.xml b/.idea/libraries/docx4j_JAXB_ReferenceImpl.xml
diff --git a/VERSION.md b/VERSION.md
@@ -117,6 +117,9 @@
 
 ## 0.64.4
 
+* Change: update to `org.docx4j:docx4j-JAXB-ReferenceImpl:11.4.9`, if you have code using
+  `javax.xml.bind` package from the dependency, you will need to change it to
+  `jakarta.xml.bind`. Global search/replace across the project will do it.
 * Add: `ResizableImageExtension` documentation that it does not play with the rest of the
   library renderers and is an unsupported extension.
 * Fix: update log4j1 to log4j2 to 2.20.0

diff --git a/flexmark-docx-converter/flexmark-docx-converter.iml b/flexmark-docx-converter/flexmark-docx-converter.iml
@@ -63,5 +63,6 @@
     <orderEntry type="library" name="apache.logging.log4j.core" level="project" />
     <orderEntry type="library" name="apache.logging.log4j.api" level="project" />
     <orderEntry type="library" name="apache.logging.log4j.1.2.api" level="project" />
+    <orderEntry type="library" name="apache.xmlgraphics.commons" level="project" />
   </component>
 </module>
diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.docx4j</groupId>
             <artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
-            <version>11.3.2</version>
+            <version>11.4.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/...rter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java b/...rter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java
@@ -68,7 +68,7 @@
 import org.docx4j.wml.*;
 import org.jetbrains.annotations.NotNull;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.awt.image.BufferedImage;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;

diff --git a/...erter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java b/...erter/src/main/java/com/vladsch/flexmark/docx/converter/util/BinaryPartAbstractImage.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.awt.geom.Dimension2D;
 import java.io.File;
 import java.io.IOException;

diff --git a/...ocx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java b/...ocx-converter/src/main/java/com/vladsch/flexmark/docx/converter/util/DocxContextImpl.java
@@ -22,7 +22,7 @@
 import org.docx4j.wml.R.FootnoteRef;
 import org.docx4j.wml.R.Separator;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;