Skip to content

Commit 7c9df88

Browse files
authored
Merge branch 'main' into gh-16390
Signed-off-by: yoobin_mion <[email protected]>
2 parents 9cd831b + d8043dc commit 7c9df88

File tree

1,411 files changed

+22603
-29892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,411 files changed

+22603
-29892
lines changed

.github/dependabot.template.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,32 @@ registries:
44
type: maven-repository
55
url: https://repo.spring.io/milestone
66
updates:
7+
- package-ecosystem: gradle
8+
target-branch: 6.5.x
9+
directory: /
10+
schedule:
11+
interval: daily
12+
time: '03:00'
13+
timezone: Etc/UTC
14+
labels:
15+
- 'type: dependency-upgrade'
16+
registries:
17+
- spring-milestones
18+
ignore:
19+
- dependency-name: com.nimbusds:nimbus-jose-jwt
20+
- dependency-name: org.python:jython
21+
- dependency-name: org.apache.directory.server:*
22+
- dependency-name: org.apache.directory.shared:*
23+
- dependency-name: org.junit:junit-bom
24+
update-types:
25+
- version-update:semver-major
26+
- dependency-name: org.mockito:mockito-bom
27+
update-types:
28+
- version-update:semver-major
29+
- dependency-name: '*'
30+
update-types:
31+
- version-update:semver-major
32+
- version-update:semver-minor
733
- package-ecosystem: gradle
834
target-branch: 6.4.x
935
directory: /
@@ -85,17 +111,8 @@ updates:
85111
- dependency-name: '*'
86112
update-types:
87113
- version-update:semver-major
114+
- version-update:semver-minor
88115

89-
- package-ecosystem: github-actions
90-
target-branch: 6.4.x
91-
directory: /
92-
schedule:
93-
interval: weekly
94-
labels:
95-
- 'type: task'
96-
- 'in: build'
97-
ignore:
98-
- dependency-name: sjohnr/*
99116
- package-ecosystem: github-actions
100117
target-branch: 6.3.x
101118
directory: /
@@ -106,14 +123,6 @@ updates:
106123
- 'in: build'
107124
ignore:
108125
- dependency-name: sjohnr/*
109-
- package-ecosystem: github-actions
110-
target-branch: main
111-
directory: /
112-
schedule:
113-
interval: weekly
114-
labels:
115-
- 'type: task'
116-
- 'in: build'
117126
- package-ecosystem: github-actions
118127
target-branch: docs-build
119128
directory: /

.github/workflows/codeql.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: "CodeQL Advanced"
2+
3+
on:
4+
push:
5+
pull_request:
6+
workflow_dispatch:
7+
schedule:
8+
# https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule
9+
- cron: '0 5 * * *'
10+
permissions: read-all
11+
jobs:
12+
codeql-analysis-call:
13+
permissions:
14+
actions: read
15+
contents: read
16+
security-events: write
17+
uses: spring-io/github-actions/.github/workflows/codeql-analysis.yml@1

.github/workflows/continuous-integration-workflow.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,48 +39,25 @@ jobs:
3939
toolchain: 17
4040
with:
4141
java-version: ${{ matrix.java-version }}
42-
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace
42+
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot,https://oss.sonatype.org/content/repositories/snapshots -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=7.+ -PreactorVersion=2025.+ -PspringDataVersion=2025.+ --stacktrace
4343
secrets: inherit
44-
check-samples:
45-
name: Check Samples
46-
runs-on: ubuntu-latest
47-
if: ${{ github.repository_owner == 'spring-projects' }}
48-
steps:
49-
- uses: actions/checkout@v4
50-
- name: Set up gradle
51-
uses: spring-io/spring-gradle-build-action@v2
52-
with:
53-
java-version: 17
54-
distribution: temurin
55-
- name: Check samples project
56-
env:
57-
LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
58-
SAMPLES_DIR: ../spring-security-samples
59-
run: |
60-
# Extract version from gradle.properties
61-
version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
62-
# Extract samplesBranch from gradle.properties
63-
samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
64-
./gradlew publishMavenJavaPublicationToLocalRepository
65-
./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
66-
./gradlew --refresh-dependencies --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" test integrationTest
6744
deploy-artifacts:
6845
name: Deploy Artifacts
69-
needs: [ build, test, check-samples ]
46+
needs: [ build, test]
7047
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
7148
with:
7249
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
7350
secrets: inherit
7451
deploy-docs:
7552
name: Deploy Docs
76-
needs: [ build, test, check-samples ]
53+
needs: [ build, test ]
7754
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
7855
with:
7956
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
8057
secrets: inherit
8158
deploy-schema:
8259
name: Deploy Schema
83-
needs: [ build, test, check-samples ]
60+
needs: [ build, test ]
8461
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
8562
with:
8663
should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }}

.github/workflows/dependabot-auto-merge-forward.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/gradle-wrapper-upgrade-execution.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ on:
44
schedule:
55
- cron: '0 2 * * *' # 2am UTC
66
workflow_dispatch:
7-
7+
permissions:
8+
pull-requests: write
89
jobs:
910
upgrade_wrapper:
1011
name: Execution

.github/workflows/mark-duplicate-dependabot-prs.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/merge-dependabot-pr.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/release-scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
# List of active maintenance branches.
14-
branch: [ main, 6.4.x, 6.3.x ]
14+
branch: [ main, 6.5.x, 6.4.x, 6.3.x ]
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout

.github/workflows/trigger-dependabot-auto-merge-forward.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)