@@ -67,31 +67,30 @@ subprojects { subproject ->
67
67
targetCompatibility= 1.6
68
68
69
69
ext {
70
- activeMqVersion = ' 5.9 .0'
71
- aspectjVersion = ' 1.8.0 '
70
+ activeMqVersion = ' 5.10 .0'
71
+ aspectjVersion = ' 1.8.2 '
72
72
apacheSshdVersion = ' 0.10.1'
73
- boonVersion = ' 0.22 '
73
+ boonVersion = ' 0.25 '
74
74
commonsDbcpVersion = ' 1.4'
75
75
commonsIoVersion = ' 2.4'
76
76
commonsNetVersion = ' 3.3'
77
- httpClientVersion = ' 3.1'
78
- derbyVersion = ' 10.10.1.1'
77
+ derbyVersion = ' 10.10.2.0'
79
78
eclipseLinkVersion = ' 2.4.2'
80
79
ftpServerVersion = ' 1.0.6'
81
- groovyVersion = ' 2.3.1 '
80
+ groovyVersion = ' 2.3.6 '
82
81
guavaVersion = ' 16.0.1'
83
82
hamcrestVersion = ' 1.3'
84
- hibernateVersion = ' 4.2.11 .Final'
83
+ hibernateVersion = ' 4.3.6 .Final'
85
84
hsqldbVersion = ' 2.3.2'
86
- h2Version = ' 1.3.175 '
87
- jackson2Version = ' 2.3 .2'
85
+ h2Version = ' 1.4.180 '
86
+ jackson2Version = ' 2.4 .2'
88
87
javaxActivationVersion = ' 1.1.1'
89
- javaxMailVersion = ' 1.4.7 '
90
- jedisVersion = ' 2.4 .2'
91
- jettyVersion = ' 9.2.1.v20140609 '
88
+ javaxMailVersion = ' 1.5.2 '
89
+ jedisVersion = ' 2.5 .2'
90
+ jettyVersion = ' 9.2.2.v20140723 '
92
91
jmsApiVersion = ' 1.1-rev-1'
93
92
jpaApiVersion = ' 2.0.0'
94
- jrubyVersion = ' 1.7.12 '
93
+ jrubyVersion = ' 1.7.15 '
95
94
jschVersion = ' 0.1.51'
96
95
jsonpathVersion = ' 0.9.1'
97
96
junitVersion = ' 4.11'
@@ -105,18 +104,17 @@ subprojects { subproject ->
105
104
reactorVersion = ' 1.1.4.RELEASE'
106
105
reactorSpringVersion = ' 1.1.3.RELEASE'
107
106
romeToolsVersion = ' 1.5.0'
108
- romeVersion = ' 1.0.0'
109
107
saajApiVersion = ' 1.3.5'
110
108
saajImplVersion = ' 1.3.23'
111
109
servletApiVersion = ' 3.1.0'
112
110
slf4jVersion = " 1.7.6"
113
111
smack3Version = ' 3.2.1'
114
112
smackVersion = ' 4.0.0'
115
113
springAmqpVersion = project. hasProperty(' springAmqpVersion' ) ? project. springAmqpVersion : ' 1.4.0.M1'
116
- springDataMongoVersion = ' 1.5 .0.RELEASE'
117
- springDataRedisVersion = ' 1.3 .0.RELEASE'
118
- springGemfireVersion = ' 1.4 .0.RELEASE'
119
- springSecurityVersion = ' 3.2.4 .RELEASE'
114
+ springDataMongoVersion = ' 1.6 .0.RELEASE'
115
+ springDataRedisVersion = ' 1.4 .0.RELEASE'
116
+ springGemfireVersion = ' 1.5 .0.RELEASE'
117
+ springSecurityVersion = ' 3.2.5 .RELEASE'
120
118
springSocialTwitterVersion = ' 1.1.0.RELEASE'
121
119
springRetryVersion = ' 1.1.1.RELEASE'
122
120
springVersion = project. hasProperty(' springVersion' ) ? project. springVersion : ' 4.1.0.RELEASE'
@@ -224,7 +222,6 @@ project('spring-integration-amqp') {
224
222
description = ' Spring Integration AMQP Support'
225
223
dependencies {
226
224
compile project(" :spring-integration-core" )
227
- compile " org.springframework:spring-tx:$springVersion "
228
225
compile(" org.springframework.amqp:spring-rabbit:$springAmqpVersion " ) {
229
226
exclude group : ' org.springframework' , module : ' spring-aop'
230
227
exclude group : ' org.springframework' , module : ' spring-context'
@@ -258,27 +255,21 @@ project('spring-integration-event') {
258
255
description = ' Spring Integration ApplicationEvent Support'
259
256
dependencies {
260
257
compile project(" :spring-integration-core" )
261
- compile " org.springframework:spring-context:$springVersion "
262
258
}
263
259
}
264
260
265
261
project(' spring-integration-feed' ) {
266
262
description = ' Spring Integration RSS Feed Support'
267
263
dependencies {
268
264
compile project(" :spring-integration-core" )
269
- compile " org.springframework:spring-context:$springVersion "
270
- compile (" net.java.dev.rome:rome-fetcher:$romeVersion " ) {
271
- exclude group : ' junit' , module : ' junit'
272
- }
273
- compile " net.java.dev.rome:rome:$romeVersion "
265
+ compile " com.rometools:rome-fetcher:$romeToolsVersion "
274
266
}
275
267
}
276
268
277
269
project(' spring-integration-file' ) {
278
270
description = ' Spring Integration File Support'
279
271
dependencies {
280
272
compile project(" :spring-integration-core" )
281
- compile " org.springframework:spring-context:$springVersion "
282
273
compile " commons-io:commons-io:$commonsIoVersion "
283
274
testCompile project(" :spring-integration-redis" )
284
275
testCompile project(" :spring-integration-redis" ). sourceSets. test. output
@@ -314,7 +305,6 @@ project('spring-integration-gemfire') {
314
305
exclude group : ' org.springframework' , module : ' spring-core'
315
306
exclude group : ' org.springframework' , module : ' spring-tx'
316
307
}
317
- compile " org.springframework:spring-tx:$springVersion "
318
308
testCompile project(" :spring-integration-stream" )
319
309
320
310
}
@@ -336,24 +326,15 @@ project('spring-integration-http') {
336
326
dependencies {
337
327
compile project(" :spring-integration-core" )
338
328
compile " org.springframework:spring-webmvc:$springVersion "
339
- compile(" net.java.dev.rome:rome-fetcher:$romeVersion " ) {
340
- optional
341
- exclude group : ' junit' , module : ' junit'
342
- }
343
-
344
- compile(" com.rometools:rome:$romeToolsVersion " , optional) // For spring-web-4.1
345
-
329
+ compile(" com.rometools:rome:$romeToolsVersion " , optional)
346
330
compile(" javax.servlet:javax.servlet-api:$servletApiVersion " , provided)
347
-
348
- testCompile " commons-httpclient:commons-httpclient:$httpClientVersion "
349
331
}
350
332
}
351
333
352
334
project(' spring-integration-ip' ) {
353
335
description = ' Spring Integration IP Support'
354
336
dependencies {
355
337
compile project(" :spring-integration-core" )
356
- compile " org.springframework:spring-context:$springVersion "
357
338
testCompile project(" :spring-integration-stream" )
358
339
}
359
340
}
@@ -362,15 +343,13 @@ project('spring-integration-jdbc') {
362
343
description = ' Spring Integration JDBC Support'
363
344
dependencies {
364
345
compile project(" :spring-integration-core" )
365
- compile " org.springframework:spring-aop:$springVersion "
366
346
compile " org.springframework:spring-jdbc:$springVersion "
367
- compile " org.springframework:spring-tx:$springVersion "
368
347
compile " com.google.guava:guava:$guavaVersion "
348
+
369
349
testCompile " com.h2database:h2:$h2Version "
370
350
testCompile " org.hsqldb:hsqldb:$hsqldbVersion "
371
351
testCompile " org.apache.derby:derby:$derbyVersion "
372
352
testCompile " org.apache.derby:derbyclient:$derbyVersion "
373
-
374
353
testCompile " postgresql:postgresql:$postgresVersion "
375
354
testCompile " mysql:mysql-connector-java:$mysqlVersion "
376
355
testCompile " commons-dbcp:commons-dbcp:$commonsDbcpVersion "
@@ -386,7 +365,6 @@ project('spring-integration-jms') {
386
365
dependencies {
387
366
compile project(" :spring-integration-core" )
388
367
compile " org.springframework:spring-jms:$springVersion "
389
- compile " org.springframework:spring-tx:$springVersion "
390
368
compile (" javax.jms:jms-api:$jmsApiVersion " , provided)
391
369
testCompile(" org.apache.activemq:activemq-broker:$activeMqVersion " )
392
370
testCompile(" org.apache.activemq:activemq-kahadb-store:$activeMqVersion " ) {
@@ -400,7 +378,6 @@ project('spring-integration-jmx') {
400
378
description = ' Spring Integration JMX Support'
401
379
dependencies {
402
380
compile project(" :spring-integration-core" )
403
- compile " org.springframework:spring-context:$springVersion "
404
381
testCompile " org.aspectj:aspectjweaver:$aspectjVersion "
405
382
}
406
383
}
@@ -409,9 +386,7 @@ project('spring-integration-jpa') {
409
386
description = ' Spring Integration JPA Support'
410
387
dependencies {
411
388
compile project(" :spring-integration-core" )
412
- compile " org.springframework:spring-aop:$springVersion "
413
389
compile " org.springframework:spring-orm:$springVersion "
414
- compile " org.springframework:spring-tx:$springVersion "
415
390
compile " org.eclipse.persistence:javax.persistence:$jpaApiVersion "
416
391
417
392
testCompile " com.h2database:h2:$h2Version "
@@ -456,7 +431,6 @@ project('spring-integration-mongodb') {
456
431
description = ' Spring Integration MongoDB Support'
457
432
dependencies {
458
433
compile project(" :spring-integration-core" )
459
- compile " org.springframework:spring-tx:$springVersion "
460
434
compile(" org.springframework.data:spring-data-mongodb:$springDataMongoVersion " ) {
461
435
exclude group : ' org.springframework' , module : ' spring-beans'
462
436
exclude group : ' org.springframework' , module : ' spring-context'
@@ -479,7 +453,6 @@ project('spring-integration-redis') {
479
453
description = ' Spring Integration Redis Support'
480
454
dependencies {
481
455
compile project(" :spring-integration-core" )
482
- compile " org.springframework:spring-tx:$springVersion "
483
456
compile (" org.springframework.data:spring-data-redis:$springDataRedisVersion " ) {
484
457
exclude group : ' org.springframework' , module : ' spring-beans'
485
458
exclude group : ' org.springframework' , module : ' spring-context'
@@ -496,8 +469,6 @@ project('spring-integration-rmi') {
496
469
description = ' Spring Integration RMI Support'
497
470
dependencies {
498
471
compile project(" :spring-integration-core" )
499
- compile " org.springframework:spring-aop:$springVersion "
500
- compile " org.springframework:spring-context:$springVersion "
501
472
}
502
473
}
503
474
@@ -515,8 +486,6 @@ project('spring-integration-security') {
515
486
description = ' Spring Integration Security Support'
516
487
dependencies {
517
488
compile project(" :spring-integration-core" )
518
- compile " org.springframework:spring-aop:$springVersion "
519
- compile " org.springframework:spring-tx:$springVersion "
520
489
compile(" org.springframework.security:spring-security-core:$springSecurityVersion " ) {
521
490
exclude group : ' org.springframework' , module : ' spring-support'
522
491
}
@@ -529,7 +498,6 @@ project('spring-integration-security') {
529
498
project(' spring-integration-sftp' ) {
530
499
description = ' Spring Integration SFTP Support'
531
500
dependencies {
532
- compile project(" :spring-integration-core" )
533
501
compile project(" :spring-integration-file" )
534
502
compile project(" :spring-integration-stream" )
535
503
compile " com.jcraft:jsch:$jschVersion "
@@ -543,7 +511,6 @@ project('spring-integration-stream') {
543
511
description = ' Spring Integration Stream Support'
544
512
dependencies {
545
513
compile project(" :spring-integration-core" )
546
- compile " org.springframework:spring-context:$springVersion "
547
514
}
548
515
}
549
516
@@ -565,7 +532,6 @@ project('spring-integration-test') {
565
532
compile (" org.mockito:mockito-core:$mockitoVersion " ) {
566
533
exclude group : ' org.hamcrest' , module : ' hamcrest-core'
567
534
}
568
- compile " org.springframework:spring-context:$springVersion "
569
535
compile " org.springframework:spring-test:$springVersion "
570
536
}
571
537
}
@@ -615,7 +581,6 @@ project('spring-integration-ws') {
615
581
description = ' Spring Integration Web Services Support'
616
582
dependencies {
617
583
compile project(" :spring-integration-core" )
618
- compile " org.springframework:spring-expression:$springVersion "
619
584
compile " org.springframework:spring-oxm:$springVersion "
620
585
compile " org.springframework:spring-webmvc:$springVersion "
621
586
compile (" org.springframework.ws:spring-ws-core:$springWsVersion " ) {
@@ -655,7 +620,6 @@ project('spring-integration-xml') {
655
620
description = ' Spring Integration XML Support'
656
621
dependencies {
657
622
compile project(" :spring-integration-core" )
658
- compile " org.springframework:spring-context:$springVersion "
659
623
compile " org.springframework:spring-oxm:$springVersion "
660
624
compile (" org.springframework.ws:spring-xml:$springWsVersion " ) {
661
625
exclude group : ' org.springframework' , module : ' spring-beans'
0 commit comments