Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh-10333 move HttpSecurityDsl to another package #10429

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c84f5ff
Update to Spring Security 6.0
marcusdacoregio Oct 7, 2021
d53c7f3
Temporarily downgrade Java compat level for AspectJ classes
marcusdacoregio Oct 6, 2021
30812ec
Remove BlockHound dependency
marcusdacoregio Oct 7, 2021
0151013
Upgrade to JDK 17
marcusdacoregio Oct 7, 2021
d6aa265
Switch workflows to use a JDK17 baseline
marcusdacoregio Oct 7, 2021
e89daab
Point to Samples on 6.0.x branch
marcusdacoregio Oct 8, 2021
887b41f
Remove remoting technologies support
marcusdacoregio Oct 13, 2021
ca8b772
Upgrade to AspectJ 1.9.8-RC1
marcusdacoregio Oct 11, 2021
2cff7cf
Update to Spring Framework 6.0
marcusdacoregio Oct 11, 2021
c138f25
Update to Spring JavaFormat 0.0.29
marcusdacoregio Oct 11, 2021
706dc3e
Disable CAS module
marcusdacoregio Oct 11, 2021
22954bb
Drop EhCache2 support
marcusdacoregio Oct 12, 2021
72ba43a
Update to Spring Security 6.0
marcusdacoregio Oct 7, 2021
8d867b0
Temporarily downgrade Java compat level for AspectJ classes
marcusdacoregio Oct 6, 2021
a3b60ae
Remove BlockHound dependency
marcusdacoregio Oct 7, 2021
b75a469
Upgrade to JDK 17
marcusdacoregio Oct 7, 2021
a8b3cf4
Switch workflows to use a JDK17 baseline
marcusdacoregio Oct 7, 2021
adc87ee
Point to Samples on 6.0.x branch
marcusdacoregio Oct 8, 2021
db085af
Remove remoting technologies support
marcusdacoregio Oct 13, 2021
d09f203
Upgrade to AspectJ 1.9.8-RC1
marcusdacoregio Oct 11, 2021
b0c70a3
Update to Spring Framework 6.0
marcusdacoregio Oct 11, 2021
aa5564e
Fix CAS Client Java lib not working with Jakarta EE 9
marcusdacoregio Oct 19, 2021
ff12c9d
Drop EhCache2 support
marcusdacoregio Oct 12, 2021
120256e
Update Structure101 version
marcusdacoregio Oct 12, 2021
ab11efb
gh-10333 ref(annotation): move all Dsl files from org.springframework…
nor-ek Oct 19, 2021
cf66f80
gh-10333 ref(annotation): move tests from org.springframework.securit…
nor-ek Oct 20, 2021
4469038
Merge branch 'gh-10333' into 6.0.x
nor-ek Oct 21, 2021
cd43cdf
gh-10333 after merge upstream fixes
nor-ek Oct 21, 2021
310b237
gh-10333 after merge upstream fixes
nor-ek Oct 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 14 additions & 14 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
name: Determine if should continue
if: env.RUN_JOBS == 'true'
run: echo "::set-output name=runjobs::true"
build_jdk_11:
name: Build JDK 11
build_jdk_17:
name: Build JDK 17
needs: [prerequisites]
strategy:
matrix:
Expand All @@ -38,10 +38,10 @@ jobs:
if: needs.prerequisites.outputs.runjobs
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -88,7 +88,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -109,7 +109,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -122,14 +122,14 @@ jobs:
./gradlew check s101 --stacktrace
deploy_artifacts:
name: Deploy Artifacts
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -149,14 +149,14 @@ jobs:
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
deploy_docs:
name: Deploy Docs
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -173,14 +173,14 @@ jobs:
DOCS_HOST: ${{ secrets.DOCS_HOST }}
deploy_schema:
name: Deploy Schema
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Setup gradle user name
run: |
mkdir -p ~/.gradle
Expand All @@ -197,7 +197,7 @@ jobs:
DOCS_HOST: ${{ secrets.DOCS_HOST }}
notify_result:
name: Check for failures
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles, deploy_artifacts, deploy_docs, deploy_schema]
needs: [build_jdk_17, snapshot_tests, check_samples, check_tangles, deploy_artifacts, deploy_docs, deploy_schema]
if: failure()
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: env.RUN_JOBS == 'true'
uses: actions/setup-java@v1
with:
java-version: '11'
java-version: '17'
- name: Cache Gradle packages
if: env.RUN_JOBS == 'true'
uses: actions/cache@v2
Expand Down
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?l

= Spring Security

Spring Security provides security services for the https://docs.spring.io[Spring IO Platform]. Spring Security 5.0 requires Spring 5.0 as
a minimum and also requires Java 8.
Spring Security provides security services for the https://docs.spring.io[Spring IO Platform]. Spring Security 6.0 requires Spring 6.0 as
a minimum and also requires Java 17.

For a detailed list of features and access to the latest release, please visit https://spring.io/projects[Spring projects].

Expand All @@ -30,9 +30,9 @@ In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked fr
a cross-platform, self-contained bootstrap mechanism for the build.

=== Prerequisites
https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK11 build].
https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK17 build].

Be sure that your `JAVA_HOME` environment variable points to the `jdk-11` folder extracted from the JDK download.
Be sure that your `JAVA_HOME` environment variable points to the `jdk-17` folder extracted from the JDK download.

=== Check out sources
[indent=0]
Expand Down
2 changes: 0 additions & 2 deletions acl/spring-security-acl.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ dependencies {
api 'org.springframework:spring-jdbc'
api 'org.springframework:spring-tx'

optional 'net.sf.ehcache:ehcache'

testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.junit.jupiter:junit-jupiter-params"
Expand Down

This file was deleted.

Loading