From eef519adc5b5222b24bf141a754be07072feb0b6 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:52:58 -0300 Subject: [PATCH 01/13] Update jackson-bom to 2.14.2 Closes gh-12696 --- 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 efc356d933..3f4a2abe57 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -15,7 +15,7 @@ dependencies { api platform("org.springframework.data:spring-data-bom:2022.0.0") 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.14.1") + api platform("com.fasterxml.jackson:jackson-bom:2.14.2") constraints { api "ch.qos.logback:logback-classic:1.4.5" api "com.google.inject:guice:3.0" From bb644fe3718a49fdbeae0132bc1f7f148369628c Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:07 -0300 Subject: [PATCH 02/13] Update micrometer-observation to 1.10.4 Closes gh-12699 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index db24be72ab..94e5f82008 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ reactorVersion=2022.0.1 springJavaformatVersion=0.0.35 springBootVersion=2.4.2 springFrameworkVersion=6.0.3 -micrometerVersion=1.10.2 +micrometerVersion=1.10.4 openSamlVersion=4.1.1 version=6.0.2-SNAPSHOT kotlinVersion=1.7.22 From 67a0a1a010ba92812cc776b59f0e85be085ca261 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:10 -0300 Subject: [PATCH 03/13] Update mockk to 1.13.4 Closes gh-12700 --- 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 3f4a2abe57..811f42eb13 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -25,7 +25,7 @@ dependencies { api "com.squareup.okhttp3:okhttp:3.14.9" api "com.unboundid:unboundid-ldapsdk:6.0.7" api "commons-collections:commons-collections:3.2.2" - api "io.mockk:mockk:1.13.3" + api "io.mockk:mockk:1.13.4" api "io.micrometer:micrometer-observation:$micrometerVersion" api "jakarta.annotation:jakarta.annotation-api:2.1.1" api "jakarta.inject:jakarta.inject-api:2.0.1" From b0c823970b3110989d6c44226a728ce6e2b9ccf8 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:14 -0300 Subject: [PATCH 04/13] Update io.projectreactor to 2022.0.3 Closes gh-12701 --- buildSrc/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4198d3b8f6..db918ee3b0 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation localGroovy() implementation 'io.github.gradle-nexus:publish-plugin:1.1.0' - implementation 'io.projectreactor:reactor-core:3.5.1' + implementation 'io.projectreactor:reactor-core:3.5.3' implementation 'org.gretty:gretty:3.0.9' implementation 'com.apollographql.apollo:apollo-runtime:2.4.5' implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0' diff --git a/gradle.properties b/gradle.properties index 94e5f82008..5d88ea2bb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ aspectjVersion=1.9.9.1 -reactorVersion=2022.0.1 +reactorVersion=2022.0.3 springJavaformatVersion=0.0.35 springBootVersion=2.4.2 springFrameworkVersion=6.0.3 From d127ad310fc8b48b325188bded93537b0bf86537 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:21 -0300 Subject: [PATCH 05/13] Update io.spring.nohttp to 0.0.11 Closes gh-12703 --- 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 88cf52a686..bb12428569 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.6-rc1" 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 db918ee3b0..700fad081f 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 3f2ff0572ee81100a1f0ff969e30f3e3ff478fd9 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:24 -0300 Subject: [PATCH 06/13] Update jakarta.servlet.jsp-api to 3.1.1 Closes gh-12704 --- 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 811f42eb13..571a27d69f 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -30,7 +30,7 @@ dependencies { api "jakarta.annotation:jakarta.annotation-api:2.1.1" api "jakarta.inject:jakarta.inject-api:2.0.1" api "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0" - api "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0" + api "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1" api "jakarta.servlet:jakarta.servlet-api:6.0.0" api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" api "jakarta.persistence:jakarta.persistence-api:3.1.0" From e7c1e2d78df07566298d1c6842cd532d7971922a Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:28 -0300 Subject: [PATCH 07/13] Update maven-resolver-provider to 3.8.7 Closes gh-12705 --- 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 571a27d69f..0395c51298 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -73,7 +73,7 @@ dependencies { api 'org.apache.maven.resolver:maven-resolver-connector-basic:1.8.2' api 'org.apache.maven.resolver:maven-resolver-impl:1.8.2' api 'org.apache.maven.resolver:maven-resolver-transport-http:1.8.2' - api 'org.apache.maven:maven-resolver-provider:3.8.6' + api 'org.apache.maven:maven-resolver-provider:3.8.7' } } From 8174ed22917161e594276b42753a5c10cd73665d Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:31 -0300 Subject: [PATCH 08/13] Update org.aspectj to 1.9.19 Closes gh-12706 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5d88ea2bb3..27a76e75dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -aspectjVersion=1.9.9.1 +aspectjVersion=1.9.19 reactorVersion=2022.0.3 springJavaformatVersion=0.0.35 springBootVersion=2.4.2 From e008b9371524a0133baa16475ab9140c732256b8 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:34 -0300 Subject: [PATCH 09/13] Update hibernate-core to 6.1.7.Final Closes gh-12707 --- 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 0395c51298..11b49cafff 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -55,7 +55,7 @@ dependencies { api "org.eclipse.jetty:jetty-servlet:11.0.13" api "jakarta.persistence:jakarta.persistence-api:3.1.0" api "org.hamcrest:hamcrest:2.2" - api "org.hibernate.orm:hibernate-core:6.1.6.Final" + api "org.hibernate.orm:hibernate-core:6.1.7.Final" api "org.hsqldb:hsqldb:2.7.1" api "org.jasig.cas.client:cas-client-core:3.6.4" api "org.opensaml:opensaml-core:$openSamlVersion" From e8a251aa7f1cf8e712176cc6d5ac501ee8d892e6 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:37 -0300 Subject: [PATCH 10/13] Update junit-bom to 5.9.2 Closes gh-12708 --- buildSrc/build.gradle | 2 +- dependencies/spring-security-dependencies.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 700fad081f..6aa7b5f2d2 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0' implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1' - testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation platform('org.junit:junit-bom:5.9.2') testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.junit.jupiter:junit-jupiter-engine" diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 11b49cafff..4dd65bbaf0 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -10,7 +10,7 @@ dependencies { api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") api platform("io.projectreactor:reactor-bom:$reactorVersion") api platform("io.rsocket:rsocket-bom:1.1.3") - api platform("org.junit:junit-bom:5.9.1") + api platform("org.junit:junit-bom:5.9.2") api platform("org.mockito:mockito-bom:4.8.1") api platform("org.springframework.data:spring-data-bom:2022.0.0") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") From 01c3a25d7f99641908a3b55923992e8d3c7d6371 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:47 -0300 Subject: [PATCH 11/13] Update org.springframework to 6.0.5 Closes gh-12711 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 27a76e75dd..2d179bb7f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ aspectjVersion=1.9.19 reactorVersion=2022.0.3 springJavaformatVersion=0.0.35 springBootVersion=2.4.2 -springFrameworkVersion=6.0.3 +springFrameworkVersion=6.0.5 micrometerVersion=1.10.4 openSamlVersion=4.1.1 version=6.0.2-SNAPSHOT From 8fb9c91acf3835601b69d2c88b6d805523d1db7b Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:51 -0300 Subject: [PATCH 12/13] Update org.springframework.data to 2022.0.2 Closes gh-12712 --- 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 4dd65bbaf0..c39287d88b 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -12,7 +12,7 @@ dependencies { api platform("io.rsocket:rsocket-bom:1.1.3") api platform("org.junit:junit-bom:5.9.2") api platform("org.mockito:mockito-bom:4.8.1") - api platform("org.springframework.data:spring-data-bom:2022.0.0") + api platform("org.springframework.data:spring-data-bom:2022.0.2") 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.14.2") From 6f1c9184db781b2444325f0478a32b18eb49c3dc Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 17 Feb 2023 14:53:54 -0300 Subject: [PATCH 13/13] Update spring-ldap-core to 3.0.1 Closes gh-12713 --- 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 c39287d88b..ef41885f91 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -68,7 +68,7 @@ dependencies { api "org.skyscreamer:jsonassert:1.5.1" api "org.slf4j:log4j-over-slf4j:1.7.36" api "org.slf4j:slf4j-api:2.0.6" - api "org.springframework.ldap:spring-ldap-core:3.0.0" + api "org.springframework.ldap:spring-ldap-core:3.0.1" api "org.synchronoss.cloud:nio-multipart-parser:1.1.0" api 'org.apache.maven.resolver:maven-resolver-connector-basic:1.8.2' api 'org.apache.maven.resolver:maven-resolver-impl:1.8.2'