Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
edfa9f5
Bind flattened dataSource.properties from the Spring Environment
jamesfredley Oct 22, 2026
6daea26
Unwrap datasource proxies in pool property tests
jamesfredley Oct 22, 2026
bcfa9c7
Cover Grails environment blocks in datasource YAML
jamesfredley Oct 22, 2026
5ac0a4a
Keep source precedence when rebuilding dataSource.properties
jamesfredley Oct 29, 2026
e204f2e
Keep lower configuration maps when ignoring JVM property sources
jamesfredley Oct 29, 2026
0c43b8a
Limit Environment map binding to flattened names
jamesfredley Oct 30, 2026
49fda50
Let a higher source's indexed list replace a lower one
matrei Nov 6, 2026
eae18f1
Expose the URL mapping that handles a request as its best matching ha…
codeconsole Nov 14, 2026
88b004d
Resolve Grails formats through Spring MVC's content negotiation (#16698)
codeconsole Nov 14, 2026
56fa0da
Match URL mappings for security when a request accepts no configured …
codeconsole Nov 14, 2026
11cb4b9
Record every answer Grails and Spring MVC negotiation give differently
codeconsole Nov 14, 2026
1982f07
Test Spring MVC format negotiation end to end
codeconsole Nov 14, 2026
c901261
Document grails.mime.negotiation.spring
codeconsole Nov 14, 2026
c41b857
Offer grails.mime.negotiation.spring from Grails 9
codeconsole Nov 14, 2026
915151f
Match a Spring MVC endpoint an action forwards to on its own negotiation
codeconsole Nov 14, 2026
a13c489
Read grails.mime.negotiation.spring from the Grails configuration only
codeconsole Nov 14, 2026
840fc4a
Test Spring MVC format negotiation in an application of its own
codeconsole Nov 14, 2026
1f5f19f
Read the all format as any type where it is not configured
codeconsole Nov 14, 2026
f314e84
Keep a +xml type ahead of the XML type of equal quality
codeconsole Nov 14, 2026
54de0e0
Leave ?format=all to the Accept header under Spring MVC parameter neg…
codeconsole Nov 15, 2026
641f483
Complete the Forge prompt without picocli's JLine 3 bridge
codeconsole Nov 17, 2026
39cdba9
Move to JLine 4, the version Groovy 6 ships
codeconsole Nov 17, 2026
301e488
Let commands describe their arguments and options, and write them out
codeconsole Nov 17, 2026
062ab3a
Add the generateCommandManifest task
codeconsole Nov 17, 2026
f0de781
Offer the commands of the project in the Forge CLI
codeconsole Nov 17, 2026
3904a1a
Describe the arguments and options of the Spring Security commands
codeconsole Nov 17, 2026
382bf41
Document project commands in the Forge CLI
codeconsole Nov 17, 2026
b9c7f03
Run only the project's own build, and only when a project command is …
codeconsole Nov 17, 2026
dddcec5
Run the events of a save through another in-memory datastore
codeconsole Nov 14, 2026
2c3fc8a
Name the tenant in withTenant without resolving the current one
codeconsole Nov 14, 2026
7ccb109
Look up the auto-timestamp listener of a domain class from the class
codeconsole Nov 14, 2026
147b144
Answer with the listener of the datastore that saves the class
codeconsole Nov 14, 2026
cc0e03f
Keep the tenant handling of the in-memory datastore's other connections
codeconsole Nov 14, 2026
3944850
Let a listener be added while the default publisher publishes an event
codeconsole Nov 14, 2026
f8f5d43
Run the events of a save through another Neo4j connection
codeconsole Nov 14, 2026
039e4ad
Give the listener of every connection the auditor and the settings
codeconsole Nov 14, 2026
be2e1f6
Keep the multi-connection TCK spec true of a single-session datastore
codeconsole Nov 14, 2026
309b9b4
Document the listener property's name clash and the implementer's side
codeconsole Nov 14, 2026
6f0c59d
Keep the default connection's listener first in the mapping context
codeconsole Nov 14, 2026
5c7c1fc
Note what saves through other data sources now do in the upgrade guide
codeconsole Nov 17, 2026
706a68c
Check the plain class's listener against the datastore holding its row
codeconsole Nov 14, 2026
d49753b
Declare the listener getter on the public static operations type
codeconsole Nov 14, 2026
a291dc4
Keep a listener's configured auditor when the context has none
codeconsole Nov 15, 2026
86d558e
Restore the publisher spec's features that adding one deleted
codeconsole Nov 17, 2026
4abc0f5
Cover the unit tests' default data source and correct the examples
codeconsole Nov 17, 2026
0d0510b
Check the listener lookup in a method transactional on a connection
codeconsole Nov 17, 2026
e0b9887
Name the JLine APIs JLine 4 removed, and keep picocli-shell-jline3 op…
codeconsole Nov 17, 2026
b60b0b7
Complete a real option in the completer test, and restore user.home w…
codeconsole Nov 17, 2026
ad4d2dc
Merge remote-tracking branch 'upstream/9.0.x' into feat/spring-format…
codeconsole Nov 17, 2026
4b56419
Point What's New at the renumbered upgrade section
codeconsole Nov 17, 2026
e71bc8f
Let runCommand read its arguments from a file, and generateCommandMan…
codeconsole Nov 17, 2026
64f6e79
Keep the Forge CLI working when the project's build or manifest is no…
codeconsole Nov 17, 2026
94123f6
Document how project commands get their arguments, environment and re…
codeconsole Nov 17, 2026
9e031ee
Point the content negotiation guide at upgrade section 25
codeconsole Nov 17, 2026
c5c4ff6
Keep every equals sign of an option value after the first
codeconsole Nov 17, 2026
2f3a016
Test that the Forge CLI passes an option value with equals signs whole
codeconsole Nov 17, 2026
2b8156e
Refresh the manifest when the commands directory is removed
codeconsole Nov 17, 2026
5aaa699
Carry upgrade notes 25 to 27 into the Grails 9 upgrade skill
codeconsole Nov 17, 2026
eae0fea
Check the auditor and the insert-overwrite setting on Hibernate 5 con…
codeconsole Nov 17, 2026
676919c
Refresh the manifest when a build file is deleted
codeconsole Nov 17, 2026
1935c7d
Read an argument of quotes or spaces alone without failing
codeconsole Nov 18, 2026
9178703
Run command tasks in one named project, and set -D among their arguments
codeconsole Nov 18, 2026
87e28e8
Record the files the project's commands depend on, instead of compari…
codeconsole Nov 18, 2026
bec6b4e
Give an option an empty value instead of the word after it
codeconsole Nov 18, 2026
468aac4
Name the sources of the listed commands, and read -D as the command does
codeconsole Nov 18, 2026
e35633c
Watch the listed command sources; leave tool output out wherever a bu…
codeconsole Nov 18, 2026
13e4f85
Look for the sources of the listed commands in every source set
codeconsole Nov 18, 2026
c7a1679
Merge 9.0.x into the JLine 4 and Forge plugin commands branch
codeconsole Nov 18, 2026
63b699a
Add JLine 4 to the Grails 9 upgrade skill
codeconsole Nov 18, 2026
1b6dc63
Merge 9.0.x into feat/spring-format-negotiation-9.0.x
codeconsole Nov 18, 2026
7949d1e
Merge remote-tracking branch 'upstream/9.0.x' into feat/entity-auto-t…
codeconsole Nov 18, 2026
912f66d
Keep the build's environment and skip what unnamed command tasks depe…
codeconsole Nov 18, 2026
288b14b
Start the shell of the shell spec on a terminal with an empty input
codeconsole Nov 18, 2026
1e73d79
Name options in camelCase in the CommandOption example
codeconsole Nov 18, 2026
58f87ff
Pass a command's arguments in a file only its owner can read
codeconsole Nov 18, 2026
e37d18e
Let GRAILS_FORGE_RUN_BUILD=false keep the Forge CLI from running the …
codeconsole Nov 18, 2026
01ee462
Note what the command line parser reads differently in the upgrade guide
codeconsole Nov 18, 2026
f2b7160
Test the prompt as it is used, on a terminal the shell is given
codeconsole Nov 18, 2026
1de3403
Rename @CommandArgument to @CommandParameter
codeconsole Nov 18, 2026
86ba5ca
Merge branch '8.0.x' into fix/16567-datasource-properties-yaml
jamesfredley Nov 18, 2026
bac85c2
Merge remote-tracking branch 'origin/8.0.x' into fix/16567-datasource…
jamesfredley Nov 18, 2026
cc59b60
Merge 9.0.x into the JLine 4 and Forge plugin commands branch
codeconsole Nov 18, 2026
b254917
Watch the cli source sets for commands a plugin project adds
codeconsole Nov 18, 2026
1ba5e63
Put the addProjectCommands Javadoc back on its method
codeconsole Nov 18, 2026
e5edd2f
Merge remote-tracking branch 'upstream/9.0.x' into feat/entity-auto-t…
codeconsole Nov 18, 2026
432ba38
Merge 9.0.x into feat/spring-format-negotiation-9.0.x
codeconsole Nov 18, 2026
2a91112
Keep an auditor set while the listener looks one up
codeconsole Nov 18, 2026
a12cab5
Say that execute() routes only a multi-tenant class to a bound tenant
codeconsole Nov 18, 2026
e17f652
Link the content negotiation upgrade notes by anchor
codeconsole Nov 18, 2026
c903885
Test a text Spring MVC writes in the format of its URL extension as text
codeconsole Nov 18, 2026
a7ae6fc
Write a format only Spring MVC maps in the type it maps it to
codeconsole Nov 19, 2026
159b5a8
Keep the record from before a first build when a known file changed d…
codeconsole Nov 19, 2026
bdc635c
Keep the inputs of the last manifest for when cleaning the build remo…
codeconsole Nov 19, 2026
07d5333
Watch the main sources for files named like a command
codeconsole Nov 19, 2026
c78167f
Merge branch '8.0.x' into fix/16567-datasource-properties-yaml
jamesfredley Nov 19, 2026
b380a8f
Merge pull request #16736 from apache/fix/16567-datasource-properties…
jamesfredley Nov 19, 2026
dda082a
Run the build again when a command that did not compile is fixed
codeconsole Nov 19, 2026
d083eda
Look up the negotiation strategy once for each request
codeconsole Nov 19, 2026
c960808
Mark the requests a URL mapping handles only with grails.mime.negotia…
codeconsole Nov 19, 2026
d8c2068
fix(datastore-web): keep a request's session open over an include, an…
matrei Nov 19, 2026
b2fad4e
fix(hibernate5): keep the sessions of the other datasources open over…
matrei Nov 19, 2026
4e47657
Merge branch '9.0.x' into feat/spring-format-negotiation-9.0.x
codeconsole Nov 19, 2026
7d5e11e
Take the Forge CLI plugin commands out of the JLine 4 change
codeconsole Nov 19, 2026
8724e5c
Merge branch '9.0.x' into deps/jline-4-9.0.x
codeconsole Nov 19, 2026
5f1e6cc
Merge pull request #16992 from codeconsole/feat/entity-auto-timestamp…
codeconsole Nov 19, 2026
839685d
test: assert the asynchronous requests' outcome on the spec thread, a…
codeconsole Nov 19, 2026
d950748
docs(async): a MongoDB action that must handle a write failure flushe…
codeconsole Nov 19, 2026
66e1fae
Merge remote-tracking branch 'upstream/9.0.x' into feat/spring-format…
codeconsole Nov 19, 2026
7bd0157
Merge 9.0.x into the JLine 4 branch
codeconsole Nov 19, 2026
91a5834
test(hibernate5): a request that goes asynchronous closes the session…
matrei Nov 19, 2026
17b3fcb
Update Spring Boot to 4.1.3
codeconsole Nov 19, 2026
f5d3a79
Update Spring Boot to 4.2.0
codeconsole Nov 19, 2026
97d88c2
fix(hibernate5): close the default session when a Grails request goes…
codeconsole Nov 19, 2026
9c86bbe
Merge pull request #17083 from codeconsole/deps/spring-boot-4.1.3-8.0.x
codeconsole Nov 19, 2026
c7b310a
Merge pull request #17084 from codeconsole/deps/spring-boot-4.2.0-9.0.x
codeconsole Nov 19, 2026
fd34e16
fix(hibernate5): flush the other datasources' sessions at the asynchr…
codeconsole Nov 19, 2026
c4d4c59
Merge pull request #17018 from codeconsole/deps/jline-4-9.0.x
codeconsole Nov 19, 2026
e93a970
Merge 9.0.x into feat/spring-format-negotiation-9.0.x
codeconsole Nov 20, 2026
5065b39
Link What's New to the content negotiation upgrade notes by anchor
codeconsole Nov 20, 2026
b094af1
HTML-encode the attribute values that GSP tags write
codeconsole Nov 20, 2026
7927583
Encode the value of g:radio once
codeconsole Nov 20, 2026
0dcd946
fix(hibernate5): release every session at the asynchronous handoff wh…
codeconsole Nov 20, 2026
aee4c04
[run tests] Merge branch 'fix/open-session-in-view-include-async-7.0.…
codeconsole Nov 20, 2026
d0fd43d
[run tests] Merge branch '7.0.x' into 7.1.x
codeconsole Nov 20, 2026
6dcafe9
[run tests] Merge branch '7.1.x' into 7.2.x
codeconsole Nov 20, 2026
10f9172
Merge branch '7.2.x' into 8.0.x
codeconsole Nov 20, 2026
0518f48
fix(hibernate7): keep the sessions of the other datasources open over…
codeconsole Nov 20, 2026
0f22978
Merge branch '8.0.x' into 8.1.x
codeconsole Nov 20, 2026
fdde94a
Merge branch '8.1.x' into 9.0.x
codeconsole Nov 20, 2026
aaee873
Keep an encoded value encoded once through a RequestDataValueProcessor
codeconsole Nov 20, 2026
01d5c4a
Write a class encoded by the caller once in g:paginate and g:sortable…
codeconsole Nov 20, 2026
ffc53cf
Restore the dispatcher type on Undertow once a forward returns
codeconsole Nov 20, 2026
b7c34c8
Report a failure an error handler answered once on Spring Framework 7.1
codeconsole Nov 20, 2026
6870dfc
Build with Gradle 9.9.2
codeconsole Nov 20, 2026
1d2e3cc
Record the failure of an action before its error handler answers it
codeconsole Nov 20, 2026
7975168
Build the Grails 7 fixture with Gradle 8.14.8
codeconsole Nov 20, 2026
cb71d3a
Keep an encoded value encoded once, and a raw one encoded, through a …
codeconsole Nov 20, 2026
77eb239
Encode the title of g:sortableColumn
codeconsole Nov 20, 2026
a6608e0
Keep the first failure of an asynchronous request over a later one re…
codeconsole Nov 20, 2026
1acb304
Complete asynchronous processing on Undertow once an error its reques…
codeconsole Nov 20, 2026
fbf4b24
Merge pull request #17089 from codeconsole/deps/gradle-9.9.2
codeconsole Nov 20, 2026
d79f33b
Merge branch '7.0.x' of apache/grails-core into fix/gsp-tag-attribute…
codeconsole Nov 20, 2026
1e69f3a
Describe the encoding of GSP tag attributes in the grails-upgrade skill
codeconsole Nov 20, 2026
48fc580
Merge branch '7.0.x' into 7.1.x
codeconsole Nov 20, 2026
b1a6184
Merge branch '7.1.x' into 7.2.x
codeconsole Nov 20, 2026
96a4ea4
Merge branch '7.2.x' into 8.0.x
codeconsole Nov 20, 2026
86f1010
Merge branch '8.0.x' into 8.1.x
codeconsole Nov 20, 2026
8d2ef9e
Merge branch '8.1.x' into 9.0.x
codeconsole Nov 20, 2026
06f62dd
Merge pull request #17088 from codeconsole/fix/async-observation-repo…
codeconsole Nov 20, 2026
733397b
Merge pull request #16996 from codeconsole/feat/spring-format-negotia…
codeconsole Nov 20, 2026
7695a31
Merge branch '9.0.x' into 9.1.x
codeconsole Nov 20, 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
22 changes: 11 additions & 11 deletions .agents/skills/gradle-developer/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Presence-based flags (property **present**, value optional) match `skipFunctiona

## Gradle Version Sync (Hard Rule)

Current line: **Gradle 9.9.1** (`distributionUrl` + `gradleToolingApiVersion=9.9.1`). Upstream may already ship a newer 9.9.x patch - this repo rides close to latest **only after** a deliberate multi-location bump PR. Do not "helpfully" jump one wrapper ahead of the rest.
Current line: **Gradle 9.9.2** (`distributionUrl` + `gradleToolingApiVersion=9.9.2`). Upstream may already ship a newer 9.9.x patch - this repo rides close to latest **only after** a deliberate multi-location bump PR. Do not "helpfully" jump one wrapper ahead of the rest.

**Two Groovy stacks:** Gradle itself embeds **Groovy 4** for build logic. Application/runtime code on 8.0.x is **Groovy 5**. That is why `dependencies.gradle` keeps separate maps:

Expand Down Expand Up @@ -665,16 +665,16 @@ Develocity: `https://develocity.apache.org` - build scans publish when authentic

Use official docs for API signatures and deprecations (pin URLs to the version you are bumping toward):

- [Gradle 9.9 release notes](https://docs.gradle.org/9.9.1/release-notes.html)
- [Upgrading major version 9](https://docs.gradle.org/9.9.1/userguide/upgrading_major_version_9.html)
- [Upgrading within Gradle 9.x](https://docs.gradle.org/9.9.1/userguide/upgrading_version_9.html)
- [Java Library plugin](https://docs.gradle.org/9.9.1/userguide/java_library_plugin.html)
- [Java Platform / BOM](https://docs.gradle.org/9.9.1/userguide/java_platform_plugin.html)
- [Platforms](https://docs.gradle.org/9.9.1/userguide/platforms.html)
- [Sharing build logic via included builds](https://docs.gradle.org/9.9.1/userguide/sharing_build_logic_between_subprojects.html)
- [Task configuration avoidance](https://docs.gradle.org/9.9.1/userguide/task_configuration_avoidance.html)
- [Configuration cache](https://docs.gradle.org/9.9.1/userguide/configuration_cache.html) and its [requirements](https://docs.gradle.org/9.9.1/userguide/configuration_cache_requirements.html)
- [Version catalogs](https://docs.gradle.org/9.9.1/userguide/version_catalogs.html) (docs like them - **this repo does not**)
- [Gradle 9.9 release notes](https://docs.gradle.org/9.9.2/release-notes.html)
- [Upgrading major version 9](https://docs.gradle.org/9.9.2/userguide/upgrading_major_version_9.html)
- [Upgrading within Gradle 9.x](https://docs.gradle.org/9.9.2/userguide/upgrading_version_9.html)
- [Java Library plugin](https://docs.gradle.org/9.9.2/userguide/java_library_plugin.html)
- [Java Platform / BOM](https://docs.gradle.org/9.9.2/userguide/java_platform_plugin.html)
- [Platforms](https://docs.gradle.org/9.9.2/userguide/platforms.html)
- [Sharing build logic via included builds](https://docs.gradle.org/9.9.2/userguide/sharing_build_logic_between_subprojects.html)
- [Task configuration avoidance](https://docs.gradle.org/9.9.2/userguide/task_configuration_avoidance.html)
- [Configuration cache](https://docs.gradle.org/9.9.2/userguide/configuration_cache.html) and its [requirements](https://docs.gradle.org/9.9.2/userguide/configuration_cache_requirements.html)
- [Version catalogs](https://docs.gradle.org/9.9.2/userguide/version_catalogs.html) (docs like them - **this repo does not**)

### Docs say X - we do Y

Expand Down
2 changes: 1 addition & 1 deletion .agents/skills/mono-repo-integration/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ The apps were physically moved to `grails-test-examples/<name>/...` back in Init
- Remove now-empty imported folders.
- Match property/naming style to existing conventions (e.g. `xxxVersion`).
- **CodeNarc**: the imported source will almost certainly trip `codeStyle` (wildcard imports, tabs, `if(`, unnecessary GStrings/semicolons, brace spacing, missing trailing newline, class-starts-with-blank-line). Fix mechanically until `:grails-<name>:codenarcMain` passes; test-example apps don't apply `grails-code-style`, so they aren't style-checked.
- **SBOM (`cyclonedxBom`)**: a merged plugin pulls transitives the SBOM plugin can't auto-resolve a license for, failing with "Could not determine License id for dependency: …". Trace it (`./gradlew :grails-<name>:dependencyInsight --dependency <group:artifact> --configuration runtimeClasspath`) to confirm what pulls it and that the license is ASF-acceptable, then add a mapping to `LICENSE_MAPPING` (and a `LICENSES` entry if the license has no SPDX id) in `build-logic/plugins/.../SbomPlugin.groovy` — the same place `jline`/`sitemesh` are mapped. (Redis: `org.json:json` via `jedis`, relicensed to Public Domain → mapped.)
- **SBOM (`cyclonedxBom`)**: a merged plugin pulls transitives the SBOM plugin can't auto-resolve a license for, failing with "Could not determine License id for dependency: …". Trace it (`./gradlew :grails-<name>:dependencyInsight --dependency <group:artifact> --configuration runtimeClasspath`) to confirm what pulls it and that the license is ASF-acceptable, then add a mapping to `LICENSE_MAPPING` (and a `LICENSES` entry if the license has no SPDX id) in `build-logic/plugins/.../SbomPlugin.groovy` — the same place `sitemesh` is mapped. (Redis: `org.json:json` via `jedis`, relicensed to Public Domain → mapped.)
- **RAT** noise: a local working copy often has stale `bin/`/`build/` artifacts that `rat` flags; filter the report to your new files (excluding `build/`/`bin/`) to confirm the contribution itself is clean.
- **Missing ASF license headers on imported files**: the plugin source usually already has Apache headers, but the imported **example/test app** files (controllers, GSP views, assets, config, i18n) frequently do not, and `rat` flags them. Add headers with the per-filetype scripts in `etc/bin/` — `add-license-groovy-java.groovy`, `add-license-gsp.groovy`, `add-license-css.groovy`, `add-license-js.groovy`, `add-license-yml.groovy`, `add-license-properties.groovy`, etc. — each takes a target path and recurses (skipping files that already have the marker): `groovy etc/bin/add-license-<type>.groovy grails-test-examples/<name>`. There is **no** `add-license-xml`; add the XML comment header (e.g. to `logback-spring.xml`/`logback-test.xml`) by hand, matching an existing example app's format.
- **Gradle can't run in the sandbox here** (wrapper needs `~/.gradle`; signing needs the 1Password agent) — run every `./gradlew` with the sandbox disabled, and `export GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G"`.
Expand Down
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
java=21.0.12-librca
# Keep gradle version synced with gradle.properties (gradleToolingApiVersion).
# Update the gradle-bootstrap project to propagate the version to all gradle-wrapper.properties files.
gradle=9.9.1
gradle=9.9.2
2 changes: 1 addition & 1 deletion build-logic/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.2-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,26 +114,11 @@ class SbomPlugin implements Plugin<Project> {
'pkg:maven/org.antlr/ST4@4.3.4?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.antlr/antlr-runtime@3.5.3?type=jar' : 'BSD-3-Clause',
// mongo-java-server declares only "The BSD License" so it maps to BSD-4-Clause for the same
// reason as the org.jline group below. https://github.com/bwaldvogel/mongo-java-server/blob/main/LICENSE
// reason as the org.jline group in forcedLicenseFor. https://github.com/bwaldvogel/mongo-java-server/blob/main/LICENSE
// has three numbered clauses and no advertising clause, making it BSD-3-Clause.
'pkg:maven/de.bwaldvogel/mongo-java-server@1.47.0?type=jar' : 'BSD-3-Clause',
'pkg:maven/de.bwaldvogel/mongo-java-server-core@1.47.0?type=jar' : 'BSD-3-Clause',
'pkg:maven/de.bwaldvogel/mongo-java-server-memory-backend@1.47.0?type=jar': 'BSD-3-Clause',
// The whole org.jline group declares "The BSD License", which maps incorrectly because of
// https://github.com/CycloneDX/cyclonedx-core-java/issues/205 - the POMs point at BSD-3-Clause.
// jline.version tracks the JLine version Groovy ships, so every module resolves to one version.
// Groovy 6 may also pull JLine 4, handled by forcedLicenseFor below.
'pkg:maven/org.jline/jansi@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-builtins@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-console@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-native@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-reader@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-style@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-terminal@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-terminal-jansi@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-terminal-jna@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jline/jline-terminal-jni@3.30.16?type=jar' : 'BSD-3-Clause',
'pkg:maven/org.jruby/jzlib@1.1.5?type=jar' : 'BSD-3-Clause', // https://web.archive.org/web/20240822213507/http://www.jcraft.com/jzlib/LICENSE.txt shows it's a 3 clause
'pkg:maven/org.liquibase.ext/liquibase-hibernate5@4.27.0?type=jar': 'Apache-2.0', // maps incorrectly because of https://github.com/liquibase/liquibase/issues/2445 & the base pom does not define a license
'pkg:maven/org.json/json@20260719?type=jar' : 'Public-Domain', // required due to jedis, https://issues.apache.org/jira/browse/LEGAL-666 approves this usage
Expand All @@ -147,8 +132,10 @@ class SbomPlugin implements Plugin<Project> {
if (LICENSE_MAPPING.containsKey(bomRef)) {
return LICENSE_MAPPING[bomRef]
}
// JLine 4 LICENSE.txt confirms BSD-3-Clause, but CycloneDX misreports it as BSD-4-Clause
// (cyclonedx-core-java#205). This is limited to the org.jline Maven jar family resolved via Groovy 6.
// The whole org.jline group declares "The BSD License", which CycloneDX misreports as BSD-4-Clause
// (cyclonedx-core-java#205); JLine 4's LICENSE.txt confirms BSD-3-Clause. jline.version tracks the
// JLine version Groovy 6 ships, so every module resolves to one JLine 4 version, and this is
// limited to that org.jline Maven jar family.
if (bomRef.matches('pkg:maven/org\\.jline/[^/@?]+@4\\.[^?]+\\?type=jar')) {
return 'BSD-3-Clause'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,14 @@ class SbomPluginSpec extends Specification {

void "JLine 4 Maven jars use the BSD-3-Clause correction for new versions"() {
expect:
SbomPlugin.pickLicense(LOGGER, 'grails-console', 'grails-console',
'pkg:maven/org.jline/jansi@4.3.1?type=jar', bsd4Choice()).id == 'BSD-3-Clause'
SbomPlugin.pickLicense(LOGGER, 'grails-console', 'grails-console', bomRef, bsd4Choice()).id == 'BSD-3-Clause'

where:
bomRef << [
'pkg:maven/org.jline/jansi@4.3.1?type=jar',
'pkg:maven/org.jline/jline@4.4.5?type=jar',
'pkg:maven/org.jline/jline-shell@4.4.5?type=jar'
]
}

void "org.json resolved through Jedis uses the public domain license approved in LEGAL-666"() {
Expand All @@ -134,7 +140,8 @@ class SbomPluginSpec extends Specification {
where:
bomRef << [
'pkg:maven/com.example/jansi@4.3.1?type=jar',
'pkg:maven/org.jline/jansi@3.3.1?type=jar'
'pkg:maven/org.jline/jansi@3.3.1?type=jar',
'pkg:maven/org.jline/jline@3.30.16?type=jar'
]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,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-RC2 manages 7.2.0-RC1, which ' +
'the 7.1 line as affected and 7.1.1 as fixed. Spring Boot 4.2.0 manages 7.2.0, 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
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ ext {
'grails-publish-plugin.version' : '1.0.0',
'javaparser-core.version' : '3.28.2',
// Tracks the JLine version Groovy ships (groovy-groovysh), so the framework and groovysh
// share one terminal stack - keep in step with groovy.version.
'jline.version' : '3.30.16',
// share one terminal stack - keep in step with groovy.version. Groovy 6 moved to JLine 4.
'jline.version' : '4.4.5',
'jna.version' : '5.19.1',
'maven-model.version' : '3.9.16',
'objenesis.version' : '3.6',
'spring-boot.version' : '4.2.0-RC2',
'spring-boot.version' : '4.2.0',
]

// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
Expand Down
2 changes: 1 addition & 1 deletion end-to-end/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ neither the core build nor a contributor's default environment inherits a second

| Where | JDK | Why |
|---|---|---|
| `legacy-g7-command-plugin/.sdkmanrc` | 17, Gradle 8.14.7 | What Grails 7 pins, so the fixture is built the way a Grails 7 plugin actually was. `gradle-bootstrap` generates this wrapper from that file via its `legacyG7Wrapper` task, rather than copying the shared one. |
| `legacy-g7-command-plugin/.sdkmanrc` | 17, Gradle 8.14.8 | What Grails 7 pins, so the fixture is built the way a Grails 7 plugin actually was. `gradle-bootstrap` generates this wrapper from that file via its `legacyG7Wrapper` task, rather than copying the shared one. |
| the repository's root `.sdkmanrc` | 21 | The Grails 8 baseline. This build consumes artifacts from the core build, so it runs on whatever the core build runs on — it deliberately does not re-pin that. |

## Running locally
Expand Down
2 changes: 1 addition & 1 deletion end-to-end/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.2-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions end-to-end/legacy-g7-command-plugin/.sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Matches Grails 7: JDK 17 and Gradle 8.14.7 are what the 7.0.x branch pins.
# Matches Grails 7: JDK 17 and Gradle 8.14.8 are what the 7.0.x branch pins.
# Deliberately not synced with the repository root, which tracks Grails 8.
java=17.0.18-librca
gradle=8.14.7
gradle=8.14.8
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.8-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ geantyrefVersion=1.3.16
gparsVersion=1.2.1
# Keep gradle version synced with .sdkmanrc, all gradle-wrapper.properties files,
# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
gradleToolingApiVersion=9.9.1
gradleToolingApiVersion=9.9.2
greenmailVersion=2.1.14
javassistVersion=3.33.0-GA
jnrPosixVersion=3.2.4
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.2-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package grails.ui.shell.support

import groovy.transform.CompileStatic

import org.apache.groovy.groovysh.GroovyshOptions
import org.apache.groovy.groovysh.Main
import org.springframework.context.support.GenericApplicationContext

Expand All @@ -39,7 +40,18 @@ class GroovyshApplicationContext extends GenericApplicationContext {
}

protected void startConsole() {
Main.start([
Main.start(shellOptions().build())
}

/**
* Returns the options the shell starts with: this context as {@code ctx} and the Grails application in
* its binding, on the terminal of the JVM. A subclass can add to them, for example a terminal of its own.
*
* @return the options of the shell
* @since 9.0
*/
protected GroovyshOptions.Builder shellOptions() {
GroovyshOptions.builder().bindings([
ctx: this,
(GrailsApplication.APPLICATION_ID): getBean(GrailsApplication)
])
Expand Down
Loading
Loading