Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x' into 6.3.x

This commit is contained in:
Marcus Hert Da Coregio 2024-06-28 09:32:37 -03:00
parent 09909d11e1 24f573dd4c
commit 675eda1945
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' java-version: '17'
distribution: 'temurin' distribution: 'temurin'
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew clean build --continue run: ./gradlew clean build -PskipCheckExpectedBranchVersion --continue
generate-docs: generate-docs:
name: Generate Docs name: Generate Docs
runs-on: ubuntu-latest 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 @TaskAction
public void run() throws IOException { public void run() throws IOException {
Project project = getProject(); Project project = getProject();
if (project.hasProperty("skipCheckExpectedBranchVersion")) {
return;
}
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$")) {