From 7907478d363ebf331b9e3c84adf3b3fec91bd594 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 12:17:07 +0200
Subject: [PATCH 1/2] Watch 5.3.x branch in the CI pipeline

Main branch has moved to the 6.0.x line, so this commit updates this CI
pipeline to the new 5.3.x maintenance branch.
---
 ci/parameters.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/parameters.yml b/ci/parameters.yml
index a30e8561a2..28486ecec7 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -5,7 +5,7 @@ github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "main"
+branch: "5.3.x"
 milestone: "5.3.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"

From 00eef79e5c29d953eb5c9a225ca31f5680952b00 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 14:40:42 +0200
Subject: [PATCH 2/2] Upgrade to JApicmp Gradle Plugin 0.3.0

Fixes gh-27414
---
 buildSrc/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 03f629496a..6f5712565d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -8,8 +8,7 @@ repositories {
 }
 
 dependencies {
-	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.2.8"
-	implementation "com.google.guava:guava:28.2-jre" // required by japicmp-gradle-plugin
+	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.3.0"
 }
 
 gradlePlugin {