Merge branch '1.1.x'

jgrandja · jgrandja · commit ba2ac9b7b850 · 2023-08-22T10:07:40.000-07:00
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -23,5 +23,5 @@ dependencies {
 	implementation "org.hidetake:gradle-ssh-plugin:2.10.1"
 	implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0"
 	implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
-	implementation "org.springframework:spring-core:6.0.10"
+	implementation "org.springframework:spring-core:6.0.11"
 }
diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/dependencies/spring-authorization-server-dependencies.gradle
@@ -19,6 +19,6 @@ dependencies {
 		api "com.squareup.okhttp3:mockwebserver:4.10.0"
 		api "com.squareup.okhttp3:okhttp:4.10.0"
 		api "com.jayway.jsonpath:json-path:2.8.0"
-		api "org.hsqldb:hsqldb:2.7.1"
+		api "org.hsqldb:hsqldb:2.7.2"
 	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@ version=1.2.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true
-springFrameworkVersion=6.0.10
-springSecurityVersion=6.1.1
+springFrameworkVersion=6.0.11
+springSecurityVersion=6.1.2
 springJavaformatVersion=0.0.38
 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2
 checkstyleToolVersion=8.34

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ dependencies {`
`23`	`23`	`implementation "org.hidetake:gradle-ssh-plugin:2.10.1"`
`24`	`24`	`implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0"`
`25`	`25`	`implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"`
`26`		`- implementation "org.springframework:spring-core:6.0.10"`
	`26`	`+ implementation "org.springframework:spring-core:6.0.11"`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ dependencies {`
`19`	`19`	`api "com.squareup.okhttp3:mockwebserver:4.10.0"`
`20`	`20`	`api "com.squareup.okhttp3:okhttp:4.10.0"`
`21`	`21`	`api "com.jayway.jsonpath:json-path:2.8.0"`
`22`		`- api "org.hsqldb:hsqldb:2.7.1"`
	`22`	`+ api "org.hsqldb:hsqldb:2.7.2"`
`23`	`23`	`}`
`24`	`24`	`}`