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

Merge branch '5.3.x' 

# Conflicts:
#	build.gradle
This commit is contained in:
Juergen Hoeller 2022-02-04 23:55:18 +01:00
parent 3eb9886724 5bbdd36e19
commit b0bca7f5ae
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -134,8 +134,8 @@ configure(allprojects) { project ->
} }
dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4" dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2' dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2' dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
dependency("org.apache.httpcomponents:httpclient:4.5.13") { dependency("org.apache.httpcomponents:httpclient:4.5.13") {
exclude group: "commons-logging", name: "commons-logging" exclude group: "commons-logging", name: "commons-logging"
} }
@ -184,10 +184,10 @@ configure(allprojects) { project ->
} }
dependency "io.mockk:mockk:1.12.1" dependency "io.mockk:mockk:1.12.1"
dependency("net.sourceforge.htmlunit:htmlunit:2.57.0") { dependency("net.sourceforge.htmlunit:htmlunit:2.58.0") {
exclude group: "commons-logging", name: "commons-logging" exclude group: "commons-logging", name: "commons-logging"
} }
dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") { dependency("org.seleniumhq.selenium:htmlunit-driver:2.58.0") {
exclude group: "commons-logging", name: "commons-logging" exclude group: "commons-logging", name: "commons-logging"
} }
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@ -297,7 +297,7 @@ configure([rootProject] + javaProjects) { project ->
} }
checkstyle { checkstyle {
toolVersion = "9.2.1" toolVersion = "9.3"
configDirectory.set(rootProject.file("src/checkstyle")) configDirectory.set(rootProject.file("src/checkstyle"))
} }

3
spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cglib.beans; package org.springframework.cglib.beans;
import java.security.ProtectionDomain; import java.security.ProtectionDomain;