Skip to content

Declare dependency on jettison as optional #4196

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.

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
merged 1 commit into from
Sep 22, 2022
Merged
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,6 @@ project('spring-batch-core') {
compile project(":spring-batch-infrastructure")

compile "com.fasterxml.jackson.core:jackson-databind:${jackson2Version}"
compile ("org.codehaus.jettison:jettison:$jettisonVersion") {
exclude group: 'stax', module: 'stax-api'
}
compile "org.springframework:spring-aop:$springVersion"
compile "org.springframework:spring-beans:$springVersion"
compile "org.springframework:spring-context:$springVersion"
Expand All @@ -305,6 +302,10 @@ project('spring-batch-core') {
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
optional "com.ibm.jbatch:com.ibm.jbatch-tck-spi:$jbatchTckSpi"
optional "com.thoughtworks.xstream:xstream:$xstreamVersion"
compile("org.codehaus.jettison:jettison:$jettisonVersion") { dep ->
optional dep
exclude group: 'stax', module: 'stax-api'
}
optional "org.aspectj:aspectjrt:$aspectjVersion"
optional "org.aspectj:aspectjweaver:$aspectjVersion"
optional "org.springframework:spring-jdbc:$springVersion"
Expand Down Expand Up @@ -474,6 +475,9 @@ project('spring-batch-infrastructure-tests') {
testCompile "org.apache.logging.log4j:log4j-api:$log4jVersion"
testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion"
testCompile "com.thoughtworks.xstream:xstream:$xstreamVersion"
testCompile("org.codehaus.jettison:jettison:$jettisonVersion") {
exclude group: 'stax', module: 'stax-api'
}
testCompile("com.fasterxml.woodstox:woodstox-core:$woodstoxVersion") {
exclude group: 'stax', module: 'stax-api'
}
Expand Down Expand Up @@ -591,6 +595,9 @@ project('spring-batch-samples') {
compile "commons-io:commons-io:$commonsIoVersion"
compile "org.apache.commons:commons-dbcp2:$commonsDdbcpVersion"
compile "com.thoughtworks.xstream:xstream:$xstreamVersion"
compile("org.codehaus.jettison:jettison:$jettisonVersion") {
exclude group: 'stax', module: 'stax-api'
}
compile("com.fasterxml.woodstox:woodstox-core:$woodstoxVersion") {
exclude group: 'stax', module: 'stax-api'
}
Expand Down