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

Updated Spring Boot version from 2.1.0.M4 to 2.1.0.RELEASE #6084

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Updated Spring Boot version from 2.1.0.M4 to 2.1.0.RELEASE #6084

merged 1 commit into from
Nov 14, 2018

Conversation

raphaelDL
Copy link
Contributor

@raphaelDL raphaelDL commented Nov 13, 2018 •
edited by rwinch
Loading

Fixes #6082

@raphaelDL raphaelDL mentioned this pull request Nov 13, 2018
Closed
@rwinch
Copy link
Member

rwinch commented Nov 14, 2018

Thanks for the PR @raphaelDL!

It appears the build failed. This was because I missed a step. Sorry about that.

Can you please update any references of thymeleaf-extras-springsecurity4 to thymeleaf-extras-springsecurity5? Once you have done that the build will pass (I verified locally).

If you are using a Linux based system you can use ripgrep along with the following to do the find/replace.

rg -l thymeleaf-extras-springsecurity4 | xargs sed -i -e 's/thymeleaf-extras-springsecurity4/thymeleaf-extras-springsecurity5/'

You can also refer to the following locations if you cannot use the command above:

samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle
10:	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'

samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle
11:	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'

samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle
11:	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'

samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle
9:	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'

samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle
12:	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'

docs/guides/src/docs/asciidoc/helloworld-boot.asc
35:<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">

samples/boot/helloworld/src/main/resources/templates/index.html
2:<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">

docs/guides/src/docs/asciidoc/_hello-includes/secure-the-application-boot.asc
29:	<artifactId>thymeleaf-extras-springsecurity4</artifactId>	<1>

samples/boot/oauth2login/src/main/resources/templates/index.html
2:<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">

samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html
2:<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">

samples/boot/oauth2webclient/src/main/resources/templates/index.html
2:<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">

If you want to double check you can run the following after you have made the changes:

./gradlew build

Once you are done you can amend the commit and force push to your branch to update the PR and trigger another build. If you need help with any of this, please let me know.

@rwinch rwinch self-assigned this Nov 14, 2018
@raphaelDL
Copy link
Contributor Author

Thank you, I know... I'm about to send my commit, just waiting for the tests to finish :)

@raphaelDL
Copy link
Contributor Author

Sorry I was trying something else before pushing my commit, all tests take 13mins in my machine. I ran them all three times 🙃

@raphaelDL
Copy link
Contributor Author

@rwinch CI is running now

@raphaelDL
Copy link
Contributor Author

@rwinch it’s ready :)

@rwinch rwinch added status: duplicate A duplicate of another issue in: build An issue in the build type: enhancement A general enhancement and removed waiting-for-changes labels Nov 14, 2018
@rwinch rwinch added this to the 5.2.0.M1 milestone Nov 14, 2018
@rwinch rwinch merged commit ac026e2 into spring-projects:master Nov 14, 2018
@rwinch
Copy link
Member

rwinch commented Nov 14, 2018

Thanks @raphaelDL! This is now merged into master 😄

@raphaelDL
Copy link
Contributor Author

@rwinch just a side note, while updating the docs I noticed it guides you through a helloworld sample described as a maven project, but the sample is build using gradle.

Hello Spring Security with Boot

Not sure if I'm right

@rwinch
Copy link
Member

rwinch commented Nov 14, 2018

Thanks for the heads up @raphaelDL! This will be addressed in #5026 It also overlaps with us rewriting the docs for 5.2 #2567

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rwinch rwinch

Labels
in: build An issue in the build status: duplicate A duplicate of another issue type: enhancement A general enhancement
Projects
None yet
Milestone
5.2.0.M1
Development

Successfully merging this pull request may close these issues.
2 participants
@raphaelDL @rwinch