@@ -46,7 +46,7 @@ configure(allprojects) { project ->
46
46
ext. hamcrestVersion = " 1.3"
47
47
ext. hibernate3Version = " 3.6.10.Final"
48
48
ext. hibernate4Version = " 4.3.11.Final"
49
- ext. hibernate5Version = " 5.2.6 .Final"
49
+ ext. hibernate5Version = " 5.2.7 .Final"
50
50
ext. hibval4Version = " 4.3.2.Final"
51
51
ext. hibval5Version = " 5.2.4.Final"
52
52
ext. hsqldbVersion = " 2.3.4"
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
56
56
ext. jasperreportsVersion = " 6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher
57
57
ext. javamailVersion = " 1.5.6"
58
58
ext. jettyVersion = " 9.3.14.v20161028" // as of 9.3.15, Jetty has hard Servlet 3.1 requirement
59
- ext. jetty94Version = " 9.4.0.v20161208 " // for spring-websocket support, optimized for Jetty 9.4
59
+ ext. jetty94Version = " 9.4.1.v20170120 " // for spring-websocket support, optimized for Jetty 9.4
60
60
ext. jodaVersion = " 2.9.7"
61
61
ext. jrubyVersion = " 1.7.26" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
62
62
ext. jtaVersion = " 1.2"
@@ -68,7 +68,7 @@ configure(allprojects) { project ->
68
68
ext. openjpaVersion = " 2.4.1"
69
69
ext. poiVersion = " 3.14"
70
70
ext. reactorVersion = " 2.0.8.RELEASE"
71
- ext. romeVersion = " 1.7.0 "
71
+ ext. romeVersion = " 1.7.1 "
72
72
ext. slf4jVersion = " 1.7.21"
73
73
ext. snakeyamlVersion = " 1.17"
74
74
ext. snifferVersion = " 1.15"
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
77
77
ext. tiles3Version = " 3.0.7"
78
78
ext. tomcatVersion = " 8.5.11"
79
79
ext. tyrusVersion = " 1.3.5" // constrained by WebLogic 12.1.3 support
80
- ext. undertowVersion = " 1.3.25 .Final"
80
+ ext. undertowVersion = " 1.3.26 .Final"
81
81
ext. xmlunitVersion = " 1.6"
82
82
ext. xstreamVersion = " 1.4.9"
83
83
@@ -217,7 +217,6 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
217
217
configurations {
218
218
jacoco
219
219
}
220
-
221
220
dependencies {
222
221
jacoco(" org.jacoco:org.jacoco.agent:0.7.5.201505241946:runtime" )
223
222
}
@@ -276,6 +275,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
276
275
277
276
project(" spring-build-src" ) {
278
277
description = " Exposes gradle buildSrc for IDE support"
278
+
279
279
apply plugin : " groovy"
280
280
281
281
dependencies {
@@ -294,7 +294,7 @@ project("spring-core") {
294
294
// further transformed by the JarJar task to depend on org.springframework.asm; this
295
295
// avoids including two different copies of asm unnecessarily.
296
296
def cglibVersion = " 3.2.4"
297
- def objenesisVersion = " 2.5"
297
+ def objenesisVersion = " 2.5.1 "
298
298
299
299
configurations {
300
300
jarjar
@@ -314,9 +314,9 @@ project("spring-core") {
314
314
configurations. cglib. each { originalJar ->
315
315
zipfileset(src : originalJar)
316
316
}
317
- // repackage net.sf.cglib => org.springframework.cglib
317
+ // Repackage net.sf.cglib => org.springframework.cglib
318
318
rule(pattern : " net.sf.cglib.**" , result : " org.springframework.cglib.@1" )
319
- // as mentioned above, transform cglib"s internal asm dependencies from
319
+ // As mentioned above, transform cglib"s internal asm dependencies from
320
320
// org.objectweb.asm => org.springframework.asm. Doing this counts on the
321
321
// the fact that Spring and cglib depend on the same version of asm!
322
322
rule(pattern : " org.objectweb.asm.**" , result : " org.springframework.asm.@1" )
@@ -337,7 +337,7 @@ project("spring-core") {
337
337
configurations. objenesis. each { originalJar ->
338
338
zipfileset(src : originalJar)
339
339
}
340
- // repackage org.objenesis => org.springframework.objenesis
340
+ // Repackage org.objenesis => org.springframework.objenesis
341
341
rule(pattern : " org.objenesis.**" , result : " org.springframework.objenesis.@1" )
342
342
}
343
343
}
@@ -364,7 +364,7 @@ project("spring-core") {
364
364
}
365
365
366
366
jar {
367
- // inline repackaged cglib classes directly into the spring-core jar
367
+ // Inline repackaged cglib classes directly into spring-core jar
368
368
dependsOn cglibRepackJar
369
369
from(zipTree(cglibRepackJar. archivePath)) {
370
370
include " org/springframework/cglib/**"
@@ -393,6 +393,7 @@ project("spring-beans") {
393
393
394
394
project(" spring-beans-groovy" ) {
395
395
description " Groovy Bean Definitions"
396
+
396
397
merge. into = project(" :spring-beans" )
397
398
apply plugin : " groovy"
398
399
@@ -468,6 +469,7 @@ project("spring-instrument-tomcat") {
468
469
469
470
project(" spring-context" ) {
470
471
description = " Spring Context"
472
+
471
473
apply plugin : " groovy"
472
474
473
475
dependencies {
@@ -661,6 +663,7 @@ project("spring-context-support") {
661
663
662
664
project(" spring-web" ) {
663
665
description = " Spring Web"
666
+
664
667
apply plugin : " groovy"
665
668
666
669
// Re-generate Protobuf classes from *.proto files and move them in test sources
@@ -1176,7 +1179,7 @@ configure(rootProject) {
1176
1179
// don't publish the default jar for the root project
1177
1180
configurations. archives. artifacts. clear()
1178
1181
1179
- dependencies { // for integration tests
1182
+ dependencies { // for integration tests
1180
1183
testCompile(project(" :spring-aop" ))
1181
1184
testCompile(project(" :spring-beans" ))
1182
1185
testCompile(project(" :spring-context" ))
@@ -1225,11 +1228,11 @@ configure(rootProject) {
1225
1228
1226
1229
doFirst {
1227
1230
classpath = files(
1228
- // ensure Servlet 3.x and Hibernate 4.x have precedence on the javadoc
1231
+ // Ensure Servlet 3.x and Hibernate 4.x have precedence on the javadoc
1229
1232
// classpath over their respective 2.5 and 3.x variants
1230
1233
project(" :spring-webmvc" ). sourceSets. main. compileClasspath. files. find { it =~ " servlet-api" },
1231
1234
rootProject. sourceSets. test. compileClasspath. files. find { it =~ " hibernate-core" },
1232
- // ensure the javadoc process can resolve types compiled from .aj sources
1235
+ // Ensure the javadoc process can resolve types compiled from .aj sources
1233
1236
project(" :spring-aspects" ). sourceSets. main. output
1234
1237
)
1235
1238
classpath + = files(subprojects. collect { it. sourceSets. main. compileClasspath })
0 commit comments