root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgrade to CGLIB 3.2.10 

Includes upgrade to JarJar 1.7.2 and Tomcat 9.0.14.

Issue: SPR-17595
This commit is contained in:
Juergen Hoeller 2018-12-12 16:03:31 +01:00
parent 058608021e
commit 0ad35053fb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -44,7 +44,7 @@ ext {
rxjava2Version = "2.2.4"
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.13"
tomcatVersion = "9.0.14"
undertowVersion = "2.0.16.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle"

4
spring-core/spring-core.gradle
View File

@ -10,7 +10,7 @@ dependencyManagement {
// spring-core includes asm and repackages cglib, inlining both into the spring-core jar.
// cglib itself depends on asm and is therefore further transformed by the JarJar task to
// depend on org.springframework.asm; this avoids including two different copies of asm.
def cglibVersion = "3.2.9"
def cglibVersion = "3.2.10"
def objenesisVersion = "3.0.1"
configurations {
@ -64,7 +64,7 @@ task objenesisRepackJar(type: Jar) { repackJar ->
dependencies {
cglib("cglib:cglib:${cglibVersion}@jar")
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
jarjar("org.pantsbuild:jarjar:1.6.6")
jarjar("org.pantsbuild:jarjar:1.7.2")
compile(files(cglibRepackJar))
compile(files(objenesisRepackJar))

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

@ -40,6 +40,10 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
private static volatile Map<ClassLoader, ClassLoaderData> CACHE = new WeakHashMap<ClassLoader, ClassLoaderData>();
private static final boolean DEFAULT_USE_CACHE =
Boolean.parseBoolean(System.getProperty("cglib.useCache", "true"));
private GeneratorStrategy strategy = DefaultGeneratorStrategy.INSTANCE;
private NamingPolicy namingPolicy = DefaultNamingPolicy.INSTANCE;
@ -54,7 +58,7 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
private Object key;
private boolean useCache = true;
private boolean useCache = DEFAULT_USE_CACHE;
private String className;