Skip to content

Merge grails-spring-security, grails-mail, and grails-redis#15792

Open
jdaugherty wants to merge 5074 commits into
7.0.xfrom
merge-mail-redis-security
Open

Merge grails-spring-security, grails-mail, and grails-redis#15792
jdaugherty wants to merge 5074 commits into
7.0.xfrom
merge-mail-redis-security

Conversation

@jdaugherty

@jdaugherty jdaugherty commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Per vote https://lists.apache.org/thread/72rsnnnpcqdn642478xwd8go42rlpt6y , this merges grails-mail, grails-spring-security, and grails-redis.

Some highlights of this PR:

  1. Add a new module: grails-testing-support-redis to facilitate running the redis based tests like the mongodb tests.
  2. code formatting of the imported code bases (since our code style validations apply)
  3. removal of spring dependency management plugin from spring security (transitive dependencies were resolving & it's incompatible with the composite build)
  4. Selenium was unpinned in this merge from '4.25.0', this was supposed to be a temporary workaround because of https://issues.chromium.org/issues/42323769 The real cause was not having a wait { }

After merging this to 7.0.x, I will merge all the way up to 8.0.x and then pull in the 8.x specific changes.

jdaugherty and others added 30 commits September 3, 2025 17:46
Update to Grails 7.0.0-RC2
ci: add commit hash for vote templates
ci: add release abort workflow & update verification script to check svn artifacts
chore: adjust verification script to not error when no differences remain
Add missing new line
remove references to Grails 3 from CAS plugin documentation
chore: merge 5.0.0-RC2->5.0.x; bump to 5.0.0-SNAPSHOT
chore: merge 7.0.0-RC2->7.0.x; bump to 7.0.0-SNAPSHOT
chore: post release scripts
@jdaugherty jdaugherty force-pushed the merge-mail-redis-security branch from 73c3e17 to 47f96da Compare June 30, 2026 02:56
@jdaugherty jdaugherty marked this pull request as ready for review June 30, 2026 11:35
@jdaugherty jdaugherty requested a review from jamesfredley June 30, 2026 11:36
@jdaugherty jdaugherty requested a review from matrei June 30, 2026 11:36
@jdaugherty

Copy link
Copy Markdown
Contributor Author

@jamesfredley since this is a contribution of code from an external source, you must review it as an ASF member.

@jamesfredley

Copy link
Copy Markdown
Contributor

As an ASF member I approve the contribution of this apache 2.0 licensed code being included in grails-core

@jamesfredley

Copy link
Copy Markdown
Contributor

Reviewing it now

Comment thread LICENSE Outdated
Comment thread .github/workflows/gradle.yml
Comment thread grails-spring-security/rest/redis/build.gradle Outdated

/**
*/
@Ignore // if not ignored, this spec expects that additional redis instances are running on localhost ports 6380 and 6381 and will fail without them

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This leaves the multi-connection Redis coverage disabled. Since the PR is adding Redis CI coverage, the multi-pool wiring should either be exercised via testcontainers/CI-provisioned Redis instances or this disabled test should not be counted as covered behavior.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is out of scope of this change. I'm happy to make an issue for this, but we're just trying to merge libraries and I've already done enough on fixing the existing problems.

@jamesfredley

Copy link
Copy Markdown
Contributor

Finding 4 - new Spring Security and Redis CI jobs are not publish gates.

.github/workflows/gradle.yml has publish depend on publishGradle, �uild, unctional, hibernate5Functional, and mongodbFunctional, but not the new security or
edis jobs. As written, snapshot publication can proceed even if those new lanes fail. Please add them to
eeds and gate the if: expression on their results.

@jdaugherty

Copy link
Copy Markdown
Contributor Author

@jamesfredley good catch on the path renames. I've found a few other issues as a result and expanded our verification scripts to catch these cases in the future.

@jdaugherty

Copy link
Copy Markdown
Contributor Author

Finding 4 - new Spring Security and Redis CI jobs are not publish gates.

.github/workflows/gradle.yml has publish depend on publishGradle, �uild, unctional, hibernate5Functional, and mongodbFunctional, but not the new security or edis jobs. As written, snapshot publication can proceed even if those new lanes fail. Please add them to eeds and gate the if: expression on their results.

This was a good catch. I've updated the PR for this.

@jdaugherty

Copy link
Copy Markdown
Contributor Author

@jamesfredley I believe all of your feedback has been implemented. On the slack topic, I don't see anything different about the imported SVGs. It seems like a concern separate from this PR as they're the same SVGs that are in grails-core already / part of the application generation.

@testlens-app

testlens-app Bot commented Jul 1, 2026

Copy link
Copy Markdown

✅ All tests passed ✅

🏷️ Commit: b30b80a
▶️ Tests: 32772 executed
⚪️ Checks: 51/51 completed


Learn more about TestLens at testlens.app.

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

Labels

None yet

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

9 participants