Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-25 13:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkExpectedBranchVersion trim version

Browse Source
This commit is contained in:
Rob Winch 2024-11-08 15:10:31 -06:00
parent f28c26fd54
commit fd900c288e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/security/CheckExpectedBranchVersionPlugin.java
View File

@ -51,7 +51,7 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
String version = (String) project.getVersion(); String version = (String) project.getVersion();
String branchVersion = getBranchVersion(project); String branchVersion = getBranchVersion(project);
if (!branchVersion.matches("^[0-9]+\\.[0-9]+\\.x$")) { 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; return;
} }
if (!versionsMatch(version, branchVersion)) { if (!versionsMatch(version, branchVersion)) {
@ -67,7 +67,7 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
exec.setErrorOutput(System.err); exec.setErrorOutput(System.err);
exec.setStandardOutput(baos); exec.setStandardOutput(baos);
}); });
return baos.toString(); return baos.toString().trim();
} }
} }