Skip to content

Commit 7b0e00e

Browse files
hpoettkerfmbenhassine
authored andcommitted
Declare dependency on jettison as optional
1 parent 6b51408 commit 7b0e00e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@ project('spring-batch-core') {
283283
compile project(":spring-batch-infrastructure")
284284

285285
compile "com.fasterxml.jackson.core:jackson-databind:${jackson2Version}"
286-
compile ("org.codehaus.jettison:jettison:$jettisonVersion") {
287-
exclude group: 'stax', module: 'stax-api'
288-
}
289286
compile "org.springframework:spring-aop:$springVersion"
290287
compile "org.springframework:spring-beans:$springVersion"
291288
compile "org.springframework:spring-context:$springVersion"
@@ -305,6 +302,10 @@ project('spring-batch-core') {
305302
testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
306303
optional "com.ibm.jbatch:com.ibm.jbatch-tck-spi:$jbatchTckSpi"
307304
optional "com.thoughtworks.xstream:xstream:$xstreamVersion"
305+
compile("org.codehaus.jettison:jettison:$jettisonVersion") { dep ->
306+
optional dep
307+
exclude group: 'stax', module: 'stax-api'
308+
}
308309
optional "org.aspectj:aspectjrt:$aspectjVersion"
309310
optional "org.aspectj:aspectjweaver:$aspectjVersion"
310311
optional "org.springframework:spring-jdbc:$springVersion"
@@ -474,6 +475,9 @@ project('spring-batch-infrastructure-tests') {
474475
testCompile "org.apache.logging.log4j:log4j-api:$log4jVersion"
475476
testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion"
476477
testCompile "com.thoughtworks.xstream:xstream:$xstreamVersion"
478+
testCompile("org.codehaus.jettison:jettison:$jettisonVersion") {
479+
exclude group: 'stax', module: 'stax-api'
480+
}
477481
testCompile("com.fasterxml.woodstox:woodstox-core:$woodstoxVersion") {
478482
exclude group: 'stax', module: 'stax-api'
479483
}
@@ -591,6 +595,9 @@ project('spring-batch-samples') {
591595
compile "commons-io:commons-io:$commonsIoVersion"
592596
compile "org.apache.commons:commons-dbcp2:$commonsDdbcpVersion"
593597
compile "com.thoughtworks.xstream:xstream:$xstreamVersion"
598+
compile("org.codehaus.jettison:jettison:$jettisonVersion") {
599+
exclude group: 'stax', module: 'stax-api'
600+
}
594601
compile("com.fasterxml.woodstox:woodstox-core:$woodstoxVersion") {
595602
exclude group: 'stax', module: 'stax-api'
596603
}

0 commit comments

Comments
 (0)