From fd900c288e1473023dc3e68b3399ff6b43135e76 Mon Sep 17 00:00:00 2001
From: Rob Winch <362503+rwinch@users.noreply.github.com>
Date: Fri, 8 Nov 2024 15:10:31 -0600
Subject: [PATCH] checkExpectedBranchVersion trim version

---
 .../security/CheckExpectedBranchVersionPlugin.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/security/CheckExpectedBranchVersionPlugin.java b/buildSrc/src/main/java/org/springframework/security/CheckExpectedBranchVersionPlugin.java
index 9266f7c4d5..1f7357fb15 100644
--- a/buildSrc/src/main/java/org/springframework/security/CheckExpectedBranchVersionPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/security/CheckExpectedBranchVersionPlugin.java
@@ -51,7 +51,7 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
 			String version = (String) project.getVersion();
 			String branchVersion = getBranchVersion(project);
 			if (!branchVersion.matches("^[0-9]+\\.[0-9]+\\.x$")) {
-				System.out.println("Branch version does not match *.x, ignoring");
+				System.out.println("Branch version '" + branchVersion + "' does not match *.x, ignoring");
 				return;
 			}
 			if (!versionsMatch(version, branchVersion)) {
@@ -67,7 +67,7 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
 					exec.setErrorOutput(System.err);
 					exec.setStandardOutput(baos);
 				});
-				return baos.toString();
+				return baos.toString().trim();
 			}
 		}