diff --git a/build.gradle b/build.gradle index fcf52736013..cf87093c26a 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ configure(allprojects) { project -> mavenBom "org.junit:junit-bom:5.9.0-RC1" } dependencies { - dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') { + dependencySet(group: 'org.apache.logging.log4j', version: '2.18.0') { entry 'log4j-api' entry 'log4j-core' entry 'log4j-jul' @@ -77,7 +77,7 @@ configure(allprojects) { project -> dependency "com.google.protobuf:protobuf-java-util:3.19.3" dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4" dependency "com.thoughtworks.qdox:qdox:2.0.1" - dependency("com.thoughtworks.xstream:xstream:1.4.18") { + dependency("com.thoughtworks.xstream:xstream:1.4.19") { exclude group: "xpp3", name: "xpp3_min" exclude group: "xmlpull", name: "xmlpull" } @@ -88,9 +88,9 @@ configure(allprojects) { project -> dependency "org.ogce:xpp3:1.1.6" dependency "org.yaml:snakeyaml:1.30" - dependency "com.h2database:h2:2.1.212" + dependency "com.h2database:h2:2.1.214" dependency "com.github.ben-manes.caffeine:caffeine:3.1.1" - dependency "com.github.librepdf:openpdf:1.3.28" + dependency "com.github.librepdf:openpdf:1.3.29" dependency "com.rometools:rome:1.18.0" dependency "commons-io:commons-io:2.11.0" dependency "io.vavr:vavr:0.10.4" @@ -136,7 +136,7 @@ configure(allprojects) { project -> entry 'undertow-websockets-jsr-jakarta' } - dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.5" + dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.6" dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3' dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3' dependency("org.apache.httpcomponents:httpclient:4.5.13") { @@ -187,10 +187,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.12.1" - dependency("net.sourceforge.htmlunit:htmlunit:2.62.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.63.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.62.0") { + dependency("org.seleniumhq.selenium:htmlunit-driver:2.63.0") { exclude group: "commons-logging", name: "commons-logging" } dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java index 02037e0400a..1d7c74b811e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -367,7 +367,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence * to which argument name. There are multiple strategies for determining * this binding, which are arranged in a ChainOfResponsibility. */ - public final synchronized void calculateArgumentBindings() { + public final void calculateArgumentBindings() { // The simple case... nothing to bind. if (this.argumentsIntrospected || this.parameterTypes.length == 0) { return;