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

Conversation

nor-ek
Copy link
Contributor

@nor-ek nor-ek commented Oct 21, 2021

According to gh-1033 issue I've moved files from org.springframework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers in src/main/kotlin.

Firstly files used to be moved to org.springframework.security.config.annotation.web but I've noticed that in src/main/java similar files are in .configurers the subpackage.

marcusdacoregio and others added 29 commits October 7, 2021 15:08
AspectJ doesn't support JDK17 language level (yet).
For the time being, this commit is downgrading the language level for
the aspectJ generated classes to 1.8.

Issue spring-projectsgh-10349
The dependency is not needed anymore and there is a issue when using OpenJDK 13 or higher reactor/BlockHound#33

Issue spring-projectsgh-10343
AspectJ doesn't support JDK17 language level (yet).
For the time being, this commit is downgrading the language level for
the aspectJ generated classes to 1.8.

Issue spring-projectsgh-10349
The dependency is not needed anymore and there is a issue when using OpenJDK 13 or higher reactor/BlockHound#33

Issue spring-projectsgh-10343
Copy the code from the library and change it to support the Jakarta classes

Issue spring-projectsgh-10360
…springframework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers

spring-projectsgh-10333 ref(annotation): cleanup imports
spring-projectsgh-10333 ref(annotation): fix imports
…amework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers
# Conflicts:
#	cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/CsrfDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/FormLoginDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HttpBasicDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HttpSecurityDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/LogoutDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2LoginDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ResourceServerDsl.kt
#	config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/X509Dsl.kt
#	config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java
#	config/src/test/kotlin/org/springframework/security/config/annotation/web/configurers/RememberMeDslTests.kt
#	dependencies/spring-security-dependencies.gradle
#	gradle.properties
#	web/src/main/java/org/springframework/security/web/FilterInvocation.java
@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Oct 21, 2021
@nor-ek nor-ek changed the title Gh 10333 Gh-10333 move HttpSecurityDsl to another package Oct 21, 2021
@rwinch rwinch force-pushed the 6.0.x branch 3 times, most recently from d7be5da to d240d73 Compare October 26, 2021 20:31
@jzheaux
Copy link
Contributor

jzheaux commented Oct 27, 2021

Hi, @nor-ek. It looks like we may merge 6.0.x into main. That may change my rebasing advice for this PR. Due to that, I'm going to hold off on a review of this PR until that happens.

@jzheaux jzheaux added in: config An issue in spring-security-config status: duplicate A duplicate of another issue type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Oct 27, 2021
@jzheaux jzheaux added this to the 6.x milestone Oct 27, 2021
@rwinch rwinch deleted the branch spring-projects:6.0.x November 1, 2021 13:54
@rwinch rwinch closed this Nov 1, 2021
@jzheaux
Copy link
Contributor

jzheaux commented Nov 1, 2021

Hi, @nor-ek. 6.0.x is now main. Would you please take your branch, rebase off of main and then submit a new PR?

Also, regarding your question about packages, you can confirm this by doing the following command:

gw check && gw s101 | grep feedbackDependencies

The result will contain a line like this:

1-Nov-2021 09:50:43,309 [main] INFO  - OKAY! feedbackDependencies didn't change! Still at 28 (fail-on-feedback-dependencies)

The s101 command analyzes the codebase for package tangles. If the result says "Still at 28", then the issue is not correctly addressed yet. That is, the number of feedbackDependencies should fall with your changes in place.

@jzheaux jzheaux modified the milestones: 6.x, 6.0.0-M1 Nov 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: config An issue in spring-security-config status: duplicate A duplicate of another issue type: enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants