Merge branch '3.1.x'

Closes gh-2548

build.gradle

@@ -30,7 +30,6 @@ plugins {
 }
 
 apply plugin: 'io.spring.convention.root'
-apply plugin: 'org.springframework.security.update-dependencies'
 
 group = 'org.springframework.session'
 description = 'Spring Session'
@@ -57,27 +56,3 @@ nohttp {
 	source.exclude "spring-session-docs/.gradle/nodejs/**"
 	source.exclude "spring-session-docs/modules/ROOT/examples/**/build/**"
 }
-
-tasks.named("updateDependencies") {
-	// we aren't Gradle 8 compatible yet
-	checkForGradleUpdate = false
-}
-
-updateDependenciesSettings {
-	gitHub {
-		organization = "spring-projects"
-		repository = "spring-session"
-	}
-	dependencyExcludes {
-		majorVersionBump()
-		minorVersionBump()
-		alphaBetaVersions()
-		snapshotVersions()
-	}
-	setFiles({
-		return [
-				project.file("gradle/dependency-management.gradle"),
-				project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")
-		]
-	})
-}

buildSrc/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id "java-gradle-plugin"
     id "java"
     id "groovy"
-    id 'com.apollographql.apollo' version '2.4.5'
 }
 
 sourceCompatibility = JavaVersion.VERSION_11
@@ -47,10 +46,6 @@ gradlePlugin {
             id = "org.springframework.propdeps"
             implementationClass = "org.springframework.gradle.propdeps.PropDepsPlugin"
         }
-        updateDependencies {
-            id = "org.springframework.security.update-dependencies"
-            implementationClass = "org.springframework.security.convention.versions.UpdateDependenciesPlugin"
-        }
     }
 }
 
@@ -78,6 +73,7 @@ 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 libs.com.squareup.okhttp3.okhttp
 
     testImplementation platform('org.junit:junit-bom:5.8.1')
     testImplementation "org.junit.jupiter:junit-jupiter-api"

buildSrc/settings.gradle

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+	versionCatalogs {
+		libs {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}