Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-02-28 18:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8.x' into 6.2.x

Browse Source
This commit is contained in:
Marcus Hert Da Coregio 2024-06-28 09:32:25 -03:00
commit 24f573dd4c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pr-build-workflow.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Build with Gradle
run: ./gradlew clean build --continue
run: ./gradlew clean build -PskipCheckExpectedBranchVersion --continue
generate-docs:
name: Generate Docs
runs-on: ubuntu-latest

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

@ -45,6 +45,9 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
@TaskAction
public void run() throws IOException {
Project project = getProject();
if (project.hasProperty("skipCheckExpectedBranchVersion")) {
return;
}
String version = (String) project.getVersion();
String branchVersion = getBranchVersion(project);
if (!branchVersion.matches("^[0-9]+\\.[0-9]+\\.x$")) {