Merge 7.x (with spring security / mail / redis ) into 8.x#15834
Conversation
chore: merge 5.0.2->5.0.x; bump to 5.0.3-SNAPSHOT
Change version 6.0.0 to 7.0.0
Update installation.adoc
…Store Fix/plugin rest pac4j jee session store
Replaces usage of './gradlew runCommand "-Pargs=..."' with './grailsw ...' in documentation and command usage messages for consistency with Grails 5 conventions.
Update documentation and commands to use ./grailsw instead of ./gradlew
Updated .sdkmanrc and gradle-wrapper.properties to use Gradle 8.14.3 for improved stability and compatibility.
…urity/S2QuickstartCommand.groovy Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…nfiguration in the yml instead
chore: Removed traces of incubation, DISCLAIMER and PPMC
Replaces individual Grails and Spring dependencies with 'grails-dependencies-starter-web' for compileOnly and 'grails-dependencies-test' for testImplementation. This simplifies dependency management and aligns with recommended Grails practices.
Refactor dependencies to use Grails starter bundles
Removed 'grails-committers' team from required reviewers and added multiple users for release, docs, and close environments.
Set springDependencyManagement to false in all plugin build.gradle files to prevent Grails from managing Spring dependencies. Also added new dependency versions (gbench, guava, nimbus, scribejava) to gradle.properties for future use.
Updated build.gradle files to reference dependency versions from gradle.properties using variables for scribejava, nimbus-jose-jwt, guava, and gbench. Added missing version variables to gradle.properties for improved maintainability and consistency.
Published dependency cleanup
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
enhance gradle s2-quickstart to handle running in a web-plugin profile
|
The last issue is the proxy issue found by the redis test. I'm researching this more. |
|
It was only by side effect that I caught the proxy issues. I'm going to fix the Redis test by just switching the |
|
#15841 is the PR for the hibernate proxy change that this PR found. |
jdaugherty
force-pushed
the
mail-security-redis-8-merge
branch
from
284bc73 to
c0fa768
Compare
|
@jamesfredley I removed the opt-in for atCheckWaiting and included it by default on this PR. this should resolve a lot of the flaky test behavior you've seen. |
|
I've made several more changes to help the flakiness of our tests and turned on reporting for the ones that have see repeat failures so we can debug them more if they continue to occur. |
jdaugherty
force-pushed
the
mail-security-redis-8-merge
branch
from
706bbf0 to
0263bd5
Compare
|
For convenience, here's the link that diffs the material changes built on top of the 7.2.x changes 92e60a0...19ac8b2 |
✅ All tests passed ✅🏷️ Commit: 19ac8b2 Learn more about TestLens at testlens.app. |
sbglasius
left a comment
sbglasius
left a comment
There was a problem hiding this comment.
Reviewed changes in https://github.com/apache/grails-core/pull/15834/changes#diff-1856901f8b015db14695a910ac0e8a8a6e34bc8de5da05a0df5ec2388ff7e134
Looks sane to me.
|
@jamesfredley since this is a merge up, I'm going to go ahead and merge this. We can iterate on the 8.x branch if you feel I've done something incorrectly here. I need these changes merged to fix the latest round of the patches in the 8.x branch. |
9 participants
The 7.x spring security / mail / redis merge was done against the 7.x grails-core branch. This PR merges 7.2.x to 8.x while also pulling in the changes made by @matrei in the 8.x spring security branch to support Grails 8.
Please note: groovy 5 has been merged into grails-core so as part of this merge, I had to fix the spring security code to be compatible with Groovy 5. I opened https://issues.apache.org/jira/browse/GROOVY-12134 after finding a
@Delegatebug involving final methods.