Skip to content

Commit 37c4d4c

Browse files
committed
git merge
Signed-off-by: chanbinme <[email protected]>
2 parents 39b5cf5 + 1d2d268 commit 37c4d4c

File tree

4,040 files changed

+14396
-39275
lines changed

Some content is hidden

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

4,040 files changed

+14396
-39275
lines changed

.github/workflows/check-snapshots.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI
2+
3+
on:
4+
schedule:
5+
- cron: '0 10 * * *' # Once per day at 10am UTC
6+
workflow_dispatch: # Manual trigger
7+
8+
env:
9+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
snapshot-test:
16+
name: Test Against Snapshots
17+
uses: spring-io/spring-security-release-tools/.github/workflows/test.yml@v1
18+
strategy:
19+
matrix:
20+
include:
21+
- java-version: 21-ea
22+
toolchain: 21
23+
- java-version: 17
24+
toolchain: 17
25+
with:
26+
java-version: ${{ matrix.java-version }}
27+
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot,https://oss.sonatype.org/content/repositories/snapshots -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=7.+ -PreactorVersion=2025.+ -PspringDataVersion=2025.+ --stacktrace
28+
secrets: inherit
29+
send-notification:
30+
name: Send Notification
31+
needs: [ snapshot-test ]
32+
if: ${{ !success() }}
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Send Notification
36+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
37+
with:
38+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,24 @@ jobs:
2727
java-version: ${{ matrix.jdk }}
2828
distribution: temurin
2929
secrets: inherit
30-
test:
31-
name: Test Against Snapshots
32-
uses: spring-io/spring-security-release-tools/.github/workflows/test.yml@v1
33-
strategy:
34-
matrix:
35-
include:
36-
- java-version: 21-ea
37-
toolchain: 21
38-
- java-version: 17
39-
toolchain: 17
40-
with:
41-
java-version: ${{ matrix.java-version }}
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
43-
secrets: inherit
4430
deploy-artifacts:
4531
name: Deploy Artifacts
46-
needs: [ build, test]
32+
needs: [ build]
4733
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
4834
with:
4935
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
36+
default-publish-milestones-central: true
5037
secrets: inherit
5138
deploy-docs:
5239
name: Deploy Docs
53-
needs: [ build, test ]
40+
needs: [ build ]
5441
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
5542
with:
5643
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
5744
secrets: inherit
5845
deploy-schema:
5946
name: Deploy Schema
60-
needs: [ build, test ]
47+
needs: [ build ]
6148
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
6249
with:
6350
should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }}
@@ -69,7 +56,7 @@ jobs:
6956
with:
7057
should-perform-release: ${{ needs.deploy-artifacts.outputs.artifacts-deployed }}
7158
project-version: ${{ needs.deploy-artifacts.outputs.project-version }}
72-
milestone-repo-url: https://repo.spring.io/artifactory/milestone
59+
milestone-repo-url: https://repo1.maven.org/maven2
7360
release-repo-url: https://repo1.maven.org/maven2
7461
artifact-path: org/springframework/security/spring-security-core
7562
slack-announcing-id: spring-security-announcing

CONTRIBUTING.adoc

Lines changed: 3 additions & 0 deletions

acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2004-present the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)