From d4d03ea1464989d1bc64c70521d26ab991be2401 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:26 -0700 Subject: [PATCH 1/8] Update jackson-bom to 2.13.5 Closes gh-12731 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index c888f3d5b0..38bf14d275 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -14,7 +14,7 @@ dependencies { api platform("org.springframework.data:spring-data-bom:2021.2.6") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4") - api platform("com.fasterxml.jackson:jackson-bom:2.13.4.20221013") + api platform("com.fasterxml.jackson:jackson-bom:2.13.5") constraints { api "ch.qos.logback:logback-classic:1.2.11" api "com.google.inject:guice:3.0" From d2d82b5e94af35af3d653136383688e1834f9205 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:28 -0700 Subject: [PATCH 2/8] Update io.projectreactor to 2020.0.28 Closes gh-12732 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 38bf14d275..36f7ff80e1 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -8,7 +8,7 @@ javaPlatform { dependencies { api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") - api platform("io.projectreactor:reactor-bom:2020.0.26") + api platform("io.projectreactor:reactor-bom:2020.0.28") api platform("io.rsocket:rsocket-bom:1.1.3") api platform("org.junit:junit-bom:5.8.2") api platform("org.springframework.data:spring-data-bom:2021.2.6") From 4643c0d9995db01afeb00c53f34ee3937841bfad Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:29 -0700 Subject: [PATCH 3/8] Update blockhound to 1.0.7.RELEASE Closes gh-12733 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 36f7ff80e1..3f8e207229 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -26,7 +26,7 @@ dependencies { api "commons-codec:commons-codec:1.15" api "commons-collections:commons-collections:3.2.2" api "io.mockk:mockk:1.12.8" - api "io.projectreactor.tools:blockhound:1.0.6.RELEASE" + api "io.projectreactor.tools:blockhound:1.0.7.RELEASE" api "jakarta.inject:jakarta.inject-api:1.0.5" api "jakarta.annotation:jakarta.annotation-api:1.3.5" api "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7" From f125785328b101f9d1cde87578df86727557eb19 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:30 -0700 Subject: [PATCH 4/8] Update io.spring.nohttp to 0.0.11 Closes gh-12734 --- build.gradle | 2 +- buildSrc/build.gradle | 2 +- .../groovy/io/spring/gradle/convention/CheckstylePlugin.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 477ba851cd..da1c6ef925 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import io.spring.gradle.IncludeRepoTask buildscript { dependencies { classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion" - classpath 'io.spring.nohttp:nohttp-gradle:0.0.10' + classpath 'io.spring.nohttp:nohttp-gradle:0.0.11' classpath "io.freefair.gradle:aspectj-plugin:6.4.3.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "com.netflix.nebula:nebula-project-plugin:8.2.0" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4439a5e0d2..e324741c3f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -93,7 +93,7 @@ dependencies { implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0' implementation 'com.github.spullara.mustache.java:compiler:0.9.4' implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15' - implementation 'io.spring.nohttp:nohttp-gradle:0.0.10' + implementation 'io.spring.nohttp:nohttp-gradle:0.0.11' implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0' implementation 'org.hidetake:gradle-ssh-plugin:2.10.1' implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0' diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy index cf9730c3fa..4ed89b8bef 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy @@ -36,7 +36,7 @@ class CheckstylePlugin implements Plugin { if (checkstyleDir.exists() && checkstyleDir.directory) { project.getPluginManager().apply('checkstyle') project.dependencies.add('checkstyle', 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.15') - project.dependencies.add('checkstyle', 'io.spring.nohttp:nohttp-checkstyle:0.0.10') + project.dependencies.add('checkstyle', 'io.spring.nohttp:nohttp-checkstyle:0.0.11') project.checkstyle { configDirectory = checkstyleDir From 4156766fe0415d5a0455813ed876e247dec9b507 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:32 -0700 Subject: [PATCH 5/8] Update org.aspectj to 1.9.19 Closes gh-12735 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2485f8b7c8..e072aa067a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -aspectjVersion=1.9.9.1 +aspectjVersion=1.9.19 springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=5.3.24 From c9112dfaab75819ef8e136143950658ec292eff5 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:33 -0700 Subject: [PATCH 6/8] Update hibernate-entitymanager to 5.6.15.Final Closes gh-12736 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 3f8e207229..f67174c23b 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -54,7 +54,7 @@ dependencies { api "org.eclipse.jetty:jetty-servlet:9.4.50.v20221201" api "org.eclipse.persistence:javax.persistence:2.2.1" api "org.hamcrest:hamcrest:2.2" - api "org.hibernate:hibernate-entitymanager:5.6.14.Final" + api "org.hibernate:hibernate-entitymanager:5.6.15.Final" api "org.hsqldb:hsqldb:2.6.1" api "org.jasig.cas.client:cas-client-core:3.6.4" api "org.mockito:mockito-core:3.12.4" From 0398d86f39c5688e653d03eec9c88aa42e9aba28 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:34 -0700 Subject: [PATCH 7/8] Update org.springframework to 5.3.25 Closes gh-12737 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e072aa067a..30fcaa776d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ aspectjVersion=1.9.19 springJavaformatVersion=0.0.31 springBootVersion=2.4.2 -springFrameworkVersion=5.3.24 +springFrameworkVersion=5.3.25 openSamlVersion=3.4.6 version=5.7.7-SNAPSHOT kotlinVersion=1.6.21 From 2fcf48a11b29aa94b054c2c93535aa129af47980 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 17 Feb 2023 15:05:36 -0700 Subject: [PATCH 8/8] Update org.springframework.data to 2021.2.8 Closes gh-12738 --- dependencies/spring-security-dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index f67174c23b..5776fdad6a 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -11,7 +11,7 @@ dependencies { api platform("io.projectreactor:reactor-bom:2020.0.28") api platform("io.rsocket:rsocket-bom:1.1.3") api platform("org.junit:junit-bom:5.8.2") - api platform("org.springframework.data:spring-data-bom:2021.2.6") + api platform("org.springframework.data:spring-data-bom:2021.2.8") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4") api platform("com.fasterxml.jackson:jackson-bom:2.13.5")