Skip to content

Commit dcf2861

Browse files
committed
Upgrade to Objenesis 3.0
Includes jarjar upgrade since jarjar 1.3 fails to properly relocate Objenesis 3.0 classes into org.springframework.objenesis package. Issue: SPR-17372
1 parent 5474995 commit dcf2861

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

spring-core/spring-core.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencyManagement {
1212
// further transformed by the JarJar task to depend on org.springframework.asm; this
1313
// avoids including two different copies of asm unnecessarily.
1414
def cglibVersion = "3.2.8"
15-
def objenesisVersion = "2.6"
15+
def objenesisVersion = "3.0"
1616

1717
configurations {
1818
jarjar
@@ -26,7 +26,7 @@ task cglibRepackJar(type: Jar) { repackJar ->
2626

2727
doLast() {
2828
project.ant {
29-
taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
29+
taskdef name: "jarjar", classname: "org.pantsbuild.jarjar.JarJarTask",
3030
classpath: configurations.jarjar.asPath
3131
jarjar(destfile: repackJar.archivePath) {
3232
configurations.cglib.each { originalJar ->
@@ -49,7 +49,7 @@ task objenesisRepackJar(type: Jar) { repackJar ->
4949

5050
doLast() {
5151
project.ant {
52-
taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
52+
taskdef name: "jarjar", classname: "org.pantsbuild.jarjar.JarJarTask",
5353
classpath: configurations.jarjar.asPath
5454
jarjar(destfile: repackJar.archivePath) {
5555
configurations.objenesis.each { originalJar ->
@@ -65,7 +65,7 @@ task objenesisRepackJar(type: Jar) { repackJar ->
6565
dependencies {
6666
cglib("cglib:cglib:${cglibVersion}@jar")
6767
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
68-
jarjar("com.googlecode.jarjar:jarjar:1.3")
68+
jarjar("org.pantsbuild:jarjar:1.6.6")
6969

7070
compile(files(cglibRepackJar))
7171
compile(files(objenesisRepackJar))
@@ -94,7 +94,7 @@ jar {
9494
from(zipTree(cglibRepackJar.archivePath)) {
9595
include "org/springframework/cglib/**"
9696
exclude "org/springframework/cglib/core/AbstractClassGenerator*.class"
97-
exclude "org/springframework/cglib/core/AsmApi.class"
97+
exclude "org/springframework/cglib/core/AsmApi*.class"
9898
exclude "org/springframework/cglib/core/KeyFactory.class"
9999
exclude "org/springframework/cglib/core/KeyFactory\$*.class"
100100
exclude "org/springframework/cglib/core/ReflectUtils*.class"

0 commit comments

Comments
 (0)