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.

Sign up for GitHub

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

Update to Apache FOP 2.5 #864

Merged
merged 2 commits into from
Nov 21, 2021
Merged

Update to Apache FOP 2.5 #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7337de4
Update to Apache FOP 2.5
sixlettervariables Jan 13, 2021
2a5e8ba
Merge branch 'master' into update-fop-2-5
Windchild292 Nov 21, 2021
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
17 changes: 10 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions src/megameklab/com/printing/PrintRecordSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down