Skip to content

Commit

Permalink
Update FOP to 2.5, batik to 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonesde
jonesde committed Jul 17, 2020
1 parent c2a67e2 commit 89976ef
Showing 1 changed file with 113 additions and 9 deletions.
122 changes: 113 additions & 9 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,37 @@ dependencies {
compile project(':framework')

// Apache PDFBox
compile ('org.apache.pdfbox:pdfbox:2.0.18') // Apache 2.0
compile ('org.apache.pdfbox:pdfbox:2.0.20') // Apache 2.0

// Apache FOP - Apache 2.0
// NOTE: in Apache FOP 2.4 the dependencies are really messed up, includes redundant fop-core, fop-events, fop-url
compile ('org.apache.xmlgraphics:fop-events:2.4') {
// NOTE: in Apache FOP 2.5 the dependencies are really messed up, includes redundant fop-core, fop-events, fop-url
compile ('org.apache.xmlgraphics:fop-events:2.5') {
exclude group: 'org.apache.ant'
}
compile ('org.apache.xmlgraphics:fop-util:2.4')
compile ('org.apache.xmlgraphics:fop-core:2.4') {
compile ('org.apache.xmlgraphics:fop-util:2.5')
compile ('org.apache.xmlgraphics:fop-core:2.5') {
exclude group: 'xalan'
exclude group: 'xml-apis' // can't exclude batik-ext but has some same classes as xml-apis so exclude that
exclude group: 'org.apache.ant'
exclude group: 'javax.servlet'
exclude group: 'javax.media'
exclude group: 'com.sun.media'
}
compile ('org.apache.xmlgraphics:batik-transcoder:1.12') {
compile ('org.apache.xmlgraphics:batik-transcoder:1.13') {
exclude group: 'xalan'
exclude group: 'org.mozilla'
exclude group: 'org.python'
}
compile ('org.apache.xmlgraphics:batik-constants:1.12') {
compile ('org.apache.xmlgraphics:batik-constants:1.13') {
exclude group: 'org.mozilla'
exclude group: 'org.python'
}
compile ('org.apache.xmlgraphics:batik-i18n:1.12') {
compile ('org.apache.xmlgraphics:batik-i18n:1.13') {
exclude group: 'org.mozilla'
exclude group: 'org.python'
}

// NOTE: in theory Apache Avalon is not required for FOP 2.4, but getting runtime errors without it
// NOTE: in theory Apache Avalon is not required for FOP 2.5, but getting runtime errors without it
compile group: 'org.apache.avalon.framework', name: 'avalon-framework-api', version: '4.3.1'
compile group: 'org.apache.avalon.framework', name: 'avalon-framework-impl', version: '4.3.1'

Expand Down Expand Up @@ -120,6 +120,110 @@ For convenience since FOP dependencies are always so messed up:
gradle runtime:component:moqui-fop:dependencies
FOP 2.5:
+--- org.apache.xmlgraphics:fop-core:2.5
| +--- org.apache.xmlgraphics:batik-anim:1.13
| | +--- org.apache.xmlgraphics:batik-awt-util:1.13
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-util:1.13
| | | | +--- org.apache.xmlgraphics:batik-constants:1.13
| | | | | \--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | | +--- org.apache.xmlgraphics:batik-i18n:1.13
| | | | | \--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | | \--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | \--- org.apache.xmlgraphics:xmlgraphics-commons:2.4 (*)
| | +--- org.apache.xmlgraphics:batik-css:1.13
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:xmlgraphics-commons:2.4 (*)
| | | \--- xml-apis:xml-apis-ext:1.3.04
| | +--- org.apache.xmlgraphics:batik-dom:1.13
| | | +--- org.apache.xmlgraphics:batik-css:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-ext:1.13
| | | | \--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-xml:1.13
| | | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | | \--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | | +--- xml-apis:xml-apis:1.4.01
| | | \--- xml-apis:xml-apis-ext:1.3.04
| | +--- org.apache.xmlgraphics:batik-ext:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-parser:1.13
| | | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-xml:1.13 (*)
| | | \--- xml-apis:xml-apis-ext:1.3.04
| | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | +--- org.apache.xmlgraphics:batik-svg-dom:1.13
| | | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-css:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-dom:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-ext:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-parser:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | | \--- xml-apis:xml-apis-ext:1.3.04
| | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | \--- xml-apis:xml-apis-ext:1.3.04
| +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| +--- org.apache.xmlgraphics:batik-bridge:1.13
| | +--- org.apache.xmlgraphics:batik-anim:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-css:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-dom:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-gvt:1.13
| | | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | \--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-parser:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-script:1.13
| | | +--- org.apache.xmlgraphics:batik-anim:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | \--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | +--- org.apache.xmlgraphics:batik-svg-dom:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-xml:1.13 (*)
| | +--- org.apache.xmlgraphics:xmlgraphics-commons:2.4 (*)
| | \--- xml-apis:xml-apis-ext:1.3.04
| +--- org.apache.xmlgraphics:batik-extension:1.13
| | +--- org.apache.xmlgraphics:batik-anim:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-bridge:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-css:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-dom:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-ext:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-gvt:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-parser:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | +--- org.apache.xmlgraphics:batik-svg-dom:1.13 (*)
| | \--- org.apache.xmlgraphics:batik-util:1.13 (*)
| +--- org.apache.xmlgraphics:batik-gvt:1.13 (*)
| +--- org.apache.xmlgraphics:batik-transcoder:1.13
| | +--- org.apache.xmlgraphics:batik-anim:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-bridge:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-dom:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-gvt:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | +--- org.apache.xmlgraphics:batik-svggen:1.13
| | | +--- org.apache.xmlgraphics:batik-awt-util:1.13 (*)
| | | +--- org.apache.xmlgraphics:batik-shared-resources:1.13
| | | \--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-util:1.13 (*)
| | +--- org.apache.xmlgraphics:batik-xml:1.13 (*)
| | \--- xml-apis:xml-apis-ext:1.3.04
| +--- org.apache.xmlgraphics:fop-events:2.5 (*)
| +--- org.apache.xmlgraphics:fop-util:2.5 (*)
| +--- org.apache.xmlgraphics:xmlgraphics-commons:2.4 (*)
| +--- commons-io:commons-io:1.3.1 -> 2.7
| +--- commons-logging:commons-logging:1.0.4 -> 1.2
| \--- org.apache.pdfbox:fontbox:2.0.16 -> 2.0.20 (*)
FOP 2.4:
+--- org.apache.xmlgraphics:fop:2.4
| +--- org.apache.xmlgraphics:fop-util:2.4
Expand Down

0 comments on commit 89976ef

Please sign in to comment.