Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
d117049
Upgrade to Spring Boot 4.2.0-RC2
codeconsole Nov 5, 2026
991a702
Describe the Jackson pins against Spring Boot 4.2.0-RC2
codeconsole Nov 5, 2026
d67b11b
Describe the CVE-2026-47842 exclusion against Spring Boot 4.2.0-RC2
codeconsole Nov 5, 2026
8924593
Drop the json-smart CVE-2026-113602 exclusion now that Spring Boot ma…
codeconsole Nov 5, 2026
cdf0aa6
Manage ASM 9.11.1, which json-smart 2.6.1 depends on
codeconsole Nov 5, 2026
8731c9a
Re-declare Hibernate 7 at the 7.4.14.Final Spring Boot manages
codeconsole Nov 5, 2026
3a48ce0
Manage Hibernate ORM 7 at the version Spring Boot manages
codeconsole Nov 5, 2026
b4afca6
Keep requests browsers send on their own out of the request cache
codeconsole Nov 5, 2026
7180786
Support the HTTP QUERY method of Spring Framework 7.1
codeconsole Nov 5, 2026
7e3bd24
Write an exception no handler method handles as an RFC 9457 problem
codeconsole Nov 5, 2026
914f10a
Document X-Forwarded-Prefix and the buildpacks changes of Spring Boot…
codeconsole Nov 5, 2026
cf086d9
Run the exception handlers before writing a problem
codeconsole Nov 5, 2026
9770bdf
Handle what a request can run into while a problem is written
codeconsole Nov 5, 2026
711433b
Find the method a problem is written as where one is written
codeconsole Nov 5, 2026
337f89f
Test the error page for a browser, and correct what the guide says of…
codeconsole Nov 5, 2026
ebae2e3
Test how the plugin configures the request cache
codeconsole Nov 5, 2026
ecedbbb
Keep the example application's imports in order and its headers as th…
codeconsole Nov 5, 2026
bbcc94f
Test QUERY where its sibling methods are tested, and correct what the…
codeconsole Nov 5, 2026
e4ac442
Build a native image with what traceNativeMetadata records
codeconsole Nov 6, 2026
ab7e20c
Call GrailsWebRequest directly when resolving a MIME type
codeconsole Nov 6, 2026
637a737
Register HttpMethod for the comparison binding a command object makes
codeconsole Nov 6, 2026
18e67d2
Let traceNativeMetadata make requests with any method and body
codeconsole Nov 6, 2026
c551b18
Wait for an application that holds requests until it has started
codeconsole Nov 6, 2026
bf0406e
Let the Spring Security plugin build a native image
codeconsole Nov 6, 2026
e149ada
Let digest authentication start and sign users in
codeconsole Nov 6, 2026
0e5ca6d
Authenticate what a filter leaves unauthenticated before deciding access
codeconsole Nov 6, 2026
285fa77
Load what the embedded MongoDB's event loops need as it starts
codeconsole Nov 6, 2026
e517685
Register the response a refused method is answered through
codeconsole Nov 6, 2026
01fe15b
Give the training run of a spec time to start on a loaded machine
codeconsole Nov 6, 2026
5ef273a
Fill in a form's empty fields when tracing
codeconsole Nov 6, 2026
b1befee
Read a form's content type without failing on what a client sent
codeconsole Nov 6, 2026
8af7d92
Say in the upgrade guide that spring-boot-starter-amqp no longer mean…
codeconsole Nov 6, 2026
68f7825
Record an exception GrailsExceptionResolver handles on the HTTP serve…
codeconsole Nov 6, 2026
dd6e74b
Document the observability changes of Spring Boot 4.2
codeconsole Nov 6, 2026
c59ca3e
Keep a failed action's exception and route on the observation across …
codeconsole Nov 6, 2026
5c6c65b
Throw an action's own exception when it is invoked by reflection
codeconsole Nov 6, 2026
4c19027
Keep the resolver's observation comment true on every release line
codeconsole Nov 6, 2026
f4cc7eb
Keep the exception on the request after a forward to an error handler
codeconsole Nov 6, 2026
36f4967
Tell the observation's handlers about a failed action
codeconsole Nov 6, 2026
2bf0865
Tell the observation's handlers about an exception written as a problem
codeconsole Nov 6, 2026
54285c2
Load what Netty's leak detection needs before the embedded MongoDB's …
codeconsole Nov 6, 2026
b912584
Tell the handlers through the observation the filter keeps on the req…
codeconsole Nov 6, 2026
829e30b
Tell the handlers of an exception written as a problem in the same way
codeconsole Nov 6, 2026
d049b77
Record an exception an error handler answers on an asynchronous dispatch
codeconsole Nov 6, 2026
6476509
Recognise an asynchronous dispatch from an action forwarded to
codeconsole Nov 6, 2026
24ecc02
Keep the status of a wrapped exception when writing it as a problem
codeconsole Nov 6, 2026
34f91c1
Keep the route that failed when an error handler is routed
codeconsole Nov 7, 2026
bb6a5fe
Link the Spring Framework issue that asks for a public way to get the…
codeconsole Nov 7, 2026
28dc2dd
Set the route on the observation before an interceptor can fail
codeconsole Nov 7, 2026
adadd8f
Read only Spring Boot's own Hibernate entry while configuring the Hib…
codeconsole Nov 8, 2026
09cc09d
Stop saying an async timeout is recorded on the observation
codeconsole Nov 8, 2026
06fe2a8
Record a failure once on Undertow when the forward stays on the request
codeconsole Nov 8, 2026
f9316cf
Count what the observation handlers heard once the observation has st…
codeconsole Nov 9, 2026
15ad333
Decide whether to record a failure left on the request once the dispa…
codeconsole Nov 9, 2026
8e47942
Judge the observation of a failed request by what it carried when it …
codeconsole Nov 9, 2026
96ffe78
Write a problem with the advice for the controller the request is map…
codeconsole Nov 9, 2026
56d08d1
Report an Error an action throws, not the ServletException around it
codeconsole Nov 9, 2026
28a5485
Keep the route that failed when its error controller forwards
codeconsole Nov 9, 2026
f58e481
Leave an include out of the observation of the page that includes it
codeconsole Nov 9, 2026
4c27c50
Correct the upgrade note on routes, and drop an opt-out that does not…
codeconsole Nov 9, 2026
0842986
Wait up to 30 seconds for the observation in the failed-action specs
codeconsole Nov 9, 2026
bedc91f
Serve the embedded MongoDB's first request on the port it bound, what…
codeconsole Nov 9, 2026
da2ca8e
Move every Boot-managed Hibernate ORM module with hibernate7VersionOv…
codeconsole Nov 9, 2026
e161a31
Fill in an empty form field with a value its type accepts when tracing
codeconsole Nov 9, 2026
60db081
Send one of a select's options when tracing a form
codeconsole Nov 9, 2026
c72ff06
Say that the startup gate's 503 is temporary with Retry-After
codeconsole Nov 9, 2026
32a04aa
Wait for a 503 at startup only while it carries Retry-After
codeconsole Nov 9, 2026
073006e
Refuse a nativeMetadata request that cannot be made before starting t…
codeconsole Nov 9, 2026
90983ea
Compare what Digest authentication stores without replacing passwordE…
codeconsole Nov 9, 2026
909c6ed
Leave a signed-in user whose credentials were erased to the access de…
codeconsole Nov 9, 2026
ae1442e
Run the action that a forward during an async dispatch names
codeconsole Nov 9, 2026
bb900b9
Include the error handler for a failure inside an include
codeconsole Nov 9, 2026
05c49d0
Run the error controller for a failure included in a page whose URL h…
codeconsole Nov 9, 2026
2bf3e10
Wait for the redirected page in RedirectWithAndWithoutParamsFunctiona…
codeconsole Nov 9, 2026
9bf4e00
Type PromiseList.then and the GPath binding sources for Groovy 6.0.1
codeconsole Nov 10, 2026
50eadf1
Run the action an include names when no error is being handled
codeconsole Nov 10, 2026
02ef6dc
Give a page its state back after an include, and run what an error ha…
codeconsole Nov 10, 2026
d8f15f3
Give an included action its own id, and the page its namespace and at…
codeconsole Nov 10, 2026
2c4cf5d
Merge remote-tracking branch 'upstream/9.1.x' into deps/spring-boot-4…
codeconsole Nov 12, 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
1 change: 1 addition & 0 deletions .agents/skills/gradle-developer/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ A module the parent manages through an imported BOM belongs to the property the
3. Use the unversioned coordinate in module `dependencies {}`.
4. Run `./gradlew :that-module:validateDependencyVersions` (and affected consumers).
5. Security overrides: comment with CVE and previous Boot version (see existing httpcore5/jackson/logback pins).
6. Hibernate ORM 7 has no pin: `grails-hibernate7-bom` reads the version `spring-boot-dependencies` manages and strictly re-declares `hibernateOrmModules` at it. To move ahead of a Spring Boot that lags behind, set `hibernate7VersionOverride` in `dependencies.gradle`; the BOM then strictly re-declares at it every `org.hibernate.orm` module `spring-boot-dependencies` manages in its own POM (`PomVersions.managedArtifactIds`), not only `hibernateOrmModules`, so `enforcedPlatform` consumers move the whole family as a Maven consumer setting `hibernate.version` does. `validateHibernateVersion` fails while it is not newer than Spring Boot's version, so a Boot bump that catches up forces its removal. It also fails when `hibernate-models.version` differs from the version the managed Hibernate ORM release depends on. Configuring the project reads only `spring-boot-dependencies`' own entry for `hibernate-core` (`PomVersions.managedVersion`), never the BOMs it imports, so a task that resolves none of them does not fail when one is missing from the cache; both checks resolve in the task's inputs, and `check` and the BOM's POM generation run it.

### Exclusions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import java.util.regex.Pattern

import groovy.transform.CompileStatic

import org.gradle.api.GradleException

import org.apache.maven.model.Dependency
import org.apache.maven.model.Model
import org.apache.maven.model.io.xpp3.MavenXpp3Reader
Expand Down Expand Up @@ -68,6 +70,47 @@ class PomVersions {
dependency.scope == 'import'
}

/**
* Returns the version the model's own {@code <dependencyManagement>} gives {@code module}, a
* {@code group:artifact}, or {@code null} when it has no entry for it. The BOMs it imports are not
* read, so this resolves no other POM, and since a BOM's own entry wins over the ones it imports,
* a version found here is the one the BOM manages.
*
* @throws GradleException when the entry's version cannot be resolved from the model's own
* properties and the Maven built-ins
*/
static String managedVersion(Model model, String module) {
Map<String, String> properties = properties(model)
Dependency entry = managedDependencies(model).find { Dependency dependency ->
!isImport(dependency) && key(dependency, properties) == module
}
if (entry == null) {
return null
}
String version = interpolate(entry.version, properties)
if (!version) {
throw new GradleException("Cannot resolve ${module}:${entry.version.trim()}, managed by " +
"${properties['project.groupId']}:${model.artifactId}:${properties['project.version']}, from that POM's own properties.")
}
version
}

/**
* Returns the artifacts of {@code groupId} the model's own {@code <dependencyManagement>} manages, in
* the order it lists them. As with {@link #managedVersion}, the BOMs it imports are not read, so this
* resolves no other POM; {@code <pluginManagement>} is not read either, since it manages plugins.
* An entry whose coordinates cannot be resolved from the model's own properties is not included.
*/
static List<String> managedArtifactIds(Model model, String groupId) {
Map<String, String> properties = properties(model)
String prefix = "${groupId}:"
managedDependencies(model).findAll { Dependency dependency -> !isImport(dependency) }
.collect { Dependency dependency -> key(dependency, properties) }
.findAll { String module -> module?.startsWith(prefix) }
.collect { String module -> module.substring(prefix.length()) }
.unique()
}

/**
* The properties the model's coordinates and versions may refer to: its own
* {@code <properties>}, and the Maven built-ins, which are never declared there. A parent POM's
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.grails.buildsrc

import java.nio.file.Path

import org.gradle.api.GradleException
import spock.lang.Specification
import spock.lang.TempDir

import org.apache.maven.model.Model

/**
* Reads the version a BOM's own entries give a module, as {@code grails-hibernate7-bom} reads the
* Hibernate ORM version from {@code spring-boot-dependencies}:
*
* <pre>
* test:parent-bom:1.0, with test:grand-parent:1.0 as its parent
* test:lib-a ${lib-a.version} = 1.0
* test:lib-literal 5.0
* ${project.groupId}:lib-own ${project.version}
* test:lib-inherited ${inherited.version} - declared only by the parent POM
* other:lib-other 2.0
* test:lib-literal:tests 5.0 - the same artifact again, with a classifier
* test:family-bom ${family-bom.version} = 3.0, imported, and managing test:family-core
* test:test-maven-plugin 1.0 - in pluginManagement
* </pre>
*/
class PomVersionsSpec extends Specification {

@TempDir
Path testDir

Model bom

def setup() {
File pom = testDir.resolve('parent-bom-1.0.pom').toFile()
pom.text = '''<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent><groupId>test</groupId><artifactId>grand-parent</artifactId><version>1.0</version></parent>
<groupId>test</groupId>
<artifactId>parent-bom</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<properties>
<lib-a.version>1.0</lib-a.version>
<family-bom.version>3.0</family-bom.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency><groupId>test</groupId><artifactId>lib-a</artifactId><version>${lib-a.version}</version></dependency>
<dependency><groupId>test</groupId><artifactId>lib-literal</artifactId><version>5.0</version></dependency>
<dependency><groupId>${project.groupId}</groupId><artifactId>lib-own</artifactId><version>${project.version}</version></dependency>
<dependency><groupId>test</groupId><artifactId>lib-inherited</artifactId><version>${inherited.version}</version></dependency>
<dependency><groupId>other</groupId><artifactId>lib-other</artifactId><version>2.0</version></dependency>
<dependency><groupId>test</groupId><artifactId>lib-literal</artifactId><version>5.0</version><classifier>tests</classifier></dependency>
<dependency>
<groupId>test</groupId><artifactId>family-bom</artifactId><version>${family-bom.version}</version>
<type>pom</type><scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin><groupId>test</groupId><artifactId>test-maven-plugin</artifactId><version>1.0</version></plugin>
</plugins>
</pluginManagement>
</build>
</project>
'''
bom = PomVersions.read(pom)
}

def "an entry's version is resolved from the BOM's own properties and the Maven built-ins"() {
expect:
PomVersions.managedVersion(bom, module) == version

where:
module || version
'test:lib-a' || '1.0'
'test:lib-literal' || '5.0'
'test:lib-own' || '1.0'
}

def "a module the BOM has no entry for has no version"() {
expect:
PomVersions.managedVersion(bom, 'test:lib-unknown') == null
}

def "the BOMs it imports are not read, so a module only an imported BOM manages has no version"() {
expect: 'test:family-core, which only test:family-bom manages, and the imported BOM itself'
PomVersions.managedVersion(bom, 'test:family-core') == null
PomVersions.managedVersion(bom, 'test:family-bom') == null
}

def "an entry whose version only the parent POM declares fails instead of going unread"() {
when:
PomVersions.managedVersion(bom, 'test:lib-inherited')

then:
GradleException e = thrown()
e.message == 'Cannot resolve test:lib-inherited:${inherited.version}, managed by test:parent-bom:1.0, from that POM\'s own properties.'
}

def "the artifacts of a group are the ones the BOM's own entries list, in their order and each once"() {
expect: 'its own group resolved, and neither the BOM it imports, the plugin it manages nor the other group'
PomVersions.managedArtifactIds(bom, 'test') == ['lib-a', 'lib-literal', 'lib-own', 'lib-inherited']
PomVersions.managedArtifactIds(bom, 'other') == ['lib-other']
}

def "a group the BOM manages nothing of has no artifacts, whatever it shares a prefix with"() {
expect:
PomVersions.managedArtifactIds(bom, 'tes').isEmpty()
PomVersions.managedArtifactIds(bom, 'unknown').isEmpty()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ class VulnerabilityScanPlugin implements Plugin<Project> {
'and no fixed release exists. A long pause can terminate the pause-detector dispatch thread ' +
'and leave its queue growing, see https://github.com/LatencyUtils/LatencyUtils/issues/22. ' +
'Remove once a patched release is available or micrometer no longer requires LatencyUtils'),
new VulnerabilityExclusion('CVE-2026-113602', 'net.minidev:json-smart',
'Managed by spring-boot-dependencies; every release through 2.6.0, the newest, is affected and ' +
'no fixed release exists. Strict-mode parsing accepts a trailing 0x1A character. Remove ' +
'once a patched release ships'),
new VulnerabilityExclusion('CVE-2026-110974', 'com.vaadin.external.google:android-json',
'Pulled transitively via spring-boot-cli; com.vaadin.external.google:android-json is unmaintained ' +
'and 0.0.20131108.vaadin1, its newest release, is affected. Remove once spring-boot-cli no ' +
Expand All @@ -97,7 +93,7 @@ class VulnerabilityScanPlugin implements Plugin<Project> {
'CVE-2026-22747. Remove once Sonatype narrows its affected range'),
new VulnerabilityExclusion('CVE-2026-47842', 'org.springframework.security:spring-security-crypto',
'Sonatype flagged 7.1.1, but https://spring.io/security/cve-2026-47842 lists only 7.1.0 on ' +
'the 7.1 line as affected and 7.1.1 as fixed. Spring Boot 4.2.0-RC1 manages 7.2.0-RC1, which ' +
'the 7.1 line as affected and 7.1.1 as fixed. Spring Boot 4.2.0-RC2 manages 7.2.0-RC1, which ' +
'the advisory does not list and which carries the fix (the AesCbcBytesEncryptor and ' +
'AesGcmBytesEncryptor replacements 7.1.1 introduced). Remove once Sonatype corrects its ' +
'affected range; reassess on any Spring Security upgrade'),
Expand Down
Loading
Loading