From feaf3ce6243d9ba8c05f0e15e3a0d311a68b430d Mon Sep 17 00:00:00 2001 From: Martin Lopez Date: Tue, 25 Nov 2025 16:17:37 -0300 Subject: [PATCH 1/2] chore: ignore resources --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2cb2d6b..a3a6941 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ target .settings .project .classpath +.eclipse +.vaadin webpack.generated.js package-lock.json package.json From 59dc068762b0ddf617f501e1d55efcf566e822a3 Mon Sep 17 00:00:00 2001 From: Martin Lopez Date: Tue, 25 Nov 2025 16:33:16 -0300 Subject: [PATCH 2/2] build: exclude jaxb-core Exclude jaxb-code transitive dependency to avoid duplicate problem. Close #187 --- pom.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c474c5e..da65a69 100644 --- a/pom.xml +++ b/pom.xml @@ -150,10 +150,16 @@ 11.5.0 - org.docx4j - docx4j-JAXB-MOXy - 11.5.0 - + org.docx4j + docx4j-JAXB-MOXy + 11.5.0 + + + com.sun.xml.bind + jaxb-core + + + org.docx4j docx4j-export-fo