Merge branch '1.2.x' into 1.3.x

Closes gh-1771

.github/workflows/continuous-integration-workflow.yml

@@ -8,6 +8,9 @@ on:
     - cron: '0 10 * * *' # Once per day at 10am UTC
   workflow_dispatch:
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+
 jobs:
   build:
     name: Build

.github/workflows/pr-build-workflow.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - '**'
 
+env:
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+
 jobs:
   build:
     name: Build

build.gradle

@@ -15,9 +15,9 @@ springRelease {
 	replaceSnapshotVersionInReferenceDocUrl = true
 }
 
-if (hasProperty("buildScan")) {
+develocity {
 	buildScan {
-		termsOfServiceUrl = "https://gradle.com/terms-of-service"
+		termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use'
-		termsOfServiceAgree = "yes"
+		termsOfUseAgree = 'yes'
 	}
 }

settings.gradle

@@ -5,8 +5,7 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.16.2"
+	id "io.spring.develocity.conventions" version "0.0.22"
-	id "io.spring.ge.conventions" version "0.0.15"
 }
 
 dependencyResolutionManagement {