From 927201d213a6d44c4a1033eac1ece7bd11989f48 Mon Sep 17 00:00:00 2001 From: Morten Kjetland Date: Thu, 3 Apr 2014 21:26:41 +0200 Subject: [PATCH 1/2] Make Spring 3.2.x compatible with Java 8 bytecode Upgraded ASM from 4.0 to 5.0 and cglib from 3.0 to 3.1 f --- build.gradle | 4 ++-- .../src/main/java/org/springframework/asm/SpringAsmInfo.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d4d968b4689c..aa7adbd568ae 100644 --- a/build.gradle +++ b/build.gradle @@ -176,8 +176,8 @@ project("spring-core") { // avoids including two different copies of asm unnecessarily. If however future cglib // versions drift from the version of asm used by Spring internally, this duplication // will become necessary. - def asmVersion = "4.0" - def cglibVersion = "3.0" + def asmVersion = "5.0" + def cglibVersion = "3.1" configurations { jarjar diff --git a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java index a2c3a1074ac0..74fec49fe7fd 100644 --- a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java +++ b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java @@ -33,6 +33,6 @@ public final class SpringAsmInfo { * * @see Opcodes#ASM4 */ - public static final int ASM_VERSION = Opcodes.ASM4; + public static final int ASM_VERSION = Opcodes.ASM5; } From 96b7a5b1a2dc17b9aff6f0235335265f6406ff0a Mon Sep 17 00:00:00 2001 From: Morten Kjetland Date: Sat, 5 Apr 2014 12:33:17 +0200 Subject: [PATCH 2/2] Upgraded ASM from 5.0 to 5.0.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index aa7adbd568ae..a270028f4d00 100644 --- a/build.gradle +++ b/build.gradle @@ -176,7 +176,7 @@ project("spring-core") { // avoids including two different copies of asm unnecessarily. If however future cglib // versions drift from the version of asm used by Spring internally, this duplication // will become necessary. - def asmVersion = "5.0" + def asmVersion = "5.0.1" def cglibVersion = "3.1" configurations {