diff --git a/build.gradle b/build.gradle index 59c9feed7..e01a2e95b 100644 --- a/build.gradle +++ b/build.gradle @@ -65,17 +65,20 @@ configurations { dependencies { implementation "org.megamek:megamek${mmBranchTag}:${version}" - implementation 'org.apache.xmlgraphics:batik-dom:1.10' - implementation 'org.apache.xmlgraphics:batik-codec:1.10' - implementation 'org.apache.xmlgraphics:batik-rasterizer:1.10' - implementation ('org.apache.xmlgraphics:batik-bridge:1.10') { + implementation 'org.apache.xmlgraphics:batik-dom:1.13' + implementation 'org.apache.xmlgraphics:batik-codec:1.13' + implementation 'org.apache.xmlgraphics:batik-rasterizer:1.13' + implementation ('org.apache.xmlgraphics:batik-bridge:1.13') { // We don't need the python and javascript engine taking up space exclude group: 'org.python', module: 'jython' exclude group: 'org.mozilla', module: 'rhino' } - implementation 'org.apache.xmlgraphics:batik-svggen:1.10' - implementation 'org.apache.xmlgraphics:fop:2.3' - implementation 'org.apache.pdfbox:pdfbox:2.0.19' + implementation 'org.apache.xmlgraphics:batik-svggen:1.13' + implementation ('org.apache.xmlgraphics:fop:2.5') { + // We don't need this proprietary module + exclude group: 'com.sun.media', module: 'jai-codec' + } + implementation 'org.apache.pdfbox:pdfbox:2.0.22' } mainClassName = 'megameklab.com.MegaMekLab' diff --git a/src/megameklab/com/printing/PrintRecordSheet.java b/src/megameklab/com/printing/PrintRecordSheet.java index 8ac144079..7b7ac5eeb 100644 --- a/src/megameklab/com/printing/PrintRecordSheet.java +++ b/src/megameklab/com/printing/PrintRecordSheet.java @@ -18,9 +18,9 @@ import megameklab.com.MegaMekLab; import megameklab.com.printing.reference.ReferenceTable; import megameklab.com.util.CConfig; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; +import org.apache.fop.configuration.DefaultConfigurationBuilder; import org.apache.batik.anim.dom.SVGDOMImplementation; import org.apache.batik.anim.dom.SVGLocatableSupport; import org.apache.batik.bridge.BridgeContext;