Skip to content

Commit a426f87

Browse files
committed
Merge branch '5.3.x'
# Conflicts: # build.gradle # spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
2 parents a81558e + 02b7ddb commit a426f87

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ configure(allprojects) { project ->
3838
mavenBom "org.junit:junit-bom:5.9.0-RC1"
3939
}
4040
dependencies {
41-
dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') {
41+
dependencySet(group: 'org.apache.logging.log4j', version: '2.18.0') {
4242
entry 'log4j-api'
4343
entry 'log4j-core'
4444
entry 'log4j-jul'
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
7777
dependency "com.google.protobuf:protobuf-java-util:3.19.3"
7878
dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
7979
dependency "com.thoughtworks.qdox:qdox:2.0.1"
80-
dependency("com.thoughtworks.xstream:xstream:1.4.18") {
80+
dependency("com.thoughtworks.xstream:xstream:1.4.19") {
8181
exclude group: "xpp3", name: "xpp3_min"
8282
exclude group: "xmlpull", name: "xmlpull"
8383
}
@@ -88,9 +88,9 @@ configure(allprojects) { project ->
8888
dependency "org.ogce:xpp3:1.1.6"
8989
dependency "org.yaml:snakeyaml:1.30"
9090

91-
dependency "com.h2database:h2:2.1.212"
91+
dependency "com.h2database:h2:2.1.214"
9292
dependency "com.github.ben-manes.caffeine:caffeine:3.1.1"
93-
dependency "com.github.librepdf:openpdf:1.3.28"
93+
dependency "com.github.librepdf:openpdf:1.3.29"
9494
dependency "com.rometools:rome:1.18.0"
9595
dependency "commons-io:commons-io:2.11.0"
9696
dependency "io.vavr:vavr:0.10.4"
@@ -136,7 +136,7 @@ configure(allprojects) { project ->
136136
entry 'undertow-websockets-jsr-jakarta'
137137
}
138138

139-
dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.5"
139+
dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.6"
140140
dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
141141
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
142142
dependency("org.apache.httpcomponents:httpclient:4.5.13") {
@@ -187,10 +187,10 @@ configure(allprojects) { project ->
187187
}
188188
dependency "io.mockk:mockk:1.12.1"
189189

190-
dependency("net.sourceforge.htmlunit:htmlunit:2.62.0") {
190+
dependency("net.sourceforge.htmlunit:htmlunit:2.63.0") {
191191
exclude group: "commons-logging", name: "commons-logging"
192192
}
193-
dependency("org.seleniumhq.selenium:htmlunit-driver:2.62.0") {
193+
dependency("org.seleniumhq.selenium:htmlunit-driver:2.63.0") {
194194
exclude group: "commons-logging", name: "commons-logging"
195195
}
196196
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -367,7 +367,7 @@ private static boolean isVariableName(String name) {
367367
* to which argument name. There are multiple strategies for determining
368368
* this binding, which are arranged in a ChainOfResponsibility.
369369
*/
370-
public final synchronized void calculateArgumentBindings() {
370+
public final void calculateArgumentBindings() {
371371
// The simple case... nothing to bind.
372372
if (this.argumentsIntrospected || this.parameterTypes.length == 0) {
373373
return;

0 commit comments

Comments
 (0)