This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 85fbbab51e6f CAMEL-26590: Upgrade to Spring Boot 4.2.0
85fbbab51e6f is described below
commit 85fbbab51e6fd35291691adc4fb1de9500e2cf0f
Author: croway <[email protected]>
AuthorDate: Thu Nov 19 20:28:26 2026 +0100
CAMEL-26590: Upgrade to Spring Boot 4.2.0
Align the Spring portfolio with the Spring Boot 4.2.0 BOM:
- spring-boot 4.1.2 -> 4.2.0, spring-framework 7.0.10 -> 7.1.0
- spring-security 7.1.2 -> 7.2.0
- spring-amqp (spring-rabbitmq) 4.1.2 -> 4.2.0
- spring-ldap 4.1.2 -> 4.2.0
- spring-batch 6.0.6 -> 6.1.0
- spring-ws 5.0.3 -> 5.1.0
- spring-data-redis 4.1.2 -> 4.2.0 (Spring Data 2026.1.0)
- micrometer 1.17.2 -> 1.18.0, micrometer-tracing 1.7.2 -> 1.8.0
- reactor-core 3.8.8 -> 3.9.0, reactor-netty 1.3.8 -> 1.4.0 (Reactor
2026.0.0)
- spring-cloud-config 5.0.6 -> 5.1.0 (Spring Cloud 2026.0.0)
- spring-vault-core 4.1.1 -> 4.1.2 (the version of Spring Cloud Vault 5.1.0)
netty (4.2.20.Final) and json-path (3.0.0) already match the Boot BOM.
Spring AI 2.1.0 (built on Spring Boot 4.2) was upgraded separately in
CAMEL-27241.
camel-spring-ws: Spring WS 5.1 removed the deprecated
WebServiceMessageSender.supports(URI). The sender decorator now delegates
supports(URI, UriSource) to the wrapped HttpUrlConnectionMessageSender, so
its destination policy applies (the decorator used its own defaults before).
camel-jbang: the regenerated command docs and metadata show 4.2.0 as the
default --spring-boot-version.
RunExportGoldenTest: the expected export of the options case lists
micrometer-core 1.18.0.
Upgrade guide: spring-boot-rabbitmq move for camel-spring-rabbitmq-starter,
Spring WS 5.1 supports(URI) removal.
---
.../spring/ws/SpringWebserviceProducer.java | 5 ++--
.../helper/InMemoryWebServiceMessageSender.java | 7 +-----
.../helper/InMemoryWebServiceMessageSender2.java | 2 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 21 ++++++++++++++++
.../pages/jbang-commands/camel-jbang-debug.adoc | 2 +-
.../camel-jbang-dependency-copy.adoc | 2 +-
.../camel-jbang-dependency-list.adoc | 2 +-
.../camel-jbang-dependency-update.adoc | 2 +-
.../ROOT/pages/jbang-commands/camel-jbang-dev.adoc | 2 +-
.../pages/jbang-commands/camel-jbang-export.adoc | 2 +-
.../camel-jbang-kubernetes-export.adoc | 2 +-
.../jbang-commands/camel-jbang-kubernetes-run.adoc | 2 +-
.../ROOT/pages/jbang-commands/camel-jbang-run.adoc | 2 +-
.../pages/jbang-commands/camel-jbang-sbom.adoc | 2 +-
.../META-INF/camel-jbang-commands-metadata.json | 12 +++++-----
.../resources/golden/expected/options.export.txt | 2 +-
.../camel-jbang-plugin-commands-metadata.json | 2 +-
parent/pom.xml | 28 +++++++++++-----------
18 files changed, 58 insertions(+), 41 deletions(-)
diff --git
a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
index 6db5de51fe36..a1be15488f73 100644
---
a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
+++
b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
@@ -286,8 +286,9 @@ public class SpringWebserviceProducer extends
DefaultProducer {
}
@Override
- public boolean supports(URI uri) {
- return delegate.supports(uri);
+ public boolean supports(URI uri, WebServiceMessageSender.UriSource
uriSource) {
+ // delegate so the destination policy configured on the decorated
sender applies
+ return delegate.supports(uri, uriSource);
}
}
diff --git
a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender.java
b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender.java
index 2d0869716315..6f37bba047bf 100644
---
a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender.java
+++
b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender.java
@@ -55,14 +55,9 @@ public class InMemoryWebServiceMessageSender
return new InMemoryWebServiceConnection(uri, messageFactory,
webServiceMessageReceiver);
}
- @Override
- public boolean supports(URI uri) {
- return true;
- }
-
@Override
public boolean supports(URI uri, WebServiceMessageSender.UriSource
uriSource) {
- return supports(uri);
+ return true;
}
public WebServiceMessageFactory getMessageFactory() {
diff --git
a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender2.java
b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender2.java
index 141096313a4c..db9b0428ab94 100644
---
a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender2.java
+++
b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/springws/test/helper/InMemoryWebServiceMessageSender2.java
@@ -32,7 +32,7 @@ public class InMemoryWebServiceMessageSender2 extends
InMemoryWebServiceMessageS
@Override
public boolean supports(URI uri, WebServiceMessageSender.UriSource
uriSource) {
- return supports(uri);
+ return super.supports(uri, uriSource);
}
@Override
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
index d51eef60e2eb..7b9632631797 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
@@ -109,6 +109,27 @@ when they are set to `true`: a warning by default, and the
startup fails with `c
To keep one of them enabled in production, set
`camel.security.insecureDevPolicy=allow`, or add the key to
`camel.security.allowedProperties`.
+=== Spring Boot 4.2
+
+Camel is upgraded to Spring Boot 4.2 and Spring Framework 7.1.
+
+==== camel-spring-rabbitmq-starter - the RabbitMQ connection factory comes
from spring-boot-rabbitmq
+
+In Spring Boot 4.2 the RabbitMQ (AMQP 0.9.1) auto-configuration moved from
`spring-boot-amqp` to the new
+`spring-boot-rabbitmq` module
(`org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration`), and
+`spring-boot-starter-amqp` now brings the generic AMQP 1.0 client instead. An
application that relied on
+`spring-boot-starter-amqp` for the `ConnectionFactory` of the
`spring-rabbitmq` component no longer gets one.
+
+`camel-spring-rabbitmq-starter` now depends on `spring-boot-rabbitmq`, so the
`ConnectionFactory` and `AmqpAdmin`
+used by the component are auto-configured from the `+spring.rabbitmq.*+`
properties. Remove `spring-boot-starter-amqp`
+if it was only added for that, or replace it with
`spring-boot-starter-rabbitmq`.
+
+==== camel-spring-ws - Spring Web Services 5.1
+
+Spring Web Services 5.1 removed the deprecated
`WebServiceMessageSender.supports(URI)`.
+A custom `WebServiceMessageSender` configured on the `spring-ws` component
must implement
+`supports(URI, WebServiceMessageSender.UriSource)` instead.
+
=== camel-observability-services - promoted to Stable
The `camel-observability-services` component has been promoted from _Preview_
to _Stable_ support level.
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-debug.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-debug.adoc
index 42f7f8ca470f..806907eda49c 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-debug.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-debug.adoc
@@ -101,7 +101,7 @@ camel debug [options]
| `--skip-plugins` | Skip resolving plugin dependencies | false | boolean
| `--source` | Prefer to display source filename/code instead of IDs | |
boolean
| `--source-dir` | Source directory for dynamically loading Camel file(s) to
run. When using this, then files cannot be specified at the same time. | |
String
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--stop-on-exit` | Whether to stop the running Camel on exit | true | boolean
| `--stub` | Stubs all the matching endpoint uri with the given component name
or pattern. Multiple names can be separated by comma. (all = stub all
endpoints, remote = stub only remote components). | | String
| `--timestamp` | Print timestamp. | true | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
index 1b034a62c13c..2e7a7e009635 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
@@ -70,7 +70,7 @@ camel dependency copy [options]
| `--resource-dir,--resource-dirs` | Additional resource directories to
include in src/main/resources (recursive, preserving structure) | | List
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | | RuntimeType
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--yes,-y` | Automatically answer yes to confirmation prompts (e.g. when
using --clean-dir) | false | boolean
| `-h,--help` | Display this help and exit | | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
index 266545f45c24..230d430730cb 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
@@ -69,7 +69,7 @@ camel dependency list [options]
| `--resource-dir,--resource-dirs` | Additional resource directories to
include in src/main/resources (recursive, preserving structure) | | List
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | | RuntimeType
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--yes,-y` | Automatically answer yes to confirmation prompts (e.g. when
using --clean-dir) | false | boolean
| `-h,--help` | Display this help and exit | | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
index 19f59c1b9a52..53ccf7f9029f 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
@@ -71,7 +71,7 @@ camel dependency update [options]
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | | RuntimeType
| `--scan-routes` | Sync dependencies from route definitions. Only manages
org.apache.camel dependencies, preserving non-Camel dependencies. Removes
unused Camel dependencies. | | boolean
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--yes,-y` | Automatically answer yes to confirmation prompts (e.g. when
using --clean-dir) | false | boolean
| `-h,--help` | Display this help and exit | | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dev.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dev.adoc
index 18171ed73b6a..34b0defd8334 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dev.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dev.adoc
@@ -88,7 +88,7 @@ camel dev [options]
| `--sanitizer` | Add camel-sanitizer, which reports where the processors of
the routes break the contract of AsyncProcessor, and with
camel.sanitizer.checks=callback,commit,threads also where the commits of the
consumers do not run exactly once (camel get sanitizer); on with profile dev,
never with prod. Not with Quarkus yet | | boolean
| `--skip-plugins` | Skip resolving plugin dependencies | false | boolean
| `--source-dir` | Source directory for dynamically loading Camel file(s) to
run. When using this, then files cannot be specified at the same time. | |
String
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--stub` | Stubs all the matching endpoint uri with the given component name
or pattern. Multiple names can be separated by comma. (all = stub all
endpoints, remote = stub only remote components). | | String
| `--trace` | Enables trace logging of the routed messages | false | boolean
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
index 2de4a4ffec07..fc7ff1ce2cb6 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
@@ -68,7 +68,7 @@ camel export [options]
| `--resource-dir,--resource-dirs` | Additional resource directories to
include in src/main/resources (recursive, preserving structure) | | List
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | | RuntimeType
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--yes,-y` | Automatically answer yes to confirmation prompts (e.g. when
using --clean-dir) | false | boolean
| `-h,--help` | Display this help and exit | | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-export.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-export.adoc
index e8f959a38613..7effdf7076c3 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-export.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-export.adoc
@@ -86,7 +86,7 @@ camel kubernetes export [options]
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | | RuntimeType
| `--service-account` | The service account used to run the application. | |
String
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--trait` | Add a trait configuration to the integration. Use name values
pairs like "--trait trait.name.config=hello". | | String[]
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--volume` | Mount a volume into the integration container, for instance
"--volume pvcname:/container/path". | | String[]
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-run.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-run.adoc
index 99ee56b9b61e..350cb4273ae4 100644
---
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-run.adoc
+++
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-kubernetes-run.adoc
@@ -75,7 +75,7 @@ camel kubernetes run [options]
| `--runtime` | Runtime (camel-main, spring-boot, quarkus) | quarkus |
RuntimeType
| `--service-account` | The service account used to run the application. | |
String
| `--skip-plugins` | Skip plugins during export | false | boolean
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--trait` | Add a trait configuration to the integration. Use name values
pairs like "--trait trait.name.config=hello". | | String[]
| `--verbose` | Verbose output of build/deploy progress | | boolean
| `--volume` | Mount a volume into the integration container, for instance "-v
pvcname:/container/path". | | String[]
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-run.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-run.adoc
index c3c07f193f7b..e023880c1834 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-run.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-run.adoc
@@ -88,7 +88,7 @@ camel run [options]
| `--sanitizer` | Add camel-sanitizer, which reports where the processors of
the routes break the contract of AsyncProcessor, and with
camel.sanitizer.checks=callback,commit,threads also where the commits of the
consumers do not run exactly once (camel get sanitizer); on with profile dev,
never with prod. Not with Quarkus yet | | boolean
| `--skip-plugins` | Skip resolving plugin dependencies | false | boolean
| `--source-dir` | Source directory for dynamically loading Camel file(s) to
run. When using this, then files cannot be specified at the same time. | |
String
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--stub` | Stubs all the matching endpoint uri with the given component name
or pattern. Multiple names can be separated by comma. (all = stub all
endpoints, remote = stub only remote components). | | String
| `--trace` | Enables trace logging of the routed messages | false | boolean
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
diff --git
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
index 61f19e2187d7..658eb9f3b3e4 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
@@ -74,7 +74,7 @@ camel sbom [options]
| `--sbom-output-format` | The SBOM output format, possible values are json or
xml | json | String
| `--skip-plugins` | Skip plugins during export | false | boolean
| `--spdx-plugin-version` | The SPDX Maven Plugin version | 0.7.4 | String
-| `--spring-boot-version` | Spring Boot version | 4.1.2 | String
+| `--spring-boot-version` | Spring Boot version | 4.2.0 | String
| `--verbose` | Verbose output of startup activity (dependency resolution and
downloading | false | boolean
| `--yes,-y` | Automatically answer yes to confirmation prompts (e.g. when
using --clean-dir) | false | boolean
| `-h,--help` | Display this help and exit | | boolean
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
index 048cdace21fb..9a96d6ef804f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
+++
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
@@ -5,15 +5,15 @@
{ "name": "cmd", "fullName": "cmd", "description": "Performs commands in
the running Camel integrations, such as start\/stop route, or change logging
levels.", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.action.CamelAction", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "browse",
"fullName": "cmd browse", "description": "Browse pending messages on
endpoints", "sou [...]
{ "name": "completion", "fullName": "completion", "description": "Generate
completion script for bash\/zsh", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Complete", "options": [ { "names":
"-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ] },
{ "name": "config", "fullName": "config", "description": "Get and set user
configuration values", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.config.ConfigCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "get", "fullName":
"config get", "description": "Display user configuration value", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.config.ConfigG [...]
- { "name": "debug", "fullName": "debug", "description": "Debug local Camel
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Debug",
"options": [ { "names": "--ago", "description": "Use ago instead of yyyy-MM-dd
HH:mm:ss in timestamp.", "javaType": "boolean", "type": "boolean" }, { "names":
"--background", "description": "Run in the background", "defaultValue":
"false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How [...]
- { "name": "dependency", "fullName": "dependency", "description": "Displays
all Camel dependencies required to run", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.DependencyCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "copy",
"fullName": "dependency copy", "description": "Copies all Camel dependencies
required to run to a specific directory", "sourceClass" [...]
- { "name": "dev", "fullName": "dev", "description": "Run in dev mode with
live reload", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Dev",
"options": [ { "names": "--background", "description": "Run in the background",
"defaultValue": "false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How long to wait for the integration in
the background to start, before returning, in millis or as a duration such as
2m (true waits 60 secon [...]
+ { "name": "debug", "fullName": "debug", "description": "Debug local Camel
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Debug",
"options": [ { "names": "--ago", "description": "Use ago instead of yyyy-MM-dd
HH:mm:ss in timestamp.", "javaType": "boolean", "type": "boolean" }, { "names":
"--background", "description": "Run in the background", "defaultValue":
"false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How [...]
+ { "name": "dependency", "fullName": "dependency", "description": "Displays
all Camel dependencies required to run", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.DependencyCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "copy",
"fullName": "dependency copy", "description": "Copies all Camel dependencies
required to run to a specific directory", "sourceClass" [...]
+ { "name": "dev", "fullName": "dev", "description": "Run in dev mode with
live reload", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Dev",
"options": [ { "names": "--background", "description": "Run in the background",
"defaultValue": "false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How long to wait for the integration in
the background to start, before returning, in millis or as a duration such as
2m (true waits 60 secon [...]
{ "name": "dirty", "fullName": "dirty", "description": "Check if there are
dirty files from previous Camel runs that did not terminate gracefully",
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.process.Dirty",
"options": [ { "names": "--clean", "description": "Clean dirty files which are
no longer in use, and the logs of the previous runs of the integrations (camel
log --previous)", "defaultValue": "false", "javaType": "boolean", "type":
"boolean" }, { "names": "-h,--help" [...]
{ "name": "doc", "fullName": "doc", "description": "Shows documentation
for kamelet, component, EIP, and other Camel resources", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.catalog.CatalogDoc", "options": [ {
"names": "--camel-version", "description": "To use a different Camel version
than the default version", "javaType": "java.lang.String", "type": "string" },
{ "names": "--download", "description": "Whether to allow automatic downloading
JAR dependencies (over the int [...]
{ "name": "doctor", "fullName": "doctor", "description": "Checks the
environment and reports potential issues", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Doctor", "options": [ { "names":
"--json", "description": "Output in JSON Format: the status (OK, WARN or FAIL)
of each check", "javaType": "boolean", "type": "boolean" }, { "names":
"-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ] },
{ "name": "eval", "fullName": "eval", "description": "Evaluate Camel
expressions and scripts", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.EvalCommand", "options": [ { "names":
"-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "expression",
"fullName": "eval expression", "description": "Evaluates Camel expression",
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.action.EvalExpressio
[...]
{ "name": "explain", "fullName": "explain", "description": "Explain what a
Camel route does using AI\/LLM", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Explain", "options": [ { "names":
"--api-key", "description": "API key for authentication. Also reads
ANTHROPIC_API_KEY, OPENAI_API_KEY, WATSONX_APIKEY, or LLM_API_KEY env vars",
"javaType": "java.lang.String", "type": "string" }, { "names": "--api-type",
"description": "API type: 'ollama', 'openai' (OpenAI-compatible), ' [...]
- { "name": "export", "fullName": "export", "description": "Export to other
runtimes (Camel Main, Spring Boot, or Quarkus)", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Export", "options": [ { "names":
"--build-property", "description": "Maven build properties, ex.
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, {
"names": "--camel-spring-boot-version", "description": "Camel version to use
with Spring Boot", "javaType": "java.lang.String", "ty [...]
+ { "name": "export", "fullName": "export", "description": "Export to other
runtimes (Camel Main, Spring Boot, or Quarkus)", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Export", "options": [ { "names":
"--build-property", "description": "Maven build properties, ex.
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, {
"names": "--camel-spring-boot-version", "description": "Camel version to use
with Spring Boot", "javaType": "java.lang.String", "ty [...]
{ "name": "get", "fullName": "get", "description": "Get status of Camel
integrations", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.process.CamelStatus", "options": [ {
"names": "--watch", "description": "Execute periodically and showing output
fullscreen", "javaType": "boolean", "type": "boolean" }, { "names":
"-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "about",
"fullName": "get about" [...]
{ "name": "harden", "fullName": "harden", "description": "Suggest security
hardening for Camel routes using AI\/LLM", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Harden", "options": [ { "names":
"--api-key", "description": "API key for authentication. Also reads
OPENAI_API_KEY or LLM_API_KEY env vars", "javaType": "java.lang.String",
"type": "string" }, { "names": "--api-type", "description": "API type: 'ollama'
or 'openai' (OpenAI-compatible)", "defaultValue": "ollama", [...]
{ "name": "hawtio", "fullName": "hawtio", "description": "Launch Hawtio
web console", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.process.Hawtio", "options": [ {
"names": "--host", "description": "Hostname to bind the Hawtio web console to",
"defaultValue": "127.0.0.1", "javaType": "java.lang.String", "type": "string"
}, { "names": "--open-url,--openUrl", "description": "To automatic open Hawtio
web console in the web browser (without an interactive terminal the default
[...]
@@ -26,8 +26,8 @@
{ "name": "plugin", "fullName": "plugin", "description": "Manage plugins
that add sub-commands to this CLI", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.plugin.PluginCommand", "options": [ {
"names": "-h,--help", "description": "Display this help and exit", "javaType":
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "add", "fullName":
"plugin add", "description": "Add new plugin", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.plugin.PluginAdd", "o [...]
{ "name": "ps", "fullName": "ps", "description": "List running Camel
integrations", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.process.ListProcess", "options": [ {
"names": "--duration", "description": "How long to keep watching or following,
in millis or as a duration such as 30s (default: until Enter is pressed)",
"javaType": "long", "type": "integer" }, { "names": "--json", "description":
"Output in JSON Format", "javaType": "boolean", "type": "boolean" }, { "names":
[...]
{ "name": "restart", "fullName": "restart", "description": "Restarts
running Camel integrations (stop + re-launch)", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.process.RestartProcess", "options": [
{ "names": "--timeout", "description": "How long to wait for the integration to
stop, and again to start, in millis or as a duration such as 30s",
"defaultValue": "60000", "javaType": "long", "type": "integer" }, { "names":
"-h,--help", "description": "Display this help and e [...]
- { "name": "run", "fullName": "run", "description": "Run as local Camel
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Run",
"options": [ { "names": "--background", "description": "Run in the background",
"defaultValue": "false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How long to wait for the integration in
the background to start, before returning, in millis or as a duration such as
2m (true waits 60 seconds [...]
- { "name": "sbom", "fullName": "sbom", "description": "Generate a CycloneDX
or SPDX SBOM for a specific project", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.SBOMGenerator", "options": [ {
"names": "--build-property", "description": "Maven build properties, ex.
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, {
"names": "--camel-spring-boot-version", "description": "Camel version to use
with Spring Boot", "javaType": "java.lang.String", "type" [...]
+ { "name": "run", "fullName": "run", "description": "Run as local Camel
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Run",
"options": [ { "names": "--background", "description": "Run in the background",
"defaultValue": "false", "javaType": "boolean", "type": "boolean" }, { "names":
"--background-wait", "description": "How long to wait for the integration in
the background to start, before returning, in millis or as a duration such as
2m (true waits 60 seconds [...]
+ { "name": "sbom", "fullName": "sbom", "description": "Generate a CycloneDX
or SPDX SBOM for a specific project", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.SBOMGenerator", "options": [ {
"names": "--build-property", "description": "Maven build properties, ex.
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, {
"names": "--camel-spring-boot-version", "description": "Camel version to use
with Spring Boot", "javaType": "java.lang.String", "type" [...]
{ "name": "script", "fullName": "script", "description": "Run Camel
integration as shell script for terminal scripting", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.Script", "options": [ { "names":
"--logging", "description": "Can be used to turn on logging (logs to file in
<user home>\/.camel directory)", "defaultValue": "false", "javaType":
"boolean", "type": "boolean" }, { "names": "--logging-level", "description":
"Logging level (ERROR, WARN, INFO, DEBUG, TRACE)", "d [...]
{ "name": "semantic", "fullName": "semantic", "description": "List
semantic definitions and expert contracts", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.action.CamelSemantic", "options": [ {
"names": "--expert", "description": "Show the operations and parameter contract
of this expert", "javaType": "java.lang.String", "type": "string" }, { "names":
"--json", "description": "Output a single JSON document", "javaType":
"boolean", "type": "boolean" }, { "names": "--timeou [...]
{ "name": "shell", "fullName": "shell", "description": "Interactive Camel
CLI shell.", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Shell",
"options": [ { "names": "-h,--help", "description": "Display this help and
exit", "javaType": "boolean", "type": "boolean" } ] },
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
index 51a49ef07d9c..ed7219be8f6e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/options.export.txt
@@ -28,7 +28,7 @@
dependency=mvn\:org.apache.camel\:camel-platform-http-main\:${camel.version}
dependency=mvn\:org.apache.camel\:camel-platform-http\:${camel.version}
dependency=mvn\:org.apache.camel\:camel-opentelemetry2\:${camel.version}
dependency=mvn\:org.apache.camel\:camel-micrometer-prometheus\:${camel.version}
-dependency=mvn\:io.micrometer\:micrometer-core\:1.17.2
+dependency=mvn\:io.micrometer\:micrometer-core\:1.18.0
dependency=mvn\:org.apache.camel\:camel-timer\:${camel.version}
dependency=mvn\:org.apache.camel\:camel-core-languages\:${camel.version}
dependency=mvn\:org.apache.camel\:camel-log\:${camel.version}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/generated/resources/META-INF/camel-jbang-plugin-commands-metadata.json
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/generated/resources/META-INF/camel-jbang-plugin-commands-metadata.json
index 147732c85bbd..1044164bface 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/generated/resources/META-INF/camel-jbang-plugin-commands-metadata.json
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/generated/resources/META-INF/camel-jbang-plugin-commands-metadata.json
@@ -1,5 +1,5 @@
{
"commands": [
- { "name": "kubernetes", "fullName": "kubernetes", "description": "Manage
Camel applications running on Kubernetes", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesCommand",
"plugin": "kubernetes", "options": [ { "names": "--kube-config", "description":
"Path to the kube config file to initialize Kubernetes client", "javaType":
"java.lang.String", "type": "string" }, { "names": "--name", "description":
"The integration name. Use this when the name should [...]
+ { "name": "kubernetes", "fullName": "kubernetes", "description": "Manage
Camel applications running on Kubernetes", "sourceClass":
"org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesCommand",
"plugin": "kubernetes", "options": [ { "names": "--kube-config", "description":
"Path to the kube config file to initialize Kubernetes client", "javaType":
"java.lang.String", "type": "string" }, { "names": "--name", "description":
"The integration name. Use this when the name should [...]
]
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 744e0afaa867..8cb9bb062384 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,8 +404,8 @@
<maven-wagon-version>3.5.2</maven-wagon-version>
<maven-war-plugin-version>3.5.1</maven-war-plugin-version>
<metrics-version>4.2.40</metrics-version>
- <micrometer-version>1.17.2</micrometer-version>
- <micrometer-tracing-version>1.7.2</micrometer-tracing-version>
+ <micrometer-version>1.18.0</micrometer-version>
+ <micrometer-tracing-version>1.8.0</micrometer-tracing-version>
<microprofile-config-version>3.1.3</microprofile-config-version>
<milo-version>1.1.8</milo-version>
<milvus-client-version>2.6.25</milvus-client-version>
@@ -486,8 +486,8 @@
<quickfixj-version>3.0.2</quickfixj-version>
<quickjs4j-version>0.1.1</quickjs4j-version>
<reactive-streams-version>1.0.4</reactive-streams-version>
- <reactor-version>3.8.8</reactor-version>
- <reactor-netty-version>1.3.8</reactor-netty-version>
+ <reactor-version>3.9.0</reactor-version>
+ <reactor-netty-version>1.4.0</reactor-netty-version>
<redisson-version>4.8.0</redisson-version>
<redshift-jdbc-version>2.1.0.33</redshift-jdbc-version>
<resilience4j-version>2.4.0</resilience4j-version>
@@ -519,16 +519,16 @@
<solr-version>10.0.0</solr-version>
<splunk-version>1.9.5_1</splunk-version>
<spring-ai-version>2.1.0</spring-ai-version>
- <spring-cloud-config-version>5.0.6</spring-cloud-config-version>
- <spring-batch-version>6.0.6</spring-batch-version>
- <spring-boot-version>4.1.2</spring-boot-version>
- <spring-data-redis-version>4.1.2</spring-data-redis-version>
- <spring-ldap-version>4.1.2</spring-ldap-version>
- <spring-vault-core-version>4.1.1</spring-vault-core-version>
- <spring-version>7.0.10</spring-version>
- <spring-rabbitmq-version>4.1.2</spring-rabbitmq-version>
- <spring-security-version>7.1.2</spring-security-version>
- <spring-ws-version>5.0.3</spring-ws-version>
+ <spring-cloud-config-version>5.1.0</spring-cloud-config-version>
+ <spring-batch-version>6.1.0</spring-batch-version>
+ <spring-boot-version>4.2.0</spring-boot-version>
+ <spring-data-redis-version>4.2.0</spring-data-redis-version>
+ <spring-ldap-version>4.2.0</spring-ldap-version>
+ <spring-vault-core-version>4.1.2</spring-vault-core-version>
+ <spring-version>7.1.0</spring-version>
+ <spring-rabbitmq-version>4.2.0</spring-rabbitmq-version>
+ <spring-security-version>7.2.0</spring-security-version>
+ <spring-ws-version>5.1.0</spring-ws-version>
<sql-maven-plugin-version>3.0.0</sql-maven-plugin-version>
<squareup-okhttp5-version>5.5.1</squareup-okhttp5-version>
<squareup-okio-version>1.17.5</squareup-okio-version>