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

Restore Grails Shell + add Spring Boot CLI classes that were removed in Spring Boot 3.0.0 #13585

Merged
merged 19 commits into from
Aug 21, 2024

Conversation

jamesfredley
Copy link
Contributor

@jamesfredley jamesfredley commented Aug 19, 2024

Grails Shell

Important to resolve spring-projects/spring-boot@0555dda#diff-26fb6a79071ed389aa8e3ffe28cc8b0d171930c4e9a5277357170704e52f32c6 which is needed for gorm-hibernate5

puneetbehl and others added 17 commits April 30, 2024 16:59
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… v3.25.10 (#13501)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit addresses an issue of snapshots not
being published by removing the use of `GH_TOKEN` during the
repository checkout process in the workflow file.

The error message is "Error: fatal: could not read Username for
'https://github.com': terminal prompts disabled" when
`actions/checkout@v4` does git fetch.
…e-old-grails-shell-project

Revert "chore(core): Deprecate the old grails-shell project"
fix(deps): update spring-framework to v5.3.37
…rged" (#13580)

This reverts commit 49eb631.

As the problem with the Groovy build is now patched, this workaround can be removed.

Related: #13578, apache/groovy#2103
# Conflicts:
#	.github/workflows/gradle.yml
#	gradle.properties
@jamesfredley
Copy link
Contributor Author

jamesfredley commented Aug 19, 2024

I'll work on the build issue tomorrow

@codeconsole
Copy link
Contributor

codeconsole commented Aug 20, 2024

The title of the pull request is "merge6.2.x into 7.0.x "

The only thing I don't really like about this is combining the merge with adding the Spring Boot CLI. There is no clean way to revert any of this. From what you posted, that looks like the CLI commands were removed in 3.4.x, but 3.4.x isn't even out yet. 7.0.x is currently based off of springBootVersion=3.2.6 Can we break this up a little more? Maybe do the merge first, then add the CLI ?

@jamesfredley jamesfredley changed the title merge6.2.x into 7.0.x merge6.2.x into 7.0.x + add Spring Boot CLI classes that were removed in Spring Boot 3.0.0 Aug 20, 2024
@jamesfredley jamesfredley changed the title merge6.2.x into 7.0.x + add Spring Boot CLI classes that were removed in Spring Boot 3.0.0 Restore Grails Shell + add Spring Boot CLI classes that were removed in Spring Boot 3.0.0 Aug 20, 2024
@jamesfredley
Copy link
Contributor Author

@codeconsole let's do a normal merge instead of squash and merge to keep the merge commit and the other 2 new commits that will allow a clean revert. At the merge commit, the build was failing, because the Spring Boot cli classes were removed in v3.0.0-M5 (github collapses the list of tags).

https://github.com/grails/grails-core/pull/13585/commits

@matrei
Copy link
Contributor

matrei commented Aug 20, 2024

Do we need all these changes/commits in 7.0.x?

@jamesfredley
Copy link
Contributor Author

We could remove some of these classes, but may need them back down the road as we require the functionality, given we can no longer get them from org.springframework.boot:spring-boot-cli: as of 3.0.0. Currently grails-shell and gorm-hibernate5 need a portion of these classes. I have not dug into the other repos to see where we were using org.springframework.boot.cli.*

This PR is the liberal approach.

@jamesfredley
Copy link
Contributor Author

grails-wrapper was the only other reference to org.springframework.boot.cli.*

@codeconsole codeconsole merged commit 97147b3 into 7.0.x Aug 21, 2024
11 checks passed
@jamesfredley jamesfredley deleted the jamesfredley/merge6.2.xInto7.0.x branch August 21, 2024 16:17
@jamesfredley jamesfredley linked an issue Sep 6, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grails Shell for Grails 7
6 participants