This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 25a9750b7af49eab15b12babec3f83c39abcfa70 Author: James Netherton <[email protected]> AuthorDate: Thu Nov 13 07:30:36 2025 +0000 Upgrade Quarkus to 3.31.0.CR1 --- .../ROOT/pages/reference/extensions/core.adoc | 24 ++++++++++---------- .../reference/extensions/file-cluster-service.adoc | 14 ++++++------ .../ROOT/pages/reference/extensions/jolokia.adoc | 26 +++++++++++----------- .../extensions/kubernetes-cluster-service.adoc | 14 ++++++------ .../deployment/SupportMongoDBProcessor.java | 4 ++-- extensions/infinispan/runtime/pom.xml | 11 --------- pom.xml | 2 +- 7 files changed, 42 insertions(+), 53 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index 442fdf0c65..9a9aa274f9 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -248,12 +248,6 @@ setting this flag to `false` except for making the behavior consistent with nati | `boolean` | `true` -a|icon:lock[title=Fixed at build time] [[quarkus-camel-routes-discovery-enabled]]`link:#quarkus-camel-routes-discovery-enabled[quarkus.camel.routes-discovery.enabled]` - -Enable automatic discovery of routes during static initialization. -| `boolean` -| `true` - a|icon:lock[title=Fixed at build time] [[quarkus-camel-routes-discovery-exclude-patterns]]`link:#quarkus-camel-routes-discovery-exclude-patterns[quarkus.camel.routes-discovery.exclude-patterns]` Used for exclusive filtering scanning of RouteBuilder classes. The exclusive filtering takes precedence over @@ -329,12 +323,6 @@ setting this flag to `true` except for making the behavior consistent with nativ | `boolean` | `false` -a|icon:lock[title=Fixed at build time] [[quarkus-camel-csimple-on-build-time-analysis-failure]]`link:#quarkus-camel-csimple-on-build-time-analysis-failure[quarkus.camel.csimple.on-build-time-analysis-failure]` - -What to do if it is not possible to extract CSimple expressions from a route definition at build time. -| `fail`, `warn`, `ignore` -| `warn` - a|icon:lock[title=Fixed at build time] [[quarkus-camel-expression-on-build-time-analysis-failure]]`link:#quarkus-camel-expression-on-build-time-analysis-failure[quarkus.camel.expression.on-build-time-analysis-failure]` What to do if it is not possible to extract expressions from a route definition at build time. @@ -507,6 +495,18 @@ a| [[quarkus-camel-bootstrap-enabled]]`link:#quarkus-camel-bootstrap-enabled[qua When set to true, the {@link CamelRuntime} will be started automatically. | `boolean` | `true` + +a|icon:lock[title=Fixed at build time] [[quarkus-camel-routes-discovery-enabled]]`link:#quarkus-camel-routes-discovery-enabled[quarkus.camel.routes-discovery.enabled]` + +Enable automatic discovery of routes during static initialization. +| `boolean` +| `true` + +a|icon:lock[title=Fixed at build time] [[quarkus-camel-csimple-on-build-time-analysis-failure]]`link:#quarkus-camel-csimple-on-build-time-analysis-failure[quarkus.camel.csimple.on-build-time-analysis-failure]` + +What to do if it is not possible to extract CSimple expressions from a route definition at build time. +| `fail`, `warn`, `ignore` +| `warn` |=== [.configuration-legend] diff --git a/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc index 38668db7d8..5c2f483914 100644 --- a/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc @@ -73,13 +73,6 @@ The file cluster service could further be tuned by tweaking `quarkus.camel.clust | Configuration property | Type | Default -a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-file-enabled]]`link:#quarkus-camel-cluster-file-enabled[quarkus.camel.cluster.file.enabled]` - -Whether a File Lock Cluster Service should be automatically configured according to -'quarkus.camel.cluster.file.++*++' configurations. -| `boolean` -| `true` - a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-file-id]]`link:#quarkus-camel-cluster-file-id[quarkus.camel.cluster.file.id]` The cluster service ID (defaults to null). @@ -125,6 +118,13 @@ For example, if the leader updates its heartbeat every 2 seconds and the `heartb followers will tolerate up to `2s * 3 = 6s` of silence before declaring the leader unavailable. | `int` | + +a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-file-enabled]]`link:#quarkus-camel-cluster-file-enabled[quarkus.camel.cluster.file.enabled]` + +Whether a File Lock Cluster Service should be automatically configured according to +'quarkus.camel.cluster.file.++*++' configurations. +| `boolean` +| `true` |=== [.configuration-legend] diff --git a/docs/modules/ROOT/pages/reference/extensions/jolokia.adoc b/docs/modules/ROOT/pages/reference/extensions/jolokia.adoc index ec7b9593bb..5fbded8ab2 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jolokia.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jolokia.adoc @@ -188,19 +188,6 @@ The context path that the Jolokia agent is deployed under. | `string` | `jolokia` -a|icon:lock[title=Fixed at build time] [[quarkus-camel-jolokia-register-management-endpoint]]`link:#quarkus-camel-jolokia-register-management-endpoint[quarkus.camel.jolokia.register-management-endpoint]` - -Whether to register a Quarkus management endpoint for Jolokia (default `/q/jolokia`). -When enabled this activates a management endpoint which will be accessible on a path relative to -`${quarkus.http.non-application-root-path}/${quarkus.camel.jolokia.server.path}`. -If the management interface is enabled, the value will be resolved as a path relative to -`${quarkus.management.root-path}/${quarkus.camel.jolokia.server.path}`. Note that for this feature to work you must -have `quarkus-vertx-http` on the application classpath. - -**This option is deprecated and will be removed in a future release**. -| `boolean` -| `false` - a|icon:lock[title=Fixed at build time] [[quarkus-camel-jolokia-camel-restrictor-allowed-mbean-domains]]`link:#quarkus-camel-jolokia-camel-restrictor-allowed-mbean-domains[quarkus.camel.jolokia.camel-restrictor-allowed-mbean-domains]` Comma separated list of allowed MBean domains used by `CamelJolokiaRestrictor`. @@ -284,6 +271,19 @@ following MBean domains. Note that this option has no effect if `quarkus.camel.jolokia.additional-properties."restrictorClass"` is set. | `boolean` | `true` + +a|icon:lock[title=Fixed at build time] [[quarkus-camel-jolokia-register-management-endpoint]]`link:#quarkus-camel-jolokia-register-management-endpoint[quarkus.camel.jolokia.register-management-endpoint]` + +Whether to register a Quarkus management endpoint for Jolokia (default `/q/jolokia`). +When enabled this activates a management endpoint which will be accessible on a path relative to +`${quarkus.http.non-application-root-path}/${quarkus.camel.jolokia.server.path}`. +If the management interface is enabled, the value will be resolved as a path relative to +`${quarkus.management.root-path}/${quarkus.camel.jolokia.server.path}`. Note that for this feature to work you must +have `quarkus-vertx-http` on the application classpath. + +**This option is deprecated and will be removed in a future release**. +| `boolean` +| `false` |=== [.configuration-legend] diff --git a/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc b/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc index 34f1af2a20..336e3c6863 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kubernetes-cluster-service.adoc @@ -70,13 +70,6 @@ The kubernetes cluster service could further be tuned by tweaking `quarkus.camel | Configuration property | Type | Default -a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-kubernetes-enabled]]`link:#quarkus-camel-cluster-kubernetes-enabled[quarkus.camel.cluster.kubernetes.enabled]` - -Whether a Kubernetes Cluster Service should be automatically configured according to -'quarkus.camel.cluster.kubernetes.++*++' configurations. -| `boolean` -| `true` - a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-kubernetes-rebalancing]]`link:#quarkus-camel-cluster-kubernetes-rebalancing[quarkus.camel.cluster.kubernetes.rebalancing]` Whether the camel master namespace leaders should be distributed evenly across all the camel contexts in the cluster. @@ -164,6 +157,13 @@ a| [[quarkus-camel-cluster-kubernetes-labels-labels]]`link:#quarkus-camel-cluste The labels key/value used to identify the pods composing the cluster, defaults to empty map. | `Map<String,String>` | + +a|icon:lock[title=Fixed at build time] [[quarkus-camel-cluster-kubernetes-enabled]]`link:#quarkus-camel-cluster-kubernetes-enabled[quarkus.camel.cluster.kubernetes.enabled]` + +Whether a Kubernetes Cluster Service should be automatically configured according to +'quarkus.camel.cluster.kubernetes.++*++' configurations. +| `boolean` +| `true` |=== [.configuration-legend] diff --git a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java index f7f8aedd69..ea4991f715 100644 --- a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java +++ b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java @@ -21,7 +21,7 @@ import java.util.List; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.mongodb.deployment.MongoClientBuildItem; -import io.quarkus.mongodb.runtime.MongoClientBeanUtil; +import io.quarkus.mongodb.runtime.MongoConfig; import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; class SupportMongoDBProcessor { @@ -43,7 +43,7 @@ class SupportMongoDBProcessor { private String getMongoClientName(String clientName) { // Use the default mongo client instance name if it is the default connection - return MongoClientBeanUtil.isDefault(clientName) ? "camelMongoClient" : clientName; + return MongoConfig.isDefaultClient(clientName) ? "camelMongoClient" : clientName; } } diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml index 9fd1affd34..05684ad3c9 100644 --- a/extensions/infinispan/runtime/pom.xml +++ b/extensions/infinispan/runtime/pom.xml @@ -46,17 +46,6 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-jaxb</artifactId> </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-remote-query-client</artifactId> - <exclusions> - <exclusion> - <groupId>io.reactivex.rxjava3</groupId> - <artifactId>rxjava</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-infinispan</artifactId> diff --git a/pom.xml b/pom.xml index 4047904473..d1f1dd545c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>2.4.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> - <quarkus.version>3.30.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.10.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
