Browse Source

Merge branch '1.1.x'

Joe Grandja 2 years ago
parent
commit
ba2ac9b7b8

+ 1 - 1
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"
 }

+ 1 - 1
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"
 	}
 }

+ 2 - 2
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