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.

Sign up for GitHub

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

Jump to bottom

Resolve HttpSecurityDsl Package Tangle #10333

Closed
jzheaux opened this issue Sep 29, 2021 · 6 comments
Closed

Resolve HttpSecurityDsl Package Tangle #10333

jzheaux opened this issue Sep 29, 2021 · 6 comments
Assignees
@nor-ek
Labels
in: config An issue in spring-security-config type: breaks-passivity A change that breaks passivity with the previous release type: enhancement A general enhancement
Milestone
6.0.0-M1

Comments

@jzheaux
Copy link
Contributor

jzheaux commented Sep 29, 2021

Resolve package tangle between org.springframework.security.config.web and org.springframework.security.config.annotation.web.
@jzheaux jzheaux added this to the 6.x milestone Sep 29, 2021
@jzheaux jzheaux added in: config An issue in spring-security-config type: enhancement A general enhancement labels Sep 29, 2021
@nor-ek
Copy link
Contributor

nor-ek commented Oct 4, 2021 •
edited
Loading

Previous thought:

Hey, what's the direction of the changes? Is moving .server into the annotation package enough? Could you let me know where to find more information? I'm new to that module. Despite the above, my thought. I suppose SecurityWebFiltersOrder may be replaced by FilterOrderRegistration. The goal of the task is to ensure that annotation contains replacements for the previous package?

Edit: After deeper research I've noticed that you are probably talking about Kotlin package org.springframework.security.config.web.servlet. As I see many Dsl are using java classes that are in org.springframework.security.config.annotation.web. It's not expected behavior, yep? Could you tell me then what's the direction of expected changes is?

@jzheaux
Copy link
Contributor Author

jzheaux commented Oct 6, 2021

Hi, @nor-ek, yes you are correct that this has to do with the classes in src/main/kotlin. I believe these can simply be moved to the org.springframework.security.config.annotation.web package, still in src/main/kotlin.

As this is a breaking change, let's wait until work on 6.x is started so this can be done on that branch.

@nor-ek
Copy link
Contributor

nor-ek commented Oct 7, 2021 •
edited
Loading

@jzheaux Okay, so the task is to move all Dsl files from org.springframework.security.config.web.servlet that have dependencies to org.springframework.security.config.annotation.web?

You can assign me to that task. I'll do this on the branch and that will wait till 6.x. I'm open to other first-timers tasks if you have any in mind.

@jzheaux
Copy link
Contributor Author

jzheaux commented Oct 13, 2021

@nor-ek, the 6.0.x branch is now available. Thanks for taking a look.

nor-ek pushed a commit to nor-ek/spring-security that referenced this issue Oct 19, 2021
spring-projectsgh-10333 ref(annotation): move all Dsl files from org.…
e27c309 
…springframework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers
nor-ek pushed a commit to nor-ek/spring-security that referenced this issue Oct 19, 2021
spring-projectsgh-10333 ref(annotation): cleanup imports
23c0c75
nor-ek pushed a commit to nor-ek/spring-security that referenced this issue Oct 19, 2021
spring-projectsgh-10333 ref(annotation): fix imports
43d7bd3
nor-ek pushed a commit to nor-ek/spring-security that referenced this issue Oct 20, 2021
spring-projectsgh-10333 ref(annotation): move tests from org.springfr…
f8d785a 
…amework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers
@nor-ek nor-ek mentioned this issue Oct 20, 2021
Closed
nor-ek added a commit to nor-ek/spring-security that referenced this issue Oct 20, 2021
@nor-ek
spring-projectsgh-10333 ref(annotation): move all Dsl files from org.…
ab11efb 
…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
nor-ek added a commit to nor-ek/spring-security that referenced this issue Oct 20, 2021
@nor-ek
spring-projectsgh-10333 ref(annotation): move tests from org.springfr…
cf66f80 
…amework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers
nor-ek added a commit to nor-ek/spring-security that referenced this issue Oct 21, 2021
@nor-ek
Merge branch 'spring-projectsgh-10333' into 6.0.x
4469038 
# 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
nor-ek added a commit to nor-ek/spring-security that referenced this issue Oct 21, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
cd43cdf
nor-ek added a commit to nor-ek/spring-security that referenced this issue Oct 21, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
310b237
@nor-ek nor-ek mentioned this issue Oct 21, 2021
Closed
@nor-ek
Copy link
Contributor

nor-ek commented Oct 21, 2021

@jzheaux Pull-request is available here: #10429.

Finally I've moved files to org.springframework.security.config.annotation.web.configurers, more info in PR. Let me know if that's fine.

nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 ref(annotation): move all Dsl files from org.…
072a300 
…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
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 ref(annotation): move tests from org.springfr…
8e791c8 
…amework.security.config.web.servlet to org.springframework.security.config.annotation.web.configurers
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
c2ed404
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
fd16815
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
d1fdc89
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
bf55c25
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
a8928a3
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 ref(annotation): move all Dsl files from org.…
c263b8c 
…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
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 after merge upstream fixes
d9251e1
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 4, 2021
@nor-ek
spring-projectsgh-10333 cleanup after rebase
14f650e
@nor-ek nor-ek mentioned this issue Nov 5, 2021
Closed
@nor-ek
Copy link
Contributor

nor-ek commented Nov 5, 2021

@jzheaux sorry for the mess above. Finally, I've got Pull Request.

@jzheaux jzheaux added the type: breaks-passivity A change that breaks passivity with the previous release label Nov 5, 2021
@jzheaux jzheaux modified the milestones: 6.x, 6.0.0-M1 Nov 5, 2021
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 5, 2021
@nor-ek
Move Dsl files to annotation Package
8e23ef3 
spring-projectsgh-10333 move dsl files from org.springframework.security.config.web.servlet to org.springframework.security.config.annotation.web in tests and src.
nor-ek added a commit to nor-ek/spring-security that referenced this issue Nov 5, 2021
@nor-ek
Import cleanup
d740ed0 
spring-projectsgh-10333 remove unnecessary imports
jzheaux pushed a commit that referenced this issue Nov 19, 2021
@nor-ek @jzheaux
Import cleanup
4bc5576 
Issue gh-10333
jzheaux added a commit that referenced this issue Nov 19, 2021
@jzheaux
Establish new Package Tangle Baseline
4374905 
Ran ./gradlew check && ./gradlew s101 -Ps101.label=baseline

Issue gh-10333
@arthurgregorio arthurgregorio mentioned this issue Dec 14, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@nor-ek nor-ek

Labels
in: config An issue in spring-security-config type: breaks-passivity A change that breaks passivity with the previous release type: enhancement A general enhancement
Projects
None yet
Milestone
6.0.0-M1
Development

No branches or pull requests
2 participants
@jzheaux @nor-ek