codeconsole opened a new pull request, #16413: URL: https://github.com/apache/grails-core/pull/16413
**Draft until SiteMesh 3.3.0-RC3 is released.** It uses `3.3.0-SNAPSHOT` until then. It builds on #16410 (SiteMesh 3.3.0-RC2), so until that merges, this diff includes #16410's two commits; the changes here are the last two. ### Why The Grails plugin decides whether SiteMesh's view-resolver integration is active with a check of its own, because the starter's condition was package-private. That copy is what drifted when RC2 began binding `sitemesh.integration` as an enum, and #16410 brings it back in line with `OnSiteMeshViewResolverIntegrationCondition`, a second copy of the starter's logic. SiteMesh now exposes the starter's condition as `@ConditionalOnSiteMeshIntegration` (with `@ConditionalOnSiteMeshWrapMode` alongside it), and uses it for its own auto-configurations. This PR gates `Sitemesh3GrailsPlugin` with it and deletes the Grails copy, so the plugin and the starter share one implementation and cannot disagree again. ### Changes - `dependencies.gradle`: `starter-sitemesh` / `spring-webmvc-sitemesh` move to `3.3.0-SNAPSHOT`, resolved from the Central snapshot repository as `GrailsRepoSettingsPlugin` already allows for `org.sitemesh`. - `Sitemesh3GrailsPlugin`: `@ConditionalOnSiteMeshIntegration(Integration.VIEW_RESOLVER)` replaces `@Conditional(OnSiteMeshViewResolverIntegrationCondition)`, and `OnSiteMeshViewResolverIntegrationCondition` is removed. ### Verification (against SiteMesh `3.3.0-SNAPSHOT` `20260926.122446-33` from the Central snapshot repository) - `Sitemesh3AutoConfigurationSpec`: the cases from #16410 for each `sitemesh.integration` spelling, `filter`, an unknown value failing startup, and the plugin and starter configurations activating together pass unchanged with SiteMesh's annotation. - `:grails-sitemesh3:test`: 96 tests green (forced rerun) - `:grails-test-examples-gsp-sitemesh3:check`: 21 integration tests green (forced rerun) - `validateDependencyVersions` across all modules: green - `:grails-sitemesh3:codeStyle`: no Checkstyle or CodeNarc violations ### When 3.3.0-RC3 is released - Switch both versions to `3.3.0-RC3` and rerun the verification against the Central artifact. - Mark the PR ready for review. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
