Skip to content

batik: update usage of svg libraries #2966

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

Merged
robinschmid merged 1 commit into from
Oct 31, 2025
Merged

batik: update usage of svg libraries #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.gradle.jvmargs=-Xmx2048M
org.gradle.jvmargs=-XX:MaxRAMPercentage=80
10 changes: 3 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,8 @@ msdk-netcdf = { module = "io.github.msdk:msdk-io-netcdf", version.ref = "msdk" }

sirius-api = { module = "io.sirius-ms:sirius-sdk", version = "3.1+sirius6.3.3" }

#batik-xml-commons = {group = "org.apache.xmlcommons", name="xml-apis", version="1.4.01"} # somohow not included but required https://repository.everit.biz/nexus/content/groups/public/
batik-xml-commons-ext = { group = "org.apache.xmlcommons", name = "xml-apis-ext", version = "1.4.01" } # somohow not included but required https://repository.everit.biz/nexus/content/groups/public/
batik-anim = { group = "org.apache.xmlgraphics", name = "batik-anim", version.ref = "batik" }
batik-swing = { group = "org.apache.xmlgraphics", name = "batik-swing", version.ref = "batik" }
batik-svggen = { group = "org.apache.xmlgraphics", name = "batik-svggen", version.ref = "batik" }
#batik-all = { group = "org.apache.xmlgraphics", name = "batik-all", version.ref = "batik" }
# we could use individual packages, but some dependencies use batik-all anyway. this way we make sure we at least get the latest version
batik-all = { group = "org.apache.xmlgraphics", name = "batik-all", version.ref = "batik" }
guava = { group = "com.google.guava", name = "guava", version = "33.0.0-jre" }

commons-io = { group = "commons-io", name = "commons-io", version = "2.15.1" }
Expand Down Expand Up @@ -136,7 +132,7 @@ poi = ["poi", "poi-ooxml"]
okhttp = ["okhttp", "okhttp-logging-interceptor"]
junit-mockito = ["junit-jupiter", "junit-platform", "mockito"]
jackson = ["jackson-annotations", "jackson-core", "jackson-databind", "jackson-dataformat-csv", "jackson-datetime", "jackson-datatype"]
batik = ["batik-anim", "batik-svggen", "batik-swing", "batik-xml-commons-ext"] #, "batik-xml-commons"]
batik = ["batik-all"]#, "batik-xml-commons-ext"] #, "batik-xml-commons"]

[plugins]
semver = { id = "net.thauvin.erik.gradle.semver", version.ref = "semver" }
Expand Down
17 changes: 0 additions & 17 deletions mzmine-community/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ repositories {
// maven { url = "https://nexus.nuiton.org/nexus/content/groups/releases/" }
// For jimzml
// maven { url = "https://mvnrepository.com/artifact/com.alanmrace/jimzmlparser" }

// for batik-xml-commons-ext package (svg export)
maven { url = "https://repository.everit.biz/nexus/content/groups/public/" }
}

ext {
Expand Down Expand Up @@ -229,22 +226,8 @@ dependencies {
implementation (libs.sirius.api)
}

/*
* Remove the xml-apis dependencies to avoid a compilation error in Eclipse.
* The org.w3c.dom package is present in the java.xml module as well as in these dependencies.
* That is illegal (https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928).
*/
configurations.all {
exclude group: "xml-apis", module: "xml-apis"
exclude group: "xml-apis", module: "xml-apis-ext"
exclude group: "xom", module: "xom"
exclude group: "ch.qos.logback", module: "logback-core"
exclude group: "ch.qos.logback", module: "logback-classic"
exclude group: "gurobi", module: "gurobi-linux64"
exclude group: "cplex", module: "cplex"
exclude group: "org.checkerframework", module: "checker-qual"
exclude group: "javax.annotation", module: "javax.annotation-api"
exclude group: "log4j", module: "log4j" // exclude from ADAP packages old version
}


Expand Down
Loading
Loading