Merge branch '5.3.x'
This commit is contained in:
@@ -45,7 +45,7 @@ configure(allprojects) { project ->
|
|||||||
entry 'log4j-jul'
|
entry 'log4j-jul'
|
||||||
entry 'log4j-slf4j-impl'
|
entry 'log4j-slf4j-impl'
|
||||||
}
|
}
|
||||||
dependency "org.slf4j:slf4j-api:1.7.30"
|
dependency "org.slf4j:slf4j-api:1.7.32"
|
||||||
dependency("com.google.code.findbugs:findbugs:3.0.1") {
|
dependency("com.google.code.findbugs:findbugs:3.0.1") {
|
||||||
exclude group: "dom4j", name: "dom4j"
|
exclude group: "dom4j", name: "dom4j"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -453,7 +453,7 @@ public class ReflectUtils {
|
|||||||
// in case of plain LinkageError (class already defined)
|
// in case of plain LinkageError (class already defined)
|
||||||
// or IllegalArgumentException (class in different package):
|
// or IllegalArgumentException (class in different package):
|
||||||
// fall through to traditional ClassLoader.defineClass below
|
// fall through to traditional ClassLoader.defineClass below
|
||||||
t = ex;
|
t = target;
|
||||||
}
|
}
|
||||||
catch (Throwable ex) {
|
catch (Throwable ex) {
|
||||||
throw new CodeGenerationException(ex);
|
throw new CodeGenerationException(ex);
|
||||||
|
|||||||
Reference in New Issue
Block a user