@@ -249,18 +249,14 @@ project('spring-batch-core') {
249
249
compile " org.springframework:spring-tx:$springVersion "
250
250
251
251
testCompile " org.springframework:spring-test:$springVersion "
252
- testCompile(" org.mockito:mockito-core:$mockitoVersion " ) {
253
- exclude group :' org.hamcrest' , module :' hamcrest-core'
254
- }
252
+ testCompile " org.mockito:mockito-core:$mockitoVersion "
255
253
testCompile " javax.inject:javax.inject:$javaxInjectVersion "
256
254
testCompile " org.hsqldb:hsqldb:$hsqldbVersion "
257
255
testCompile " com.h2database:h2:$h2databaseVersion "
258
256
testCompile " commons-io:commons-io:$commonsIoVersion "
259
257
testCompile " commons-dbcp:commons-dbcp:$commonsDdbcpVersion "
260
- testCompile(" junit:junit:${ junitVersion} " ) {
261
- exclude group :' org.hamcrest' , module :' hamcrest-core'
262
- }
263
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
258
+ testCompile " junit:junit:${ junitVersion} "
259
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
264
260
optional " org.aspectj:aspectjrt:$aspectjVersion "
265
261
optional " org.aspectj:aspectjweaver:$aspectjVersion "
266
262
optional " org.springframework:spring-jdbc:$springVersion "
@@ -295,15 +291,11 @@ project('spring-batch-infrastructure') {
295
291
testCompile " com.h2database:h2:$h2databaseVersion "
296
292
testCompile " org.apache.derby:derby:$derbyVersion "
297
293
testCompile " org.springframework:spring-test:$springVersion "
298
- testCompile(" junit:junit:${ junitVersion} " ) {
299
- exclude group :' org.hamcrest' , module :' hamcrest-core'
300
- }
301
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
294
+ testCompile " junit:junit:${ junitVersion} "
295
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
302
296
testCompile " org.aspectj:aspectjrt:$aspectjVersion "
303
297
testCompile " org.aspectj:aspectjweaver:$aspectjVersion "
304
- testCompile(" org.mockito:mockito-core:$mockitoVersion " ) {
305
- exclude group :' org.hamcrest' , module :' hamcrest-core'
306
- }
298
+ testCompile " org.mockito:mockito-core:$mockitoVersion "
307
299
testCompile " org.xerial:sqlite-jdbc:$sqliteVersion "
308
300
309
301
testRuntime " com.sun.mail:javax.mail:$javaMailVersion "
@@ -372,10 +364,8 @@ project('spring-batch-core-tests') {
372
364
testCompile " org.hsqldb:hsqldb:$hsqldbVersion "
373
365
testCompile " commons-io:commons-io:$commonsIoVersion "
374
366
testCompile " org.apache.derby:derby:$derbyVersion "
375
- testCompile(" junit:junit:${ junitVersion} " ) {
376
- exclude group :' org.hamcrest' , module :' hamcrest-core'
377
- }
378
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
367
+ testCompile " junit:junit:${ junitVersion} "
368
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
379
369
testCompile " log4j:log4j:$log4jVersion "
380
370
testCompile " org.springframework:spring-test:$springVersion "
381
371
testCompile " org.springframework:spring-jdbc:$springVersion "
@@ -409,10 +399,8 @@ project('spring-batch-infrastructure-tests') {
409
399
testCompile " org.apache.derby:derby:$derbyVersion "
410
400
testCompile " org.apache.activemq:activemq-broker:$activemqVersion "
411
401
testCompile " org.apache.activemq:activemq-kahadb-store:$activemqVersion "
412
- testCompile(" junit:junit:${ junitVersion} " ) {
413
- exclude group :' org.hamcrest' , module :' hamcrest-core'
414
- }
415
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
402
+ testCompile " junit:junit:${ junitVersion} "
403
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
416
404
testCompile " org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1"
417
405
testCompile " xmlunit:xmlunit:$xmlunitVersion "
418
406
testCompile (" org.codehaus.castor:castor-xml:$castorVersion " ) {
@@ -431,9 +419,7 @@ project('spring-batch-infrastructure-tests') {
431
419
}
432
420
testCompile " org.springframework:spring-jdbc:$springVersion "
433
421
testCompile " org.springframework:spring-test:$springVersion "
434
- testCompile(" org.mockito:mockito-core:$mockitoVersion " ) {
435
- exclude group :' org.hamcrest' , module :' hamcrest-core'
436
- }
422
+ testCompile " org.mockito:mockito-core:$mockitoVersion "
437
423
438
424
optional " org.slf4j:slf4j-log4j12:$slf4jVersion "
439
425
optional " org.apache.ibatis:ibatis-sqlmap:$ibatisVersion "
@@ -464,10 +450,8 @@ project('spring-batch-test') {
464
450
dependencies {
465
451
compile project(" :spring-batch-core" )
466
452
467
- compile(" junit:junit:${ junitVersion} " ) {
468
- exclude group :' org.hamcrest' , module :' hamcrest-core'
469
- }
470
- compile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
453
+ compile " junit:junit:${ junitVersion} "
454
+ compile " org.hamcrest:hamcrest-library:$hamcrestVersion "
471
455
compile " org.springframework:spring-test:$springVersion "
472
456
compile " org.springframework:spring-jdbc:$springVersion "
473
457
compile " commons-io:commons-io:$commonsIoVersion "
@@ -498,10 +482,8 @@ project('spring-batch-integration') {
498
482
499
483
testCompile " org.apache.activemq:activemq-broker:$activemqVersion "
500
484
testCompile " org.apache.activemq:activemq-kahadb-store:$activemqVersion "
501
- testCompile(" junit:junit:${ junitVersion} " ) {
502
- exclude group :' org.hamcrest' , module :' hamcrest-core'
503
- }
504
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
485
+ testCompile " junit:junit:${ junitVersion} "
486
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
505
487
testCompile " org.aspectj:aspectjrt:$aspectjVersion "
506
488
testCompile " org.aspectj:aspectjweaver:$aspectjVersion "
507
489
testCompile " commons-dbcp:commons-dbcp:$commonsDdbcpVersion "
@@ -510,11 +492,10 @@ project('spring-batch-integration') {
510
492
testCompile " org.apache.derby:derby:$derbyVersion "
511
493
testCompile " org.hsqldb:hsqldb:$hsqldbVersion "
512
494
testCompile " org.springframework:spring-test:$springVersion "
513
- testCompile(" org.mockito:mockito-core:$mockitoVersion " ) {
514
- exclude group :' org.hamcrest' , module :' hamcrest-core'
515
- }
495
+ testCompile " org.mockito:mockito-core:$mockitoVersion "
516
496
testCompile(" org.springframework.integration:spring-integration-test:$springIntegrationVersion " ) {
517
497
exclude group : ' junit' , module : ' junit-dep'
498
+ exclude group :' org.hamcrest' , module :' hamcrest-all'
518
499
}
519
500
testCompile " org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion "
520
501
@@ -566,18 +547,14 @@ project('spring-batch-samples') {
566
547
567
548
testCompile " xmlunit:xmlunit:$xmlunitVersion "
568
549
testCompile project(" :spring-batch-test" )
569
- testCompile(" junit:junit:${ junitVersion} " ) {
570
- exclude group :' org.hamcrest' , module :' hamcrest-core'
571
- }
572
- testCompile(" org.hamcrest:hamcrest-all:$hamcrestVersion " )
550
+ testCompile " junit:junit:${ junitVersion} "
551
+ testCompile " org.hamcrest:hamcrest-library:$hamcrestVersion "
573
552
testCompile " org.hsqldb:hsqldb:$hsqldbVersion "
574
553
testCompile " log4j:log4j:$log4jVersion "
575
554
testCompile " org.codehaus.groovy:groovy:$groovyVersion "
576
555
testCompile " org.codehaus.groovy:groovy-ant:$groovyVersion "
577
556
testCompile " org.springframework:spring-test:$springVersion "
578
- testCompile(" org.mockito:mockito-core:$mockitoVersion " ) {
579
- exclude group :' org.hamcrest' , module :' hamcrest-core'
580
- }
557
+ testCompile " org.mockito:mockito-core:$mockitoVersion "
581
558
582
559
testRuntime " com.sun.mail:javax.mail:$javaMailVersion "
583
560
0 commit comments