From b7e0adb1fa8864495a6858c5a0455a91dbe44175 Mon Sep 17 00:00:00 2001 From: Peter Amiri Date: Tue, 13 Oct 2026 13:28:07 -0700 Subject: [PATCH 1/2] build(deps): dependency updates - jackson-databind, jackson-core and jackson-annotations 2.15.2 -> 2.18.11 - JLine 3.26.3 -> 3.30.15 - tomcat-embed-core (transitive) pinned to 9.0.121 and commons-lang3 (transitive) to 3.18.0 via dependencyManagement The OSGi log4j artifacts that Lucee bundles are unchanged. Port of upstream cybersonic/LuCLI#157. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Peter Amiri --- CHANGELOG.md | 2 ++ pom.xml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d73382..4a04c0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. ## Unreleased +- **Dependency Updates:** `jackson-databind`, `jackson-core` and `jackson-annotations` 2.15.2 → 2.18.11; JLine 3.26.3 → 3.30.15; the transitive `tomcat-embed-core` (→ 9.0.121) and `commons-lang3` (→ 3.18.0) are pinned through `dependencyManagement`. The OSGi log4j artifacts that Lucee bundles are unchanged. Upstream: cybersonic/LuCLI#157. + - **Fix: Test Suite No Longer Writes Into the Developer's LuCLI Home:** `ModuleArgBindingTest` and `McpCommandTest` installed their fixture modules into the real `~/.lucli/modules` and spawned `dev-lucli.sh` without passing a home, so `mvn test` compiled the fixtures into the real `~/.lucli/lucee-server`, and with an isolated test home (`-Duser.home=`) 17 tests failed because the child couldn't find the fixtures. Each class now uses a temporary LuCLI home (`@TempDir`), installs its fixture there and passes it to the child as `LUCLI_HOME`. Issue: #25 (upstream: cybersonic/LuCLI#144). Adds `ModuleArgBindingTest.childRunsInTheTemporaryLucliHome`. - **Fix: Hints Name the Binary You Ran:** User-facing hints such as "Use 'lucli server new' …", "Run 'lucli secrets init' …" or "run 'lucli modules list' …" always said `lucli`, also under an aliased binary (e.g. `wheels`). They now use `LuCLI.cliName()`, the active profile's name. The bundled `lang` module's "Use 'lucli lang help'" hint does the same. picocli `@Command` help text (annotation constants) is unchanged. Adds `CliNameTest`. diff --git a/pom.xml b/pom.xml index 37a2fcc..aba9ddb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,10 @@ 21 UTF-8 yyyy-MM-dd'T'HH:mm:ssXXX - 3.26.3 + 3.30.15 + 2.18.11 + 9.0.121 + 3.18.0 7.0.4.34 zero @@ -137,7 +140,7 @@ com.fasterxml.jackson.core jackson-databind - 2.15.2 + ${jackson.version} @@ -173,6 +176,62 @@ + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + org.jline + jline + ${jline.version} + + + org.jline + jline-terminal + ${jline.version} + + + org.jline + jline-reader + ${jline.version} + + + org.jline + jline-style + ${jline.version} + + + org.jline + jline-native + ${jline.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.embed.version} + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + + From 30f49210500e593ab54572c375a9011162ded7a4 Mon Sep 17 00:00:00 2001 From: Peter Amiri Date: Tue, 13 Oct 2026 13:42:30 -0700 Subject: [PATCH 2/2] build: prepare fork release 0.6.2.4 - pom.xml version 0.6.2.4 (the Windows file/product version follows ${project.version}); install-validation default 0.6.2.4. - FORK.md: 'Next queue' becomes the 0.6.2.4 queue (row 16: #30, the dependency updates ported from upstream #157), compatibility unchanged (Wheels 4.1.x stays at max 0.6.2.2), and a new empty Next queue. - CHANGELOG unchanged: fork entries stay under Unreleased, as for 0.6.2.3. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Peter Amiri --- .github/workflows/install-validation.yml | 2 +- FORK.md | 14 +++++++++++++- pom.xml | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/install-validation.yml b/.github/workflows/install-validation.yml index 3c368a8..240acb4 100644 --- a/.github/workflows/install-validation.yml +++ b/.github/workflows/install-validation.yml @@ -16,7 +16,7 @@ on: version: description: Expected candidate version required: true - default: '0.6.2.3' + default: '0.6.2.4' type: string permissions: diff --git a/FORK.md b/FORK.md index 21d9efd..5683163 100644 --- a/FORK.md +++ b/FORK.md @@ -107,9 +107,21 @@ Compatibility (row 8): a Wheels build must handle `__lucliMcpCall` before it pin Wheels develop does (wheels-dev/wheels#3980). Wheels 4.1.x (v4.1.2 pins 0.6.2.1) does not, so 4.1.x stays at **max 0.6.2.2** unless #3980 is backported. +## 0.6.2.4 queue + +Base: the shipped fork release `v0.6.2.3` (`350ded0`). Everything above carries forward. +Candidate prepared 2026-10-13. It is tagged only after the Wheels release owner's go (see Release). + +| Order | Change | Purpose | +|---|---|---| +| 16 | wheels-dev/LuCLI [#30](https://github.com/wheels-dev/LuCLI/pull/30) (upstream: [cybersonic/LuCLI#157](https://github.com/cybersonic/LuCLI/pull/157), port) | Dependency updates: Jackson 2.18.11, JLine 3.30.15; transitive `tomcat-embed-core` 9.0.121 and `commons-lang3` 3.18.0 pinned via `dependencyManagement` | + +Compatibility: unchanged from 0.6.2.3. Wheels 4.1.x stays at **max 0.6.2.2** (row 8). +When the fork next rebases onto an upstream release that contains #157, row 16 drops out. + ## Next queue (unreleased) -Base: the shipped fork release `v0.6.2.3`, once tagged. Empty. +Base: the shipped fork release `v0.6.2.4`, once tagged. Empty. ## Approved patch mapping diff --git a/pom.xml b/pom.xml index aba9ddb..ae3c132 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.lucee lucli - 0.6.2.3 + 0.6.2.4 LuCLI