From a22feac8036393725113222055166eb9e7211c9a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 4 Feb 2022 23:51:05 +0100 Subject: [PATCH 1/2] Update license header for https (nohttp rule) See gh-27802 --- .../src/main/java/org/springframework/cglib/beans/BeanMap.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java index cfe8436359..3a6dd8e020 100644 --- a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java +++ b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * 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 * 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 * limitations under the License. */ + package org.springframework.cglib.beans; import java.security.ProtectionDomain; From 5bbdd36e199dd53b237f168c34c81c7b4dcd8946 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 4 Feb 2022 23:51:23 +0100 Subject: [PATCH 2/2] Upgrade to Checkstyle 9.3, HtmlUnit 2.58, Apache HttpClient 5.1.3 --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index dfb10e777a..58d99ed311 100644 --- a/build.gradle +++ b/build.gradle @@ -151,8 +151,8 @@ configure(allprojects) { project -> } dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.10" - dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2' - dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2' + 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") { exclude group: "commons-logging", name: "commons-logging" } @@ -206,10 +206,10 @@ configure(allprojects) { project -> } 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" } - 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" } dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { @@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "9.2.1" + toolVersion = "9.3" configDirectory.set(rootProject.file("src/checkstyle")) }