Skip to content

Commit 0ad3505

Browse files
committed
Upgrade to CGLIB 3.2.10
Includes upgrade to JarJar 1.7.2 and Tomcat 9.0.14. Issue: SPR-17595
1 parent 0586080 commit 0ad3505

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ext {
4444
rxjava2Version = "2.2.4"
4545
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
4646
tiles3Version = "3.0.8"
47-
tomcatVersion = "9.0.13"
47+
tomcatVersion = "9.0.14"
4848
undertowVersion = "2.0.16.Final"
4949

5050
gradleScriptDir = "${rootProject.projectDir}/gradle"

spring-core/spring-core.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencyManagement {
1010
// spring-core includes asm and repackages cglib, inlining both into the spring-core jar.
1111
// cglib itself depends on asm and is therefore further transformed by the JarJar task to
1212
// depend on org.springframework.asm; this avoids including two different copies of asm.
13-
def cglibVersion = "3.2.9"
13+
def cglibVersion = "3.2.10"
1414
def objenesisVersion = "3.0.1"
1515

1616
configurations {
@@ -64,7 +64,7 @@ task objenesisRepackJar(type: Jar) { repackJar ->
6464
dependencies {
6565
cglib("cglib:cglib:${cglibVersion}@jar")
6666
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
67-
jarjar("org.pantsbuild:jarjar:1.6.6")
67+
jarjar("org.pantsbuild:jarjar:1.7.2")
6868

6969
compile(files(cglibRepackJar))
7070
compile(files(objenesisRepackJar))

spring-core/src/main/java/org/springframework/cglib/core/AbstractClassGenerator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
4040

4141
private static volatile Map<ClassLoader, ClassLoaderData> CACHE = new WeakHashMap<ClassLoader, ClassLoaderData>();
4242

43+
private static final boolean DEFAULT_USE_CACHE =
44+
Boolean.parseBoolean(System.getProperty("cglib.useCache", "true"));
45+
46+
4347
private GeneratorStrategy strategy = DefaultGeneratorStrategy.INSTANCE;
4448

4549
private NamingPolicy namingPolicy = DefaultNamingPolicy.INSTANCE;
@@ -54,7 +58,7 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
5458

5559
private Object key;
5660

57-
private boolean useCache = true;
61+
private boolean useCache = DEFAULT_USE_CACHE;
5862

5963
private String className;
6064

0 commit comments

Comments
 (0)