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

Remove dependency on commons-codec by using java.util.Base64 (for 5.8.x) #11322

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Remove dependency on commons-codec by using java.util.Base64 (for 5.8.x) #11322

merged 1 commit into from
Jun 9, 2022

Conversation

j3graham
Copy link
Contributor

@j3graham j3graham commented Jun 2, 2022

gh-11318

Replace commons-codec Base64 with java.util.Base64

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jun 2, 2022
@rwinch rwinch added type: enhancement A general enhancement in: saml2 An issue in SAML2 modules and removed status: waiting-for-triage An issue we've not yet triaged labels Jun 2, 2022
@jzheaux jzheaux added this to the 5.8.0-M1 milestone Jun 6, 2022
@jzheaux
Copy link
Contributor

jzheaux commented Jun 7, 2022

@j3graham, is there some difficulty you are having with running the build locally? I'd be happy to help you work through it. Committing only after you have a clean local build helps the PR process go a little faster.

@j3graham
Copy link
Contributor Author

j3graham commented Jun 7, 2022

I don't understand why I'm having this much trouble. I have in fact been running builds. Initially I wasn't carefully running clean builds, so that may have given me the impression that I had fixed everything.

I expect it's too late now, but in hindsight, I was unable to find working instructions to configure IntelliJ to follow the formatting standards, and the only way I was able to find the rules for import ordering was by looking at the code for the spring-javaformat plugin.

I'm also a little suspicious of the interaction between the gradle build cache and Checkstyle.

This latest push I cloned to a new directory, deleted the gradle build cache, did a clean build and it's happy.

At this point I've spent more time trying to get the formatting right than it took to make the original change. My apologies for making you spend time on it too.

@jzheaux
Copy link
Contributor

jzheaux commented Jun 7, 2022

@j3graham, gotcha. Sorry to hear that the formatting has been a pain point.

If it helps, here is my IntelliJ import order setup:

import java.*
<blank line>
import javax.*
<blank line>
import jakarta.*
import all other imports
<blank line>
import org.springframework.*
<blank line>
import static all other imports

At this point, it looks like the build is passing; thanks for working on getting past that hurdle.

In preparation for merging, then, will you please squash your commits?

@j3graham
Copy link
Contributor Author

j3graham commented Jun 7, 2022

@jzheaux Hopefully that does it. Thanks for the help.

@jzheaux
Copy link
Contributor

jzheaux commented Jun 8, 2022

Just one more thing, @j3graham, and then we're ready. Will you please include the issue number in the commit message? Like this:

Remove dependency on commons-codec by using java.util.Base64 

Closes gh-11318

This assists with backporting among other things.

@j3graham
Copy link
Contributor Author

j3graham commented Jun 8, 2022

Message updated.

@jzheaux jzheaux merged commit 29ba67b into spring-projects:5.8.x Jun 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: saml2 An issue in SAML2 modules type: enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants