diff --git a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle index 9423a90a9..396395428 100644 --- a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle +++ b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle @@ -16,6 +16,7 @@ repositories { releasesOnly() } content { + includeGroup "com.github.css4j" includeGroup "io.sf.carte" includeGroup "io.sf.jclf" } diff --git a/echosvg-all/build.gradle b/echosvg-all/build.gradle index 726afd9e2..3fd2fe92c 100644 --- a/echosvg-all/build.gradle +++ b/echosvg-all/build.gradle @@ -20,7 +20,6 @@ dependencies { extraJavaModuleInfo { failOnMissingModuleInfo.set(false) - automaticModule('xalan:xalan', 'xalan') automaticModule('org.apache.xmlgraphics:xmlgraphics-commons', 'xmlgraphics.commons') } diff --git a/echosvg-bridge/build.gradle b/echosvg-bridge/build.gradle index 791a165bc..de5cf56af 100644 --- a/echosvg-bridge/build.gradle +++ b/echosvg-bridge/build.gradle @@ -8,16 +8,12 @@ dependencies { api project(':echosvg-gvt') api project(':echosvg-script') api project(':echosvg-svg-dom') - api ("xalan:xalan:${xalanVersion}") { - exclude group: 'xml-apis', module: 'xml-apis' - } implementation "xml-apis:xml-apis:$xmlApisVersion" api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" } extraJavaModuleInfo { failOnMissingModuleInfo.set(false) - automaticModule('xalan:xalan', 'xalan') automaticModule('org.apache.xmlgraphics:xmlgraphics-commons', 'xmlgraphics.commons') } diff --git a/echosvg-bridge/src/main/java/module-info.java b/echosvg-bridge/src/main/java/module-info.java index 3fcdfa379..1fdf9cb04 100644 --- a/echosvg-bridge/src/main/java/module-info.java +++ b/echosvg-bridge/src/main/java/module-info.java @@ -31,7 +31,6 @@ requires transitive io.sf.carte.echosvg.parser; requires io.sf.carte.echosvg.constants; requires io.sf.carte.echosvg.i18n; - requires xalan; requires xmlgraphics.commons; provides io.sf.carte.echosvg.script.InterpreterFactory diff --git a/echosvg-dom/build.gradle b/echosvg-dom/build.gradle index 57d739b3c..b7d9491b6 100644 --- a/echosvg-dom/build.gradle +++ b/echosvg-dom/build.gradle @@ -7,9 +7,7 @@ dependencies { api project(':echosvg-css') api project(':echosvg-ext') api project(':echosvg-xml') - api ("xalan:xalan:${xalanVersion}") { - exclude group: 'xml-apis', module: 'xml-apis' - } + api "com.github.css4j:echoxsl:${echoXslVersion}" implementation "xml-apis:xml-apis:$xmlApisVersion" api "io.sf.carte:xml-dtd:${xmlDtdVersion}" api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}" @@ -18,7 +16,6 @@ dependencies { extraJavaModuleInfo { failOnMissingModuleInfo.set(false) automaticModule('org.apache.xmlgraphics:xmlgraphics-commons', 'xmlgraphics.commons') - automaticModule('xalan:xalan', 'xalan') } description = 'io.sf.carte:echosvg-dom' diff --git a/echosvg-dom/src/main/java/module-info.java b/echosvg-dom/src/main/java/module-info.java index effc961f6..e993fbccb 100644 --- a/echosvg-dom/src/main/java/module-info.java +++ b/echosvg-dom/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires transitive java.xml; requires transitive jdk.xml.dom; requires io.sf.carte.xml.dtd; - requires xalan; + requires com.github.css4j.echoxsl; uses org.xml.sax.XMLReader; uses io.sf.carte.echosvg.dom.DomExtension; diff --git a/gradle.properties b/gradle.properties index f6916966c..d7430bc8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ css4jVersion=3.7.2 xmlDtdVersion=4.0.0 rhinoVersion=1.7.14 svgomVersion=1.0.1 -xalanVersion=2.7.2 +echoXslVersion=2.7.2 xmlApisVersion=1.4.01 xmlgraphicsCommonsVersion=2.6 junitVersion=4.13.2