Skip to content

Enable SiteMesh 3 on the 8.x (Spring Boot 4) line #15710

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

Merged
jdaugherty merged 7 commits into from
Jun 3, 2026
+23 −39
Merged

Enable SiteMesh 3 on the 8.x (Spring Boot 4) line #15710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a6496d
Update SiteMesh 3 to 3.3.0-SNAPSHOT for Spring Boot 4
codeconsole Jun 1, 2026
76143a7
Enable SiteMesh 3 on the 8.x (Spring Boot 4) line
codeconsole Jun 1, 2026
cbaba89
Resolve org.sitemesh snapshots in generated applications
codeconsole Jun 1, 2026
9375187
Merge remote-tracking branch 'upstream/8.0.x' into deps/sitemesh3-3.3…
codeconsole Jun 2, 2026
fd5a874
Remove orphaned boot4-disabled-integration-test-config.gradle
codeconsole Jun 2, 2026
c9fa361
Revert grails-layout removal in default profile
jdaugherty Jun 3, 2026
a2e8d39
Merge branch '8.0.x' into deps/sitemesh3-3.3.0-snapshot
jdaugherty Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ ext {
'selenium.version' : '4.38.0',
'sitemesh.version' : '2.6.0',
'spock.version' : '2.3-groovy-4.0',
'starter-sitemesh.version' : '3.2.3',
'spring-webmvc-sitemesh.version': '3.2.3',
'starter-sitemesh.version' : '3.3.0-SNAPSHOT',
'spring-webmvc-sitemesh.version': '3.3.0-SNAPSHOT',
// Spring Boot 4 no longer manages spring-retry; pin it here so the
// grails-shell-cli SpringRetryCompilerAutoConfiguration's unversioned
// reference resolves and consumer apps using @Retryable get a known version.
Expand Down
31 changes: 0 additions & 31 deletions gradle/boot4-disabled-integration-test-config.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/publish-root-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def publishedProjects = [
'grails-scaffolding',
'grails-services',
'grails-shell-cli',
// TODO: 'grails-sitemesh3', // Sitemesh3 has not been updated to support boot 4
'grails-sitemesh3',
'grails-spring',
'grails-taglib',
'grails-test-core',
Expand Down
11 changes: 11 additions & 0 deletions ...forge/grails-forge-core/src/main/java/org/grails/forge/build/gradle/GradleRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ static Set<GradleRepository> getDefaultRepositories(String grailsVersion) {
),
List.of(VersionType.SNAPSHOT)
));
repositories.add(new DefaultGradleRepository(
repositories.size(),
"https://central.sonatype.com/repository/maven-snapshots",
null,
List.of(
new VersionRegexRepoFilter(
"org[.]sitemesh.*", ".*", ".*-SNAPSHOT"

@matrei matrei Jun 3, 2026

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.

We don't need to include -SNAPSHOT in the regex here as that is explicitly set by the VersionType.SNAPSHOT below. (I know you probably followed suit here)

@jdaugherty jdaugherty Jun 3, 2026

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.

FYI: We have the filter on all of the other examples in this file.

)
),
List.of(VersionType.SNAPSHOT)
));
repositories.add(new DefaultGradleRepository(
repositories.size(),
"https://repository.apache.org/content/groups/staging",
Expand Down
2 changes: 1 addition & 1 deletion grails-gsp/grails-sitemesh3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
id 'org.apache.grails.buildsrc.dependency-validator'
id 'org.apache.grails.gradle.grails-plugin'
id 'org.apache.grails.buildsrc.compile'
// TODO: id 'org.apache.grails.buildsrc.publish'
id 'org.apache.grails.buildsrc.publish'
id 'org.apache.grails.buildsrc.sbom'
id 'org.apache.grails.gradle.grails-code-style'
}
Expand Down
4 changes: 4 additions & 0 deletions grails-shell-cli/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,10 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
GrailsGradleRepository repository = new GrailsGradleRepository(url: 'https://repository.apache.org/content/groups/snapshots', snapshotsOnly: true)
repository.includeOnly('org[.]apache[.](grails|groovy).*', '.*', '.*-SNAPSHOT')
configuredRepositories.add(repository)

GrailsGradleRepository sitemeshSnapshots = new GrailsGradleRepository(url: 'https://central.sonatype.com/repository/maven-snapshots', snapshotsOnly: true)
sitemeshSnapshots.includeOnly('org[.]sitemesh.*', '.*', '.*-SNAPSHOT')

@matrei matrei Jun 3, 2026

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.

The regex does not have to include -SNAPSHOT as snapshotsOnly: true is set above. (I know you probably followed suit here).

@jdaugherty jdaugherty Jun 3, 2026

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.

FYI: We have the filter on all of the other examples in this file.

configuredRepositories.add(sitemeshSnapshots)
}
configuredRepositories.unique()
}
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ include(
// gsp
'grails-gsp-core',
'grails-gsp',
// TODO: 'grails-sitemesh3', // sitemesh3 does not support boot 4 at this time
'grails-sitemesh3',
'grails-layout',
'grails-taglib',
'grails-web-gsp',
'grails-web-gsp-taglib',
'grails-web-jsp',
'grails-web-taglib',
// TODO: 'grails-gsp-spring-boot', // sitemesh3 does not support boot4 at this time
'grails-gsp-spring-boot',

'grails-datastore-core',
'grails-datastore-web',
Expand Down Expand Up @@ -235,14 +235,14 @@ project(':grails-dependencies-assets').projectDir = file('grails-dependencies/as

project(':grails-gsp-core').projectDir = file('grails-gsp/core')
project(':grails-gsp').projectDir = file('grails-gsp/plugin')
// TODO: project(':grails-sitemesh3').projectDir = file('grails-gsp/grails-sitemesh3')
project(':grails-sitemesh3').projectDir = file('grails-gsp/grails-sitemesh3')
project(':grails-layout').projectDir = file('grails-gsp/grails-layout')
project(':grails-taglib').projectDir = file('grails-gsp/grails-taglib')
project(':grails-web-gsp').projectDir = file('grails-gsp/grails-web-gsp')
project(':grails-web-gsp-taglib').projectDir = file('grails-gsp/grails-web-gsp-taglib')
project(':grails-web-jsp').projectDir = file('grails-gsp/grails-web-jsp')
project(':grails-web-taglib').projectDir = file('grails-gsp/grails-web-taglib')
// TODO: project(':grails-gsp-spring-boot').projectDir = file('grails-gsp/spring-boot')
project(':grails-gsp-spring-boot').projectDir = file('grails-gsp/spring-boot')

// Data Mapping - Documentation
include 'grails-data-docs-guide-developer'
Expand Down
Loading