Skip to content

Commit

Permalink
[26340] update docx4j lib dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
huthomas committed May 22, 2024
1 parent 69cdd36 commit 204f66a
Show file tree
Hide file tree
Showing 38 changed files with 43 additions and 47 deletions.
31 changes: 16 additions & 15 deletions bundles/at.medevit.elexis.text.docx/.classpath
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/docx4j-JAXB-ReferenceImpl-11.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/wmf2svg-0.9.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/error_prone_annotations-2.23.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/fontbox-3.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta.activation-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta.xml.bind-api-4.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-core-4.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-4.0.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-svg11-11.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-compress-1.26.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-core-11.4.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-JAXB-ReferenceImpl-11.4.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-11.4.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-pml-11.4.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-sml-11.4.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xalan-interpretive-11.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xalan-serializer-11.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-core-11.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-11.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-pml-11.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/docx4j-openxml-objects-sml-11.2.9.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/jaxb-svg11-1.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/checker-qual-2.8.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-compress-1.18.jar"/>
<classpathentry exported="true" kind="lib" path="lib/error_prone_annotations-2.3.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.9.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.9.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mbassador-1.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/stringtemplate-3.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/wmf2svg-0.9.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.3.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
37 changes: 17 additions & 20 deletions bundles/at.medevit.elexis.text.docx/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,26 @@ Require-Bundle: ch.rgw.utility;bundle-version="3.9.100",
org.apache.commons.lang3;bundle-version="3.12.0",
org.apache.commons.codec;bundle-version="1.14.0",
com.sun.xml.bind.jaxb-osgi;bundle-version="2.3.4"
Import-Package: javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.util,
org.apache.commons.io,
org.apache.commons.logging,
Import-Package: org.apache.commons.logging,
org.slf4j
Bundle-ClassPath: .,
lib/antlr-runtime-3.5.2.jar,
lib/checker-qual-2.8.1.jar,
lib/commons-compress-1.18.jar,
lib/error_prone_annotations-2.3.3.jar,
lib/httpclient-4.5.8.jar,
lib/jackson-core-2.9.9.jar,
lib/jackson-databind-2.9.9.jar,
lib/mbassador-1.3.2.jar,
lib/stringtemplate-3.2.1.jar,
lib/wmf2svg-0.9.8.jar,
lib/xmlgraphics-commons-2.3.jar,
lib/jaxb-svg11-1.0.2.jar,
lib/xalan-interpretive-11.0.0.jar,
lib/xalan-serializer-11.0.0.jar,
lib/docx4j-core-11.2.9.jar,
lib/docx4j-openxml-objects-11.2.9.jar,
lib/docx4j-openxml-objects-pml-11.2.9.jar,
lib/docx4j-openxml-objects-sml-11.2.9.jar,
lib/docx4j-JAXB-ReferenceImpl-11.2.9.jar
lib/docx4j-core-11.4.11.jar,
lib/docx4j-JAXB-ReferenceImpl-11.4.11.jar,
lib/docx4j-openxml-objects-11.4.11.jar,
lib/docx4j-openxml-objects-pml-11.4.11.jar,
lib/docx4j-openxml-objects-sml-11.4.11.jar,
lib/commons-compress-1.26.1.jar,
lib/commons-io-2.16.1.jar,
lib/error_prone_annotations-2.23.0.jar,
lib/fontbox-3.0.0.jar,
lib/jakarta.activation-2.0.1.jar,
lib/jakarta.xml.bind-api-4.0.1.jar,
lib/jaxb-core-4.0.4.jar,
lib/jaxb-impl-4.0.4.jar,
lib/jaxb-svg11-11.4.0.jar,
lib/wmf2svg-0.9.11.jar,
lib/xmlgraphics-commons-2.9.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import java.math.BigInteger;
import java.util.List;

import javax.xml.bind.JAXBElement;

import org.docx4j.jaxb.Context;
import org.docx4j.model.structure.PageDimensions;
import org.docx4j.model.structure.SectionWrapper;
Expand All @@ -25,6 +23,8 @@
import org.jvnet.jaxb2_commons.ppp.Child;
import org.slf4j.LoggerFactory;

import jakarta.xml.bind.JAXBElement;

public class DocxUtil {

static org.docx4j.wml.ObjectFactory wmlObjectFactory = Context.getWmlObjectFactory();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package at.medevit.elexis.text.docx.util;

import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.xml.bind.JAXBElement;

import org.apache.commons.lang3.StringUtils;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
import org.docx4j.utils.TraversalUtilVisitor;
import org.docx4j.wml.P;
Expand All @@ -18,6 +16,7 @@

import ch.elexis.core.data.interfaces.text.ReplaceCallback;
import ch.elexis.core.model.IImage;
import jakarta.xml.bind.JAXBElement;

public class RegexTextVisitor extends TraversalUtilVisitor<Text> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import java.math.BigInteger;
import java.util.List;

import javax.xml.bind.JAXBException;

import org.docx4j.UnitsOfMeasurement;
import org.docx4j.XmlUtils;
import org.docx4j.jaxb.Context;
Expand All @@ -26,6 +24,7 @@
import org.docx4j.wml.Tr;

import ch.elexis.core.ui.text.ITextPlugin;
import jakarta.xml.bind.JAXBException;

public class TableUtil {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import java.util.List;
import java.util.Optional;

import javax.xml.bind.JAXBElement;

import org.docx4j.TraversalUtil;
import org.docx4j.UnitsOfMeasurement;
import org.docx4j.com.microsoft.schemas.office.word.x2010.wordprocessingShape.CTTextboxInfo;
Expand Down Expand Up @@ -46,6 +44,8 @@
import org.docx4j.wml.RPr;
import org.docx4j.wml.Text;

import jakarta.xml.bind.JAXBElement;

public class TextBoxUtil {

static org.docx4j.wml.ObjectFactory wmlObjectFactory = Context.getWmlObjectFactory();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package at.medevit.elexis.text.docx.util;

import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import javax.xml.bind.JAXBElement;

import org.apache.commons.lang3.StringUtils;
import org.docx4j.jaxb.Context;
import org.docx4j.wml.P;
import org.docx4j.wml.R;
import org.docx4j.wml.RPr;
import org.docx4j.wml.Text;
import org.jvnet.jaxb2_commons.ppp.Child;

import jakarta.xml.bind.JAXBElement;

public class TextUtil {

static org.docx4j.wml.ObjectFactory wmlObjectFactory = Context.getWmlObjectFactory();
Expand Down

0 comments on commit 204f66a

Please sign in to comment.