Skip to content

chore: update xalan:xalan to 2.7.3 #5880

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
vlsi merged 1 commit into from
May 5, 2023
Merged

chore: update xalan:xalan to 2.7.3 #5880

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
1 change: 1 addition & 0 deletions checksum.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
<trusted-key id='fa1703b1d287caea3a60f931e0130a3ed5a2079e' group='org.webjars' />
<trusted-key id='4c5f68d09d42ba7fac888df9a929ea2321fdbf8f' group='org.xmlresolver' />
<trusted-key id='ce8075a251547bee249bc151a2115ae15f6b8b72' group='org.xmlunit' />
<trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xalan' />
<trusted-key id='e5b8247af8a619a28f90fdfc9ff25980f5ba7e4f' group='xalan' />
<trusted-key id='6cb87b18a453990eac9453f87d713008cc07e9ad' group='xerces' />
<trusted-key id='2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb' group='xml-apis' />
Expand Down
4 changes: 2 additions & 2 deletions src/bom-thirdparty/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ dependencies {
api("org.slf4j:jcl-over-slf4j:1.7.36")
api("org.slf4j:slf4j-api:1.7.36")
api("oro:oro:2.0.8")
api("xalan:serializer:2.7.2")
api("xalan:xalan:2.7.2")
api("xalan:serializer:2.7.3")
api("xalan:xalan:2.7.3")
api("xerces:xercesImpl:2.12.2")
api("xml-apis:xml-apis:1.4.01")
api("xmlpull:xmlpull:1.1.3.1")
Expand Down
6 changes: 6 additions & 0 deletions src/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ dependencies {
api("xalan:xalan") {
because("PropertiesBasedPrefixResolver extends PrefixResolverDefault")
}
api("xalan:serializer") {
because("Xalan 2.7.3 misses xalan:serializer dependency in pom.xml, see https://issues.apache.org/jira/browse/XALANJ-2649")
}
api("xml-apis:xml-apis") {
because("Xalan 2.7.3 misses xml-apis:xml-apis dependency in pom.xml, see https://issues.apache.org/jira/browse/XALANJ-2649")
}
// Note: Saxon should go AFTER xalan so xalan XSLT is used
// org.apache.jmeter.util.XPathUtilTest.testFormatXmlSimple assumes xalan transformer
api("net.sf.saxon:Saxon-HE") {
Expand Down
7 changes: 7 additions & 0 deletions src/licenses/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
expectedLicense = SimpleLicense("Java HTML Tidy License", uri("http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95"))
effectiveLicense = SpdxLicense.BSD_3_Clause
}
// Xalan 2.7.3 misses license, see https://issues.apache.org/jira/browse/XALANJ-2650
overrideLicense("xalan:xalan") {
effectiveLicense = SpdxLicense.Apache_2_0
}
overrideLicense("xalan:serializer") {
effectiveLicense = SpdxLicense.Apache_2_0
}
}

val renderLicenseForSource by tasks.registering(Apache2LicenseRenderer::class) {
Expand Down