Skip to content

Commit 4af6d58

Browse files
committed
Upgrade to Objenesis 2.5.1
Includes Hibernate ORM 5.2.7, Rome 1.7.1, Jetty 9.4.1, Undertow 1.3.26 Issue: SPR-15146
1 parent e2d06ea commit 4af6d58

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

build.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ configure(allprojects) { project ->
4646
ext.hamcrestVersion = "1.3"
4747
ext.hibernate3Version = "3.6.10.Final"
4848
ext.hibernate4Version = "4.3.11.Final"
49-
ext.hibernate5Version = "5.2.6.Final"
49+
ext.hibernate5Version = "5.2.7.Final"
5050
ext.hibval4Version = "4.3.2.Final"
5151
ext.hibval5Version = "5.2.4.Final"
5252
ext.hsqldbVersion = "2.3.4"
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
5656
ext.jasperreportsVersion = "6.2.1" // our tests fail with JR-internal NPEs against 6.2.2 and higher
5757
ext.javamailVersion = "1.5.6"
5858
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
6060
ext.jodaVersion = "2.9.7"
6161
ext.jrubyVersion = "1.7.26" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
6262
ext.jtaVersion = "1.2"
@@ -68,7 +68,7 @@ configure(allprojects) { project ->
6868
ext.openjpaVersion = "2.4.1"
6969
ext.poiVersion = "3.14"
7070
ext.reactorVersion = "2.0.8.RELEASE"
71-
ext.romeVersion = "1.7.0"
71+
ext.romeVersion = "1.7.1"
7272
ext.slf4jVersion = "1.7.21"
7373
ext.snakeyamlVersion = "1.17"
7474
ext.snifferVersion = "1.15"
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
7777
ext.tiles3Version = "3.0.7"
7878
ext.tomcatVersion = "8.5.11"
7979
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"
8181
ext.xmlunitVersion = "1.6"
8282
ext.xstreamVersion = "1.4.9"
8383

@@ -217,7 +217,6 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
217217
configurations {
218218
jacoco
219219
}
220-
221220
dependencies {
222221
jacoco("org.jacoco:org.jacoco.agent:0.7.5.201505241946:runtime")
223222
}
@@ -276,6 +275,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
276275

277276
project("spring-build-src") {
278277
description = "Exposes gradle buildSrc for IDE support"
278+
279279
apply plugin: "groovy"
280280

281281
dependencies {
@@ -294,7 +294,7 @@ project("spring-core") {
294294
// further transformed by the JarJar task to depend on org.springframework.asm; this
295295
// avoids including two different copies of asm unnecessarily.
296296
def cglibVersion = "3.2.4"
297-
def objenesisVersion = "2.5"
297+
def objenesisVersion = "2.5.1"
298298

299299
configurations {
300300
jarjar
@@ -314,9 +314,9 @@ project("spring-core") {
314314
configurations.cglib.each { originalJar ->
315315
zipfileset(src: originalJar)
316316
}
317-
// repackage net.sf.cglib => org.springframework.cglib
317+
// Repackage net.sf.cglib => org.springframework.cglib
318318
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
320320
// org.objectweb.asm => org.springframework.asm. Doing this counts on the
321321
// the fact that Spring and cglib depend on the same version of asm!
322322
rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1")
@@ -337,7 +337,7 @@ project("spring-core") {
337337
configurations.objenesis.each { originalJar ->
338338
zipfileset(src: originalJar)
339339
}
340-
// repackage org.objenesis => org.springframework.objenesis
340+
// Repackage org.objenesis => org.springframework.objenesis
341341
rule(pattern: "org.objenesis.**", result: "org.springframework.objenesis.@1")
342342
}
343343
}
@@ -364,7 +364,7 @@ project("spring-core") {
364364
}
365365

366366
jar {
367-
// inline repackaged cglib classes directly into the spring-core jar
367+
// Inline repackaged cglib classes directly into spring-core jar
368368
dependsOn cglibRepackJar
369369
from(zipTree(cglibRepackJar.archivePath)) {
370370
include "org/springframework/cglib/**"
@@ -393,6 +393,7 @@ project("spring-beans") {
393393

394394
project("spring-beans-groovy") {
395395
description "Groovy Bean Definitions"
396+
396397
merge.into = project(":spring-beans")
397398
apply plugin: "groovy"
398399

@@ -468,6 +469,7 @@ project("spring-instrument-tomcat") {
468469

469470
project("spring-context") {
470471
description = "Spring Context"
472+
471473
apply plugin: "groovy"
472474

473475
dependencies {
@@ -661,6 +663,7 @@ project("spring-context-support") {
661663

662664
project("spring-web") {
663665
description = "Spring Web"
666+
664667
apply plugin: "groovy"
665668

666669
// Re-generate Protobuf classes from *.proto files and move them in test sources
@@ -1176,7 +1179,7 @@ configure(rootProject) {
11761179
// don't publish the default jar for the root project
11771180
configurations.archives.artifacts.clear()
11781181

1179-
dependencies { // for integration tests
1182+
dependencies { // for integration tests
11801183
testCompile(project(":spring-aop"))
11811184
testCompile(project(":spring-beans"))
11821185
testCompile(project(":spring-context"))
@@ -1225,11 +1228,11 @@ configure(rootProject) {
12251228

12261229
doFirst {
12271230
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
12291232
// classpath over their respective 2.5 and 3.x variants
12301233
project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
12311234
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
12331236
project(":spring-aspects").sourceSets.main.output
12341237
)
12351238
classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })

0 commit comments

Comments
 (0)