From 23ce7c4fb73da6ed82891e16d193ad62f0b296da Mon Sep 17 00:00:00 2001 From: James Netherton Date: Sun, 2 Feb 2025 09:31:10 +0000 Subject: [PATCH 1/3] Upgrade Camel to 4.10.0 --- docs/antora.yml | 2 +- docs/modules/ROOT/examples/components/smb.yml | 2 +- .../ROOT/examples/others/dsl-modeline.yml | 2 +- .../others/observability-services.yml | 4 +- .../ROOT/examples/others/openapi-java.yml | 2 +- .../reference/extensions/dsl-modeline.adoc | 6 +- .../extensions/observability-services.adoc | 7 + .../apache/camel/quarkus/main/CamelMain.java | 5 +- .../resources/META-INF/quarkus-extension.yaml | 1 + extensions/cassandraql/runtime/pom.xml | 15 + .../jt400/deployment/Jt400Processor.java | 67 +- .../MicrometerMetricsConfigDefaultsTest.java | 4 +- .../FaultToleranceProcessor.java | 580 ------ .../rss/deployment/RssProcessor.java | 7 + .../ibm/as400/access/MockSocketContainer.java | 5 + integration-tests/kubernetes/pom.xml | 2 - .../quarkus/component/mail/CamelRoute.java | 2 +- integration-tests/master-openshift/pom.xml | 2 - .../it/MasterOpenShiftTestResource.java | 32 +- .../quarkus/component/minio/it/MinioTest.java | 8 +- .../quarkus/component/smb/it/SmbResource.java | 2 +- .../quarkus/component/smb/it/SmbRoute.java | 19 +- .../quarkus/component/smb/it/SmbTest.java | 8 +- pom.xml | 27 +- poms/bom/pom.xml | 29 +- .../src/main/generated/flattened-full-pom.xml | 1586 +++++++++-------- .../main/generated/flattened-reduced-pom.xml | 874 +++++---- .../flattened-reduced-verbose-pom.xml | 994 +++++------ 28 files changed, 1923 insertions(+), 2371 deletions(-) delete mode 100644 extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java diff --git a/docs/antora.yml b/docs/antora.yml index 46e01c893115..5137cc338f20 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -28,7 +28,7 @@ asciidoc: requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" # Project versions - camel-version: 4.9.0 # replace ${camel.version} + camel-version: 4.10.0 # replace ${camel.version} camel-docs-version: next camel-quarkus-version: 3.19.0 # replace ${camel-quarkus.version} quarkus-version: 3.18.0 # replace ${quarkus.version} diff --git a/docs/modules/ROOT/examples/components/smb.yml b/docs/modules/ROOT/examples/components/smb.yml index b8e248a80cdb..3b9548dd39f1 100644 --- a/docs/modules/ROOT/examples/components/smb.yml +++ b/docs/modules/ROOT/examples/components/smb.yml @@ -9,5 +9,5 @@ cqJvmSince: 3.7.0 cqNativeSince: 3.7.0 cqCamelPartName: smb cqCamelPartTitle: SMB -cqCamelPartDescription: Receive files from SMB (Server Message Block) shares. +cqCamelPartDescription: Read and write files to Server Message Block (SMB) file shares. cqExtensionPageTitle: SMB diff --git a/docs/modules/ROOT/examples/others/dsl-modeline.yml b/docs/modules/ROOT/examples/others/dsl-modeline.yml index 477cf6f0d4e2..5c997fed1ada 100644 --- a/docs/modules/ROOT/examples/others/dsl-modeline.yml +++ b/docs/modules/ROOT/examples/others/dsl-modeline.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-dsl-modeline cqArtifactIdBase: dsl-modeline cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 2.14.0 cqNativeSince: n/a cqCamelPartName: dsl-modeline diff --git a/docs/modules/ROOT/examples/others/observability-services.yml b/docs/modules/ROOT/examples/others/observability-services.yml index 293a3fd7c877..be968058cb02 100644 --- a/docs/modules/ROOT/examples/others/observability-services.yml +++ b/docs/modules/ROOT/examples/others/observability-services.yml @@ -5,8 +5,8 @@ cqArtifactIdBase: observability-services cqNativeSupported: true cqStatus: Stable cqDeprecated: false -cqJvmSince: 3.18.0 -cqNativeSince: 3.18.0 +cqJvmSince: 3.19.0 +cqNativeSince: 3.19.0 cqCamelPartName: observability-services cqCamelPartTitle: Observability Services cqCamelPartDescription: Camel Observability Services diff --git a/docs/modules/ROOT/examples/others/openapi-java.yml b/docs/modules/ROOT/examples/others/openapi-java.yml index be72864b1771..c40d866a2495 100644 --- a/docs/modules/ROOT/examples/others/openapi-java.yml +++ b/docs/modules/ROOT/examples/others/openapi-java.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: openapi-java cqCamelPartTitle: Openapi Java -cqCamelPartDescription: Rest-dsl support for using openapi doc +cqCamelPartDescription: Rest DSL support for using OpenApi doc cqExtensionPageTitle: OpenAPI Java diff --git a/docs/modules/ROOT/pages/reference/extensions/dsl-modeline.adoc b/docs/modules/ROOT/pages/reference/extensions/dsl-modeline.adoc index 63d27a6a617a..43deebb78b5d 100644 --- a/docs/modules/ROOT/pages/reference/extensions/dsl-modeline.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/dsl-modeline.adoc @@ -6,15 +6,15 @@ :cq-artifact-id: camel-quarkus-dsl-modeline :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Support for Camel K style modeline -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 2.14.0 :cq-native-since: n/a ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##2.14.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##2.14.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## endif::[] Support for Camel K style modeline diff --git a/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc b/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc index f77b5daba397..264aad6a8bcf 100644 --- a/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc @@ -19,6 +19,13 @@ endif::[] Camel Observability Services +[id="extensions-observability-services-whats-inside"] +== What's inside + +* xref:{cq-camel-components}:others:observability-services.adoc[Observability Services] + +Please refer to the above link for usage and configuration details. + [id="extensions-observability-services-maven-coordinates"] == Maven coordinates diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java index e6c60148949c..6fe745f3877e 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -118,8 +117,8 @@ protected CamelContext createCamelContext() { throw new IllegalStateException("Should not be invoked"); } - public Collection getMainListeners() { - return Collections.unmodifiableCollection(listeners); + public List getMainListeners() { + return Collections.unmodifiableList(listeners); } public MainConfigurationProperties getMainConfigurationProperties() { diff --git a/extensions-jvm/dsl-modeline/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/dsl-modeline/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8c110807405f..94a1547dc03c 100644 --- a/extensions-jvm/dsl-modeline/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions-jvm/dsl-modeline/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -32,3 +32,4 @@ metadata: - "integration" status: - "preview" + - "deprecated" \ No newline at end of file diff --git a/extensions/cassandraql/runtime/pom.xml b/extensions/cassandraql/runtime/pom.xml index b6f4280d82e8..80cfb9bdfba1 100644 --- a/extensions/cassandraql/runtime/pom.xml +++ b/extensions/cassandraql/runtime/pom.xml @@ -51,6 +51,21 @@ com.datastax.oss.quarkus cassandra-quarkus-client + + + com.github.spotbugs + spotbugs-annotations + + + com.github.stephenc.jcip + jcip-annotations + + + + + + com.datastax.oss + java-driver-query-builder diff --git a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java index a66637348363..efce11cfc32a 100644 --- a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java +++ b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java @@ -26,17 +26,18 @@ import com.ibm.as400.access.NLSImplNative; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.IndexDependencyBuildItem; -import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem; +import io.quarkus.deployment.builditem.*; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; +import io.quarkus.gizmo.Gizmo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; class Jt400Processor { @@ -105,4 +106,62 @@ IndexDependencyBuildItem registerDependencyForIndex() { return new IndexDependencyBuildItem("net.sf.jt400", "jt400", "java11"); } + @BuildStep + BytecodeTransformerBuildItem patchToolboxSignonHandler() { + return new BytecodeTransformerBuildItem.Builder() + .setClassToTransform("com.ibm.as400.access.ToolboxSignonHandler") + .setCacheable(true) + .setVisitorFunction((className, classVisitor) -> new ToolboxSignonHandlerClassVisitor(classVisitor)).build(); + } + + /** + * ToolboxSignonHandler starts GUI dialogues from several methods. This is not supported in the native. + * Unfortunately the method AS400.isGuiAvailable does not disable every call to dialogue. + * Two methods `handleSignon` and `handlePasswordChange` has to be removed (they does not contain any logic, + * just the GUI interaction) + * + * ToolboxSignonHandler is a final class, therefore no substitutions can be added to this class + * and bytecode manipulation had to be used instead. + */ + static class ToolboxSignonHandlerClassVisitor extends ClassVisitor { + + private final Logger logger; + + protected ToolboxSignonHandlerClassVisitor(ClassVisitor classVisitor) { + super(Gizmo.ASM_API_VERSION, classVisitor); + + logger = Logger.getLogger("ToolboxSignonHandlerClassVisitor"); + } + + @Override + public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, + String[] exceptions) { + MethodVisitor original = super.visitMethod(access, name, descriptor, signature, exceptions); + if ("handleSignon".equals(name) || "handlePasswordChange".equals(name)) { + logger.debug("GUI interaction enhancer for Quarkus: transforming " + name + " to avoid spawning dialogues"); + // Replace the method body + return new MethodVisitor(Gizmo.ASM_API_VERSION, original) { + @Override + public void visitCode() { + super.visitCode(); + // Load 'true' or `false` onto the stack and return + if ("handlePasswordChange".equals(name)) { + visitInsn(Opcodes.ICONST_0); // push false + } else { + visitInsn(Opcodes.ICONST_1); // push true + } + visitInsn(Opcodes.IRETURN); // return boolean from the method + } + + @Override + public void visitMaxs(int maxStack, int maxLocals) { + // Max stack is 1 (for the boolean), locals can remain unchanged + super.visitMaxs(1, 0); + } + }; + } + return original; + } + } + } diff --git a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java index 1b467409d1ee..b47778874484 100644 --- a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java +++ b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java @@ -23,7 +23,6 @@ import jakarta.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; -import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategy; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifierNamingStrategy; import org.apache.camel.component.micrometer.routepolicy.MicrometerRoutePolicyConfiguration; @@ -90,8 +89,7 @@ public void testMicrometerMetricsConfiguration() { MicrometerExchangeEventNotifier micrometerExchangeEventNotifier = (MicrometerExchangeEventNotifier) optionalExchangeEventNotifier .get(); - assertEquals(MicrometerExchangeEventNotifierNamingStrategy.DEFAULT, - micrometerExchangeEventNotifier.getNamingStrategy()); + assertTrue(micrometerExchangeEventNotifier.getNamingStrategy().isBaseEndpointURI()); Optional optionalRouteEventNotifier = context.getManagementStrategy() .getEventNotifiers() diff --git a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java deleted file mode 100644 index 38767b243213..000000000000 --- a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java +++ /dev/null @@ -1,580 +0,0 @@ -/* - * 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 - * - * http://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.camel.component.microprofile.faulttolerance; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.function.Supplier; - -import io.smallrye.faulttolerance.core.FaultToleranceContext; -import io.smallrye.faulttolerance.core.FaultToleranceStrategy; -import io.smallrye.faulttolerance.core.Future; -import io.smallrye.faulttolerance.core.bulkhead.Bulkhead; -import io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker; -import io.smallrye.faulttolerance.core.fallback.Fallback; -import io.smallrye.faulttolerance.core.stopwatch.SystemStopwatch; -import io.smallrye.faulttolerance.core.timeout.Timeout; -import io.smallrye.faulttolerance.core.timer.Timer; -import io.smallrye.faulttolerance.core.util.ExceptionDecision; -import org.apache.camel.AsyncCallback; -import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePropertyKey; -import org.apache.camel.Navigate; -import org.apache.camel.Processor; -import org.apache.camel.Route; -import org.apache.camel.RuntimeExchangeException; -import org.apache.camel.api.management.ManagedAttribute; -import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.processor.PooledExchangeTask; -import org.apache.camel.processor.PooledExchangeTaskFactory; -import org.apache.camel.processor.PooledTaskFactory; -import org.apache.camel.processor.PrototypeTaskFactory; -import org.apache.camel.spi.IdAware; -import org.apache.camel.spi.ProcessorExchangeFactory; -import org.apache.camel.spi.RouteIdAware; -import org.apache.camel.spi.UnitOfWork; -import org.apache.camel.support.AsyncProcessorSupport; -import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.PluginHelper; -import org.apache.camel.support.UnitOfWorkHelper; -import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; -import org.eclipse.microprofile.faulttolerance.exceptions.CircuitBreakerOpenException; -import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static io.smallrye.faulttolerance.core.Invocation.invocation; - -/** - * TODO: Remove this - https://github.com/apache/camel-quarkus/issues/6851 - */ -@ManagedResource(description = "Managed FaultTolerance Processor") -public class FaultToleranceProcessor extends AsyncProcessorSupport - implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { - - private static final Logger LOG = LoggerFactory.getLogger(FaultToleranceProcessor.class); - - private volatile CircuitBreaker circuitBreaker; - private CamelContext camelContext; - private String id; - private String routeId; - private final FaultToleranceConfiguration config; - private final Processor processor; - private final Processor fallbackProcessor; - private ScheduledExecutorService scheduledExecutorService; - private boolean shutdownScheduledExecutorService; - private ExecutorService executorService; - private boolean shutdownExecutorService; - private ProcessorExchangeFactory processorExchangeFactory; - private PooledExchangeTaskFactory taskFactory; - private PooledExchangeTaskFactory fallbackTaskFactory; - private Timer timer; - - public FaultToleranceProcessor(FaultToleranceConfiguration config, Processor processor, - Processor fallbackProcessor) { - this.config = config; - this.processor = processor; - this.fallbackProcessor = fallbackProcessor; - } - - @Override - public CamelContext getCamelContext() { - return camelContext; - } - - @Override - public void setCamelContext(CamelContext camelContext) { - this.camelContext = camelContext; - } - - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public String getRouteId() { - return routeId; - } - - @Override - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public CircuitBreaker getCircuitBreaker() { - return circuitBreaker; - } - - public void setCircuitBreaker(CircuitBreaker circuitBreaker) { - this.circuitBreaker = circuitBreaker; - } - - public boolean isShutdownExecutorService() { - return shutdownExecutorService; - } - - public void setShutdownExecutorService(boolean shutdownExecutorService) { - this.shutdownExecutorService = shutdownExecutorService; - } - - public ExecutorService getExecutorService() { - return executorService; - } - - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } - - public Timer getTimer() { - return timer; - } - - public void setTimer(Timer timer) { - this.timer = timer; - } - - @Override - public String getTraceLabel() { - return "faultTolerance"; - } - - @ManagedAttribute(description = "Returns the current delay in milliseconds.") - public long getDelay() { - return config.getDelay(); - } - - @ManagedAttribute(description = "Returns the current failure rate in percentage.") - public float getFailureRate() { - return config.getFailureRatio(); - } - - @ManagedAttribute(description = "Returns the current request volume threshold.") - public int getRequestVolumeThreshold() { - return config.getRequestVolumeThreshold(); - } - - @ManagedAttribute(description = "Returns the current success threshold.") - public int getSuccessThreshold() { - return config.getSuccessThreshold(); - } - - @ManagedAttribute(description = "Is timeout enabled") - public boolean isTimeoutEnabled() { - return config.isTimeoutEnabled(); - } - - @ManagedAttribute(description = "The timeout wait duration") - public long getTimeoutDuration() { - return config.getTimeoutDuration(); - } - - @ManagedAttribute(description = "The timeout pool size for the thread pool") - public int getTimeoutPoolSize() { - return config.getTimeoutPoolSize(); - } - - @ManagedAttribute(description = "Is bulkhead enabled") - public boolean isBulkheadEnabled() { - return config.isBulkheadEnabled(); - } - - @ManagedAttribute(description = "The max amount of concurrent calls the bulkhead will support.") - public int getBulkheadMaxConcurrentCalls() { - return config.getBulkheadMaxConcurrentCalls(); - } - - @ManagedAttribute(description = "The task queue size for holding waiting tasks to be processed by the bulkhead") - public int getBulkheadWaitingTaskQueue() { - return config.getBulkheadWaitingTaskQueue(); - } - - @ManagedAttribute(description = "Returns the current state of the circuit breaker") - public String getCircuitBreakerState() { - if (circuitBreaker != null) { - int state = circuitBreaker.currentState(); - if (state == 2) { - return "HALF_OPEN"; - } else if (state == 1) { - return "OPEN"; - } else { - return "CLOSED"; - } - } - return null; - } - - @Override - public List next() { - if (!hasNext()) { - return null; - } - List answer = new ArrayList<>(); - answer.add(processor); - if (fallbackProcessor != null) { - answer.add(fallbackProcessor); - } - return answer; - } - - @Override - public boolean hasNext() { - return true; - } - - @Override - @SuppressWarnings("unchecked") - public boolean process(Exchange exchange, AsyncCallback callback) { - // run this as if we run inside try .. catch so there is no regular - // Camel error handler - exchange.setProperty(ExchangePropertyKey.TRY_ROUTE_BLOCK, true); - - CircuitBreakerFallbackTask fallbackTask = null; - CircuitBreakerTask task = null; - try { - task = (CircuitBreakerTask) taskFactory.acquire(exchange, callback); - - // circuit breaker - FaultToleranceStrategy target = circuitBreaker; - - // 1. bulkhead - if (config.isBulkheadEnabled()) { - target = new Bulkhead<>( - target, "bulkhead", config.getBulkheadMaxConcurrentCalls(), - config.getBulkheadWaitingTaskQueue(), true); - } - // 2. timeout - if (config.isTimeoutEnabled()) { - target = new Timeout<>(target, "timeout", config.getTimeoutDuration(), getTimer()); - } - // 3. fallback - if (fallbackProcessor != null) { - fallbackTask = (CircuitBreakerFallbackTask) fallbackTaskFactory.acquire(exchange, callback); - final CircuitBreakerFallbackTask fFallbackTask = fallbackTask; - target = new Fallback<>(target, "fallback", fallbackContext -> { - exchange.setException(fallbackContext.failure); - try { - return Future.from(fFallbackTask); - } catch (Exception e) { - if (LOG.isDebugEnabled()) { - LOG.debug("Error occurred processing fallback task", e); - } - } - return null; - }, ExceptionDecision.ALWAYS_FAILURE); - } - - target.apply(new FaultToleranceContext<>(task, true)) - .then((ex, exception) -> { - if (exception instanceof CircuitBreakerOpenException) { - throw (CircuitBreakerOpenException) exception; - } - exchange.setException(exception); - }); - } catch (CircuitBreakerOpenException e) { - // the circuit breaker triggered a call rejected - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SUCCESSFUL_EXECUTION, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_FROM_FALLBACK, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SHORT_CIRCUITED, true); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_REJECTED, true); - } catch (Exception e) { - // some other kind of exception - exchange.setException(e); - } finally { - if (task != null) { - taskFactory.release(task); - } - if (fallbackTask != null) { - fallbackTaskFactory.release(fallbackTask); - } - } - - exchange.removeProperty(ExchangePropertyKey.TRY_ROUTE_BLOCK); - callback.done(true); - return true; - } - - @Override - protected void doBuild() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext", this); - - boolean pooled = camelContext.getCamelContextExtension().getExchangeFactory().isPooled(); - if (pooled) { - int capacity = camelContext.getCamelContextExtension().getExchangeFactory().getCapacity(); - taskFactory = new PooledTaskFactory(getId()) { - @Override - public PooledExchangeTask create(Exchange exchange, AsyncCallback callback) { - return new CircuitBreakerTask(); - } - }; - taskFactory.setCapacity(capacity); - fallbackTaskFactory = new PooledTaskFactory(getId()) { - @Override - public PooledExchangeTask create(Exchange exchange, AsyncCallback callback) { - return new CircuitBreakerFallbackTask(); - } - }; - fallbackTaskFactory.setCapacity(capacity); - } else { - taskFactory = new PrototypeTaskFactory() { - @Override - public PooledExchangeTask create(Exchange exchange, AsyncCallback callback) { - return new CircuitBreakerTask(); - } - }; - fallbackTaskFactory = new PrototypeTaskFactory() { - @Override - public PooledExchangeTask create(Exchange exchange, AsyncCallback callback) { - return new CircuitBreakerFallbackTask(); - } - }; - } - - // create a per processor exchange factory - this.processorExchangeFactory = getCamelContext().getCamelContextExtension() - .getProcessorExchangeFactory().newProcessorExchangeFactory(this); - this.processorExchangeFactory.setRouteId(getRouteId()); - this.processorExchangeFactory.setId(getId()); - - ServiceHelper.buildService(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor); - } - - @Override - @SuppressWarnings("unchecked") - protected void doInit() throws Exception { - ObjectHelper.notNull(camelContext, "CamelContext", this); - if (circuitBreaker == null) { - circuitBreaker = new CircuitBreaker<>( - invocation(), id, ExceptionDecision.ALWAYS_FAILURE, config.getDelay(), config.getRequestVolumeThreshold(), - config.getFailureRatio(), - config.getSuccessThreshold(), SystemStopwatch.INSTANCE, getTimer()); - } - - ServiceHelper.initService(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor); - } - - @Override - protected void doStart() throws Exception { - if (config.isTimeoutEnabled() && scheduledExecutorService == null) { - scheduledExecutorService = getCamelContext().getExecutorServiceManager().newScheduledThreadPool(this, - "CircuitBreakerTimeout", config.getTimeoutPoolSize()); - shutdownScheduledExecutorService = true; - } - if (config.isBulkheadEnabled() && executorService == null) { - executorService = getCamelContext().getExecutorServiceManager().newThreadPool(this, "CircuitBreakerBulkhead", - config.getBulkheadMaxConcurrentCalls(), config.getBulkheadMaxConcurrentCalls()); - shutdownExecutorService = true; - } - - ServiceHelper.startService(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor); - } - - @Override - protected void doStop() throws Exception { - if (shutdownScheduledExecutorService && scheduledExecutorService != null) { - getCamelContext().getExecutorServiceManager().shutdownNow(scheduledExecutorService); - scheduledExecutorService = null; - } - if (shutdownExecutorService && executorService != null) { - getCamelContext().getExecutorServiceManager().shutdownNow(executorService); - executorService = null; - } - - ServiceHelper.stopService(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor); - } - - @Override - protected void doShutdown() throws Exception { - ServiceHelper.stopAndShutdownServices(processorExchangeFactory, taskFactory, fallbackTaskFactory, processor); - } - - private final class CircuitBreakerTask implements PooledExchangeTask, Callable, Supplier> { - - private Exchange exchange; - - @Override - public void prepare(Exchange exchange, AsyncCallback callback) { - this.exchange = exchange; - // callback not in use - } - - @Override - public void reset() { - this.exchange = null; - } - - @Override - public void run() { - // not in use - } - - @Override - public Exchange call() throws Exception { - Exchange copy = null; - UnitOfWork uow = null; - Throwable cause; - - // turn of interruption to allow fault tolerance to process the exchange under its handling - exchange.getExchangeExtension().setInterruptable(false); - - try { - LOG.debug("Running processor: {} with exchange: {}", processor, exchange); - - // prepare a copy of exchange so downstream processors don't - // cause side-effects if they mutate the exchange - // in case timeout processing and continue with the fallback etc - copy = processorExchangeFactory.createCorrelatedCopy(exchange, false); - if (copy.getUnitOfWork() != null) { - uow = copy.getUnitOfWork(); - } else { - // prepare uow on copy - uow = PluginHelper.getUnitOfWorkFactory(copy.getContext()).createUnitOfWork(copy); - copy.getExchangeExtension().setUnitOfWork(uow); - // the copy must be starting from the route where its copied from - Route route = ExchangeHelper.getRoute(exchange); - if (route != null) { - uow.pushRoute(route); - } - } - - // process the processor until its fully done - processor.process(copy); - - // handle the processing result - if (copy.getException() != null) { - exchange.setException(copy.getException()); - } else { - // copy the result as its regarded as success - ExchangeHelper.copyResults(exchange, copy); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SUCCESSFUL_EXECUTION, true); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_FROM_FALLBACK, false); - } - } catch (Exception e) { - exchange.setException(e); - } finally { - // must done uow - UnitOfWorkHelper.doneUow(uow, copy); - // remember any thrown exception - cause = exchange.getException(); - } - - // and release exchange back in pool - processorExchangeFactory.release(exchange); - - if (cause != null) { - // throw exception so resilient4j know it was a failure - throw RuntimeExchangeException.wrapRuntimeException(cause); - } - return exchange; - } - - @Override - public Future get() { - return Future.from(this); - } - } - - private final class CircuitBreakerFallbackTask implements PooledExchangeTask, Callable { - - private Exchange exchange; - - @Override - public void prepare(Exchange exchange, AsyncCallback callback) { - this.exchange = exchange; - // callback not in use - } - - @Override - public void reset() { - this.exchange = null; - } - - @Override - public void run() { - // not in use - } - - @Override - public Exchange call() throws Exception { - Throwable throwable = exchange.getException(); - if (fallbackProcessor == null) { - if (throwable instanceof TimeoutException) { - // the circuit breaker triggered a timeout (and there is no - // fallback) so lets mark the exchange as failed - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SUCCESSFUL_EXECUTION, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_FROM_FALLBACK, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SHORT_CIRCUITED, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_TIMED_OUT, true); - exchange.setException(throwable); - return exchange; - } else if (throwable instanceof CircuitBreakerOpenException) { - // the circuit breaker triggered a call rejected - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SUCCESSFUL_EXECUTION, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_FROM_FALLBACK, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SHORT_CIRCUITED, true); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_REJECTED, true); - return exchange; - } else { - // throw exception so fault tolerance know it was a failure - throw RuntimeExchangeException.wrapRuntimeException(throwable); - } - } - - // fallback route is handling the exception so its short-circuited - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SUCCESSFUL_EXECUTION, false); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_FROM_FALLBACK, true); - exchange.setProperty(ExchangePropertyKey.CIRCUIT_BREAKER_RESPONSE_SHORT_CIRCUITED, true); - - // store the last to endpoint as the failure endpoint - if (exchange.getProperty(ExchangePropertyKey.FAILURE_ENDPOINT) == null) { - exchange.setProperty(ExchangePropertyKey.FAILURE_ENDPOINT, - exchange.getProperty(ExchangePropertyKey.TO_ENDPOINT)); - } - // give the rest of the pipeline another chance - exchange.setProperty(ExchangePropertyKey.EXCEPTION_HANDLED, true); - exchange.setProperty(ExchangePropertyKey.EXCEPTION_CAUGHT, exchange.getException()); - exchange.setRouteStop(false); - exchange.setException(null); - // and we should not be regarded as exhausted as we are in a try .. - // catch block - exchange.getExchangeExtension().setRedeliveryExhausted(false); - // run the fallback processor - try { - LOG.debug("Running fallback: {} with exchange: {}", fallbackProcessor, exchange); - // process the fallback until its fully done - fallbackProcessor.process(exchange); - LOG.debug("Running fallback: {} with exchange: {} done", fallbackProcessor, exchange); - } catch (Exception e) { - exchange.setException(e); - } - - return exchange; - } - } - -} diff --git a/extensions/rss/deployment/src/main/java/org/apache/camel/quarkus/component/rss/deployment/RssProcessor.java b/extensions/rss/deployment/src/main/java/org/apache/camel/quarkus/component/rss/deployment/RssProcessor.java index 6cc4df363baf..574852e91b4b 100644 --- a/extensions/rss/deployment/src/main/java/org/apache/camel/quarkus/component/rss/deployment/RssProcessor.java +++ b/extensions/rss/deployment/src/main/java/org/apache/camel/quarkus/component/rss/deployment/RssProcessor.java @@ -23,12 +23,14 @@ import java.util.Map; import java.util.Properties; +import com.apptasticsoftware.rssreader.AbstractRssReader; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; class RssProcessor { @@ -80,4 +82,9 @@ void registerForReflection(BuildProducer reflectiveCla }; reflectiveClass.produce(ReflectiveClassBuildItem.builder(clonableClasses).methods().build()); } + + @BuildStep + RuntimeInitializedClassBuildItem runtimeInitializedClasses() { + return new RuntimeInitializedClassBuildItem(AbstractRssReader.class.getName()); + } } diff --git a/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java index 39a151652066..95368ed7b6a0 100644 --- a/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java +++ b/integration-tests/jt400-mocked/src/main/java/com/ibm/as400/access/MockSocketContainer.java @@ -74,4 +74,9 @@ void setSoTimeout(int timeout) throws SocketException { int getSoTimeout() throws SocketException { return 0; } + + @Override + String getLocalAddress() { + return ""; + } } diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml index ca8a550f05b2..ec2310dd489c 100644 --- a/integration-tests/kubernetes/pom.xml +++ b/integration-tests/kubernetes/pom.xml @@ -81,7 +81,6 @@ 6g - virtualDependencies diff --git a/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java b/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java index 8506f56830f7..9739e29dee38 100644 --- a/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java +++ b/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java @@ -162,8 +162,8 @@ public void configure() { private Map handleMail(Exchange exchange) throws MessagingException { Map result = new HashMap<>(); - MailMessage mailMessage = exchange.getMessage(MailMessage.class); AttachmentMessage attachmentMessage = exchange.getMessage(AttachmentMessage.class); + MailMessage mailMessage = (MailMessage) attachmentMessage.getDelegateMessage(); Map attachments = attachmentMessage.getAttachments(); if (attachments != null) { JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml index f7605b0999e1..170d7aea1013 100644 --- a/integration-tests/master-openshift/pom.xml +++ b/integration-tests/master-openshift/pom.xml @@ -176,7 +176,6 @@ - virtualDependencies diff --git a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java index 23dab082228c..34758a5e9102 100644 --- a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java +++ b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java @@ -20,6 +20,8 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.PodListBuilder; +import io.fabric8.kubernetes.api.model.PodStatus; +import io.fabric8.kubernetes.api.model.PodStatusBuilder; import io.quarkus.test.kubernetes.client.KubernetesServerTestResource; public class MasterOpenShiftTestResource extends KubernetesServerTestResource { @@ -27,24 +29,48 @@ public class MasterOpenShiftTestResource extends KubernetesServerTestResource { protected void configureServer() { super.configureServer(); + PodStatus ready = new PodStatusBuilder().withPhase("Running").addNewCondition().withType("Ready").withStatus("true") + .endCondition().build(); + PodStatus failed = new PodStatusBuilder().withPhase("Failed").build(); + PodStatus notReady = new PodStatusBuilder().withPhase("Running").addNewCondition().withType("Ready").withStatus("false") + .endCondition().build(); + final Pod leader = new PodBuilder() .withNewMetadata() .withName("leader") .withNamespace("test") - .and() + .endMetadata() + .withStatus(ready) .build(); final Pod follower = new PodBuilder() .withNewMetadata() .withName("follower") .withNamespace("test") - .and() + .endMetadata() + .withStatus(ready) + .build(); + + final Pod badPod1 = new PodBuilder() + .withNewMetadata() + .withName("badpod1") + .withNamespace("test") + .endMetadata() + .withStatus(failed) + .build(); + + final Pod badPod2 = new PodBuilder() + .withNewMetadata() + .withName("badpod2") + .withNamespace("test") + .endMetadata() + .withStatus(notReady) .build(); PodList podList = new PodListBuilder() .withNewMetadata() .withResourceVersion("1") .endMetadata() - .withItems(leader, follower) + .withItems(leader, follower, badPod1, badPod2) .build(); server.expect() diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java index 1977f90c7cc3..1a12f033c5d8 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTest.java @@ -72,7 +72,7 @@ public void testConsumerMoveAfterRead() throws Exception { .queryParam("params", params( MinioConstants.MINIO_OPERATION, MinioOperations.getObject, MinioConstants.OBJECT_NAME, "consumerObjectMAR", - MinioConstants.BUCKET_NAME, "movedafterread")) + MinioConstants.OVERRIDE_BUCKET_NAME, "movedafterread")) .post("minio/operation") .then() .statusCode(200) @@ -95,7 +95,7 @@ public void testConsumerWithoutDetectionOfClient() throws Exception { .queryParam("params", params( MinioConstants.MINIO_OPERATION, MinioOperations.getObject, MinioConstants.OBJECT_NAME, "consumerObject", - MinioConstants.BUCKET_NAME, "movedafterread")) + MinioConstants.OVERRIDE_BUCKET_NAME, "movedafterread")) .post("minio/operation") .then() .statusCode(200) @@ -265,7 +265,7 @@ public void testMoveDataBetweenBuckets() throws Exception { .queryParam("params", params( MinioConstants.MINIO_OPERATION, MinioOperations.getObject, MinioConstants.OBJECT_NAME, "object1", - MinioConstants.BUCKET_NAME, "movingtobucket")) + MinioConstants.OVERRIDE_BUCKET_NAME, "movingtobucket")) .post("minio/operation") .then() .statusCode(200) @@ -284,7 +284,7 @@ public void testMoveDataBetweenBuckets() throws Exception { .queryParam("params", params( MinioConstants.MINIO_OPERATION, MinioOperations.getObject, MinioConstants.OBJECT_NAME, "object2", - MinioConstants.BUCKET_NAME, "movingtobucket")) + MinioConstants.OVERRIDE_BUCKET_NAME, "movingtobucket")) .post("minio/operation") .then() .statusCode(500) diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java index 17794d116f0b..5eca5899c43e 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java @@ -89,7 +89,7 @@ public String receive(String fileName) throws Exception { String uri = String.format("smb:%s:%s/%s?username=%s&password=%s&searchPattern=%s&path=/", host, port, share, username, password, fileName); var shareFile = consumer.receiveBody(uri, SmbFile.class); - return new String(shareFile.getInputStream().readAllBytes(), "UTF-8"); + return new String((byte[]) shareFile.getBody(), "UTF-8"); } @POST diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java index e6a566520a64..ce7d67d09ba2 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java @@ -28,6 +28,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.smb.SmbConstants; import org.apache.camel.component.smb.SmbFile; +import org.apache.camel.spi.IdempotentRepository; +import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped @@ -54,19 +56,18 @@ public class SmbRoute extends RouteBuilder { @Override public void configure() throws Exception { - from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&repeatCount=1&searchPattern=*.txt") + from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&repeatCount=1&searchPattern=*.txt&idempotent=true&idempotentRepository=#myRepo") .to("mock:result"); from("direct:send") .toF("smb:%s:%s/%s?username=%s&password=%s&path=/", host, port, share, username, password); - from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&searchPattern=*.tx1") + from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&searchPattern=*.tx1&idempotent=true&idempotentRepository=#myRepo") .process(e -> { receivedContents.add(Map.of( - "path", e.getIn().getBody(SmbFile.class).getPath(), - "content", new String(e.getIn().getBody(SmbFile.class).getInputStream().readAllBytes(), "UTF-8"), - SmbConstants.SMB_FILE_PATH, e.getIn().getHeader(SmbConstants.SMB_FILE_PATH, String.class), - SmbConstants.SMB_UNC_PATH, e.getIn().getHeader(SmbConstants.SMB_UNC_PATH, String.class))); + "path", e.getIn().getBody(SmbFile.class).getAbsoluteFilePath(), + "content", new String((byte[]) e.getIn().getBody(SmbFile.class).getBody(), "UTF-8"), + SmbConstants.FILE_PATH, e.getIn().getHeader(SmbConstants.FILE_PATH, String.class))); }); } @@ -80,4 +81,10 @@ List> smbReceivedMsgs() { } } + @Produces + @Named("myRepo") + public IdempotentRepository myRepo() { + return MemoryIdempotentRepository.memoryIdempotentRepository(2000); + } + } diff --git a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java index 46dcad6604da..d11856e8f0ac 100644 --- a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java +++ b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java @@ -24,7 +24,6 @@ import io.restassured.RestAssured; import org.apache.camel.component.smb.SmbConstants; import org.apache.camel.quarkus.test.DisabledIfFipsMode; -import org.eclipse.microprofile.config.ConfigProvider; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.testcontainers.shaded.org.awaitility.Awaitility; @@ -126,13 +125,10 @@ public void testHeadersAndAutoConvertToInputStream() { Set set = Set.of(body.split(",")); - String host = ConfigProvider.getConfig().getValue("smb.host", String.class); - assertThat(set) - .contains("path=msg1.tx1") + .contains("path=/msg1.tx1") .contains("content=Hello1") - .contains(SmbConstants.SMB_FILE_PATH + "=msg1.tx1") - .contains(SmbConstants.SMB_UNC_PATH + "=\\\\%s\\data-rw\\msg1.tx1".formatted(host)); + .contains(SmbConstants.FILE_PATH + "=/msg1.tx1"); }); } diff --git a/pom.xml b/pom.xml index 2fd1250e5ccc..4c4ca0773dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies - 4.9.0 + 4.10.0 org.apache.camel.quarkus @@ -39,7 +39,7 @@ - 4.9 + 4.10 ${camel.major.minor}.0 ${camel.major.minor}.x ${camel.docs.components.version}@components @@ -55,7 +55,7 @@ 3.18.1 2.2.0 3.3.3 - 3.0.12 + 3.0.13 0.23.3 3.2.4 3.7.7 @@ -76,8 +76,8 @@ 3.27.2 1.11.714 ${azure-sdk-bom-version} - 1.53.0 - 1.14.0 + 1.54.1 + 1.15.0 1.0.0 1.79 3.1.8 @@ -94,11 +94,11 @@ 2.3.33 0.6.2 1.313 - 1.29.0 + 1.31.0 ${google-oauth-client-version} - 0.231.0 - 1.134.1 - 1.134.1 + 0.235.0 + 1.136.1 + 1.136.1 23.1.2 jdk21 4.0.25 @@ -111,16 +111,17 @@ ${icu4j-version} ${influx-java-driver-version} ${jakarta-jms-api-version} + 4.15.0 ${json-patch-version} ${jodatime2-version} ${javassist-version} ${jetty-version} ${jira-rest-client-api-version} - 5.6.0 + 5.13.0 0.9.11 2.2.13 2.2.2 - 0.2.21 + 0.2.23 ${json-path-version} ${jedis-client-version} 2.5.0 @@ -145,7 +146,7 @@ 20240303 0.27.0 1.7 - 3.4.38 + 3.4.41 ${reactor-netty-version} 2.9.0 3.1.8 @@ -216,7 +217,7 @@ mirror.gcr.io/rmohr/activemq:5.15.9-alpine mirror.gcr.io/arangodb:3.12.0 - mcr.microsoft.com/azure-storage/azurite:3.32.0 + mcr.microsoft.com/azure-storage/azurite:3.33.0 quay.io/l2x6/calculator-ws:1.2 mirror.gcr.io/cassandra:5.0.2 mirror.gcr.io/hashicorp/consul:1.19 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b35597702e7d..8e50f1408784 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -615,13 +615,10 @@ camel-cassandraql ${camel.version} + - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations + org.apache.cassandra + * @@ -6568,6 +6565,26 @@ azure-core-http-vertx ${azure-core-http-vertx.version} + + + com.datastax.oss + java-driver-query-builder + ${java-driver-query-builder.version} + + + com.github.spotbugs + spotbugs-annotations + + + com.github.stephenc.jcip + jcip-annotations + + + com.google.code.findbugs + jsr305 + + + com.esotericsoftware.kryo kryo diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 665cb6aa7d8d..637399fffc1f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.9.0 + 4.10.0 org.apache.camel camel-amqp - 4.9.0 + 4.10.0 org.apache.camel camel-api - 4.9.0 + 4.10.0 org.apache.camel camel-arangodb - 4.9.0 + 4.10.0 org.apache.camel camel-as2 - 4.9.0 + 4.10.0 org.apache.camel camel-as2-api - 4.9.0 + 4.10.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.9.0 + 4.10.0 org.apache.camel camel-asterisk - 4.9.0 + 4.10.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.9.0 + 4.10.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.9.0 + 4.10.0 org.apache.camel camel-avro - 4.9.0 + 4.10.0 org.apache.camel camel-aws-bedrock - 4.9.0 + 4.10.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.9.0 + 4.10.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.9.0 + 4.10.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.9.0 + 4.10.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.9.0 + 4.10.0 commons-logging @@ -185,7 +185,7 @@ org.apache.camel camel-aws2-ddb - 4.9.0 + 4.10.0 commons-logging @@ -200,7 +200,7 @@ org.apache.camel camel-aws2-ec2 - 4.9.0 + 4.10.0 commons-logging @@ -211,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.9.0 + 4.10.0 commons-logging @@ -222,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.9.0 + 4.10.0 commons-logging @@ -233,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.9.0 + 4.10.0 commons-logging @@ -244,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.9.0 + 4.10.0 commons-logging @@ -255,7 +255,7 @@ org.apache.camel camel-aws2-kinesis - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -278,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.9.0 + 4.10.0 commons-logging @@ -289,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.9.0 + 4.10.0 commons-logging @@ -300,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.9.0 + 4.10.0 commons-logging @@ -311,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.9.0 + 4.10.0 commons-logging @@ -322,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.9.0 + 4.10.0 commons-logging @@ -333,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.9.0 + 4.10.0 commons-logging @@ -344,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.9.0 + 4.10.0 commons-logging @@ -355,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.9.0 + 4.10.0 commons-logging @@ -366,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.9.0 + 4.10.0 commons-logging @@ -377,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.9.0 + 4.10.0 commons-logging @@ -388,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.9.0 + 4.10.0 com.azure @@ -399,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.9.0 + 4.10.0 com.azure @@ -410,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.9.0 + 4.10.0 com.azure @@ -421,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.9.0 + 4.10.0 com.azure @@ -432,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.9.0 + 4.10.0 com.azure @@ -443,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.9.0 + 4.10.0 com.azure @@ -454,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.9.0 + 4.10.0 com.azure @@ -465,37 +465,37 @@ org.apache.camel camel-barcode - 4.9.0 + 4.10.0 org.apache.camel camel-base - 4.9.0 + 4.10.0 org.apache.camel camel-base-engine - 4.9.0 + 4.10.0 org.apache.camel camel-base64 - 4.9.0 + 4.10.0 org.apache.camel camel-bean - 4.9.0 + 4.10.0 org.apache.camel camel-bean-validator - 4.9.0 + 4.10.0 org.apache.camel camel-beanio - 4.9.0 + 4.10.0 jakarta.activation @@ -510,17 +510,17 @@ org.apache.camel camel-bindy - 4.9.0 + 4.10.0 org.apache.camel camel-bonita - 4.9.0 + 4.10.0 org.apache.camel camel-box - 4.9.0 + 4.10.0 commons-logging @@ -531,82 +531,78 @@ org.apache.camel camel-box-api - 4.9.0 + 4.10.0 org.apache.camel camel-braintree - 4.9.0 + 4.10.0 org.apache.camel camel-browse - 4.9.0 + 4.10.0 org.apache.camel camel-caffeine - 4.9.0 + 4.10.0 org.apache.camel camel-cassandraql - 4.9.0 + 4.10.0 - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations + org.apache.cassandra + * org.apache.camel camel-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-cbor - 4.9.0 + 4.10.0 org.apache.camel camel-chatscript - 4.9.0 + 4.10.0 org.apache.camel camel-chunk - 4.9.0 + 4.10.0 org.apache.camel camel-cli-connector - 4.9.0 + 4.10.0 org.apache.camel camel-cloud - 4.9.0 + 4.10.0 org.apache.camel camel-cloudevents - 4.9.0 + 4.10.0 org.apache.camel camel-cluster - 4.9.0 + 4.10.0 org.apache.camel camel-cm-sms - 4.9.0 + 4.10.0 commons-logging @@ -617,27 +613,27 @@ org.apache.camel camel-coap - 4.9.0 + 4.10.0 org.apache.camel camel-cometd - 4.9.0 + 4.10.0 org.apache.camel camel-componentdsl - 4.9.0 + 4.10.0 org.apache.camel camel-console - 4.9.0 + 4.10.0 org.apache.camel camel-consul - 4.9.0 + 4.10.0 org.checkerframework @@ -648,47 +644,47 @@ org.apache.camel camel-controlbus - 4.9.0 + 4.10.0 org.apache.camel camel-core-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-core-engine - 4.9.0 + 4.10.0 org.apache.camel camel-core-languages - 4.9.0 + 4.10.0 org.apache.camel camel-core-model - 4.9.0 + 4.10.0 org.apache.camel camel-core-processor - 4.9.0 + 4.10.0 org.apache.camel camel-core-reifier - 4.9.0 + 4.10.0 org.apache.camel camel-couchbase - 4.9.0 + 4.10.0 org.apache.camel camel-couchdb - 4.9.0 + 4.10.0 commons-logging @@ -699,12 +695,12 @@ org.apache.camel camel-cron - 4.9.0 + 4.10.0 org.apache.camel camel-crypto - 4.9.0 + 4.10.0 org.bouncycastle @@ -715,42 +711,42 @@ org.apache.camel camel-crypto-pgp - 4.9.0 + 4.10.0 org.apache.camel camel-csv - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-common - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-soap - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-transport - 4.9.0 + 4.10.0 org.apache.camel camel-dataformat - 4.9.0 + 4.10.0 org.apache.camel camel-dataset - 4.9.0 + 4.10.0 org.apache.camel camel-datasonnet - 4.9.0 + 4.10.0 ch.qos.logback @@ -781,7 +777,7 @@ org.apache.camel camel-debezium-common - 4.9.0 + 4.10.0 javax.ws.rs @@ -792,32 +788,32 @@ org.apache.camel camel-debezium-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-mysql - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-postgres - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-sqlserver - 4.9.0 + 4.10.0 org.apache.camel camel-debug - 4.9.0 + 4.10.0 org.apache.camel camel-digitalocean - 4.9.0 + 4.10.0 commons-logging @@ -828,17 +824,17 @@ org.apache.camel camel-direct - 4.9.0 + 4.10.0 org.apache.camel camel-disruptor - 4.9.0 + 4.10.0 org.apache.camel camel-djl - 4.9.0 + 4.10.0 org.checkerframework @@ -849,12 +845,12 @@ org.apache.camel camel-dns - 4.9.0 + 4.10.0 org.apache.camel camel-drill - 4.9.0 + 4.10.0 ch.qos.logback @@ -881,7 +877,7 @@ org.apache.camel camel-dropbox - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -892,22 +888,22 @@ org.apache.camel camel-dsl-modeline - 4.9.0 + 4.10.0 org.apache.camel camel-dsl-support - 4.9.0 + 4.10.0 org.apache.camel camel-ehcache - 4.9.0 + 4.10.0 org.apache.camel camel-elasticsearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -922,7 +918,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.9.0 + 4.10.0 commons-logging @@ -933,7 +929,7 @@ org.apache.camel camel-endpointdsl - 4.9.0 + 4.10.0 com.sun.mail @@ -944,12 +940,12 @@ org.apache.camel camel-endpointdsl-support - 4.9.0 + 4.10.0 org.apache.camel camel-etcd3 - 4.9.0 + 4.10.0 com.google.android @@ -972,42 +968,42 @@ org.apache.camel camel-exec - 4.9.0 + 4.10.0 org.apache.camel camel-fastjson - 4.9.0 + 4.10.0 org.apache.camel camel-fhir - 4.9.0 + 4.10.0 org.apache.camel camel-fhir-api - 4.9.0 + 4.10.0 org.apache.camel camel-file - 4.9.0 + 4.10.0 org.apache.camel camel-file-watch - 4.9.0 + 4.10.0 org.apache.camel camel-flatpack - 4.9.0 + 4.10.0 org.apache.camel camel-flink - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -1018,7 +1014,7 @@ org.apache.camel camel-fop - 4.9.0 + 4.10.0 commons-logging @@ -1033,17 +1029,17 @@ org.apache.camel camel-freemarker - 4.9.0 + 4.10.0 org.apache.camel camel-ftp - 4.9.0 + 4.10.0 org.apache.camel camel-fury - 4.9.0 + 4.10.0 org.checkerframework @@ -1054,7 +1050,7 @@ org.apache.camel camel-geocoder - 4.9.0 + 4.10.0 commons-logging @@ -1065,17 +1061,17 @@ org.apache.camel camel-git - 4.9.0 + 4.10.0 org.apache.camel camel-github - 4.9.0 + 4.10.0 org.apache.camel camel-google-bigquery - 4.9.0 + 4.10.0 com.google.android @@ -1102,7 +1098,7 @@ org.apache.camel camel-google-calendar - 4.9.0 + 4.10.0 commons-logging @@ -1117,7 +1113,7 @@ org.apache.camel camel-google-drive - 4.9.0 + 4.10.0 commons-logging @@ -1132,7 +1128,7 @@ org.apache.camel camel-google-functions - 4.9.0 + 4.10.0 com.google.android @@ -1159,7 +1155,7 @@ org.apache.camel camel-google-mail - 4.9.0 + 4.10.0 commons-logging @@ -1174,7 +1170,7 @@ org.apache.camel camel-google-pubsub - 4.9.0 + 4.10.0 com.google.android @@ -1201,7 +1197,7 @@ org.apache.camel camel-google-secret-manager - 4.9.0 + 4.10.0 com.google.android @@ -1232,7 +1228,7 @@ org.apache.camel camel-google-sheets - 4.9.0 + 4.10.0 commons-logging @@ -1247,7 +1243,7 @@ org.apache.camel camel-google-storage - 4.9.0 + 4.10.0 com.google.android @@ -1274,7 +1270,7 @@ org.apache.camel camel-graphql - 4.9.0 + 4.10.0 commons-logging @@ -1285,17 +1281,17 @@ org.apache.camel camel-grok - 4.9.0 + 4.10.0 org.apache.camel camel-groovy - 4.9.0 + 4.10.0 org.apache.camel camel-grpc - 4.9.0 + 4.10.0 com.google.android @@ -1326,12 +1322,12 @@ org.apache.camel camel-gson - 4.9.0 + 4.10.0 org.apache.camel camel-guava-eventbus - 4.9.0 + 4.10.0 org.checkerframework @@ -1342,7 +1338,7 @@ org.apache.camel camel-hashicorp-vault - 4.9.0 + 4.10.0 org.springframework @@ -1361,12 +1357,12 @@ org.apache.camel camel-hazelcast - 4.9.0 + 4.10.0 org.apache.camel camel-headersmap - 4.9.0 + 4.10.0 ch.qos.logback @@ -1377,17 +1373,17 @@ org.apache.camel camel-health - 4.9.0 + 4.10.0 org.apache.camel camel-hl7 - 4.9.0 + 4.10.0 org.apache.camel camel-http - 4.9.0 + 4.10.0 commons-logging @@ -1398,27 +1394,27 @@ org.apache.camel camel-http-base - 4.9.0 + 4.10.0 org.apache.camel camel-http-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-smn - 4.9.0 + 4.10.0 org.apache.camel camel-ical - 4.9.0 + 4.10.0 commons-logging @@ -1429,7 +1425,7 @@ org.apache.camel camel-iec60870 - 4.9.0 + 4.10.0 org.checkerframework @@ -1440,12 +1436,12 @@ org.apache.camel camel-ignite - 4.9.0 + 4.10.0 org.apache.camel camel-infinispan - 4.9.0 + 4.10.0 org.infinispan @@ -1464,57 +1460,57 @@ org.apache.camel camel-infinispan-common - 4.9.0 + 4.10.0 org.apache.camel camel-influxdb - 4.9.0 + 4.10.0 org.apache.camel camel-irc - 4.9.0 + 4.10.0 org.apache.camel camel-jackson - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-avro - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-protobuf - 4.9.0 + 4.10.0 org.apache.camel camel-jacksonxml - 4.9.0 + 4.10.0 org.apache.camel camel-jasypt - 4.9.0 + 4.10.0 org.apache.camel camel-java-joor-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-javascript - 4.9.0 + 4.10.0 org.apache.camel camel-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -1525,12 +1521,12 @@ org.apache.camel camel-jcache - 4.9.0 + 4.10.0 org.apache.camel camel-jcr - 4.9.0 + 4.10.0 org.slf4j @@ -1541,27 +1537,27 @@ org.apache.camel camel-jdbc - 4.9.0 + 4.10.0 org.apache.camel camel-jfr - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups-raft - 4.9.0 + 4.10.0 org.apache.camel camel-jira - 4.9.0 + 4.10.0 commons-logging @@ -1580,7 +1576,7 @@ org.apache.camel camel-jms - 4.9.0 + 4.10.0 org.apache.camel @@ -1599,12 +1595,12 @@ org.apache.camel camel-jolt - 4.9.0 + 4.10.0 org.apache.camel camel-jooq - 4.9.0 + 4.10.0 org.springframework @@ -1615,12 +1611,12 @@ org.apache.camel camel-joor - 4.9.0 + 4.10.0 org.apache.camel camel-jpa - 4.9.0 + 4.10.0 org.apache.camel @@ -1635,7 +1631,7 @@ org.apache.camel camel-jq - 4.9.0 + 4.10.0 net.thisptr @@ -1650,82 +1646,82 @@ org.apache.camel camel-jsch - 4.9.0 + 4.10.0 org.apache.camel camel-jslt - 4.9.0 + 4.10.0 org.apache.camel camel-json-patch - 4.9.0 + 4.10.0 org.apache.camel camel-json-validator - 4.9.0 + 4.10.0 org.apache.camel camel-jsonapi - 4.9.0 + 4.10.0 org.apache.camel camel-jsonata - 4.9.0 + 4.10.0 org.apache.camel camel-jsonb - 4.9.0 + 4.10.0 org.apache.camel camel-jsonpath - 4.9.0 + 4.10.0 org.apache.camel camel-jt400 - 4.9.0 + 4.10.0 org.apache.camel camel-jta - 4.9.0 + 4.10.0 org.apache.camel camel-kafka - 4.9.0 + 4.10.0 org.apache.camel camel-kamelet - 4.9.0 + 4.10.0 org.apache.camel camel-knative - 4.9.0 + 4.10.0 org.apache.camel camel-knative-api - 4.9.0 + 4.10.0 org.apache.camel camel-knative-http - 4.9.0 + 4.10.0 org.apache.camel camel-kubernetes - 4.9.0 + 4.10.0 io.fabric8 @@ -1748,57 +1744,57 @@ org.apache.camel camel-kudu - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-chat - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-core - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-embeddings - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tokenizer - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tools - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-web-search - 4.9.0 + 4.10.0 org.apache.camel camel-language - 4.9.0 + 4.10.0 org.apache.camel camel-ldap - 4.9.0 + 4.10.0 org.apache.camel camel-ldif - 4.9.0 + 4.10.0 org.apache.camel camel-leveldb - 4.9.0 + 4.10.0 org.checkerframework @@ -1809,82 +1805,82 @@ org.apache.camel camel-log - 4.9.0 + 4.10.0 org.apache.camel camel-lra - 4.9.0 + 4.10.0 org.apache.camel camel-lucene - 4.9.0 + 4.10.0 org.apache.camel camel-lumberjack - 4.9.0 + 4.10.0 org.apache.camel camel-lzf - 4.9.0 + 4.10.0 org.apache.camel camel-mail - 4.9.0 + 4.10.0 org.apache.camel camel-mail-microsoft-oauth - 4.9.0 + 4.10.0 org.apache.camel camel-main - 4.9.0 + 4.10.0 org.apache.camel camel-management - 4.9.0 + 4.10.0 org.apache.camel camel-management-api - 4.9.0 + 4.10.0 org.apache.camel camel-mapstruct - 4.9.0 + 4.10.0 org.apache.camel camel-master - 4.9.0 + 4.10.0 org.apache.camel camel-micrometer - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-config - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-fault-tolerance - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-health - 4.9.0 + 4.10.0 org.eclipse.parsson @@ -1899,7 +1895,7 @@ org.apache.camel camel-milvus - 4.9.0 + 4.10.0 com.google.android @@ -1938,62 +1934,62 @@ org.apache.camel camel-minio - 4.9.0 + 4.10.0 org.apache.camel camel-mllp - 4.9.0 + 4.10.0 org.apache.camel camel-mock - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb-gridfs - 4.9.0 + 4.10.0 org.apache.camel camel-mustache - 4.9.0 + 4.10.0 org.apache.camel camel-mvel - 4.9.0 + 4.10.0 org.apache.camel camel-mybatis - 4.9.0 + 4.10.0 org.apache.camel camel-nats - 4.9.0 + 4.10.0 org.apache.camel camel-netty - 4.9.0 + 4.10.0 org.apache.camel camel-netty-http - 4.9.0 + 4.10.0 org.apache.camel camel-nitrite - 4.9.0 + 4.10.0 javax.validation @@ -2004,7 +2000,7 @@ org.apache.camel camel-oaipmh - 4.9.0 + 4.10.0 commons-logging @@ -2015,17 +2011,17 @@ org.apache.camel camel-observability-services - 4.9.0 + 4.10.0 org.apache.camel camel-ognl - 4.9.0 + 4.10.0 org.apache.camel camel-olingo4 - 4.9.0 + 4.10.0 commons-logging @@ -2036,7 +2032,7 @@ org.apache.camel camel-olingo4-api - 4.9.0 + 4.10.0 commons-logging @@ -2047,7 +2043,7 @@ org.apache.camel camel-openapi-java - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2062,7 +2058,7 @@ org.apache.camel camel-opensearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2077,7 +2073,7 @@ org.apache.camel camel-openstack - 4.9.0 + 4.10.0 com.github.fge @@ -2092,7 +2088,7 @@ org.apache.camel camel-opentelemetry - 4.9.0 + 4.10.0 io.grpc @@ -2103,7 +2099,7 @@ org.apache.camel camel-optaplanner - 4.9.0 + 4.10.0 org.optaplanner @@ -2122,17 +2118,17 @@ org.apache.camel camel-paho - 4.9.0 + 4.10.0 org.apache.camel camel-paho-mqtt5 - 4.9.0 + 4.10.0 org.apache.camel camel-pdf - 4.9.0 + 4.10.0 commons-logging @@ -2143,12 +2139,12 @@ org.apache.camel camel-pg-replication-slot - 4.9.0 + 4.10.0 org.apache.camel camel-pgevent - 4.9.0 + 4.10.0 org.testcontainers @@ -2159,7 +2155,7 @@ org.apache.camel camel-pinecone - 4.9.0 + 4.10.0 com.google.android @@ -2182,22 +2178,22 @@ org.apache.camel camel-platform-http - 4.9.0 + 4.10.0 org.apache.camel camel-platform-http-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-printer - 4.9.0 + 4.10.0 org.apache.camel camel-protobuf - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2208,12 +2204,12 @@ org.apache.camel camel-pubnub - 4.9.0 + 4.10.0 org.apache.camel camel-pulsar - 4.9.0 + 4.10.0 com.sun.activation @@ -2248,7 +2244,7 @@ org.apache.camel camel-qdrant - 4.9.0 + 4.10.0 com.google.android @@ -2271,7 +2267,7 @@ org.apache.camel camel-quartz - 4.9.0 + 4.10.0 jakarta.activation @@ -2294,37 +2290,37 @@ org.apache.camel camel-quickfix - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-executor-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-streams - 4.9.0 + 4.10.0 org.apache.camel camel-redis - 4.9.0 + 4.10.0 org.apache.camel camel-ref - 4.9.0 + 4.10.0 org.apache.camel camel-rest - 4.9.0 + 4.10.0 org.apache.camel camel-rest-openapi - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2339,22 +2335,22 @@ org.apache.camel camel-robotframework - 4.9.0 + 4.10.0 org.apache.camel camel-rss - 4.9.0 + 4.10.0 org.apache.camel camel-saga - 4.9.0 + 4.10.0 org.apache.camel camel-salesforce - 4.9.0 + 4.10.0 com.google.android @@ -2381,12 +2377,12 @@ org.apache.camel camel-sap-netweaver - 4.9.0 + 4.10.0 org.apache.camel camel-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2397,12 +2393,12 @@ org.apache.camel camel-scheduler - 4.9.0 + 4.10.0 org.apache.camel camel-schematron - 4.9.0 + 4.10.0 xml-apis @@ -2413,42 +2409,42 @@ org.apache.camel camel-seda - 4.9.0 + 4.10.0 org.apache.camel camel-servicenow - 4.9.0 + 4.10.0 org.apache.camel camel-servlet - 4.9.0 + 4.10.0 org.apache.camel camel-shiro - 4.9.0 + 4.10.0 org.apache.camel camel-sjms - 4.9.0 + 4.10.0 org.apache.camel camel-sjms2 - 4.9.0 + 4.10.0 org.apache.camel camel-slack - 4.9.0 + 4.10.0 org.apache.camel camel-smb - 4.9.0 + 4.10.0 junit @@ -2459,7 +2455,7 @@ org.apache.camel camel-smooks - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2474,22 +2470,22 @@ org.apache.camel camel-smpp - 4.9.0 + 4.10.0 org.apache.camel camel-snakeyaml - 4.9.0 + 4.10.0 org.apache.camel camel-snmp - 4.9.0 + 4.10.0 org.apache.camel camel-soap - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2504,12 +2500,12 @@ org.apache.camel camel-splunk - 4.9.0 + 4.10.0 org.apache.camel camel-splunk-hec - 4.9.0 + 4.10.0 commons-logging @@ -2520,7 +2516,7 @@ org.apache.camel camel-spring-rabbitmq - 4.9.0 + 4.10.0 org.springframework @@ -2535,17 +2531,17 @@ org.apache.camel camel-spring-redis - 4.9.0 + 4.10.0 org.apache.camel camel-sql - 4.9.0 + 4.10.0 org.apache.camel camel-ssh - 4.9.0 + 4.10.0 org.slf4j @@ -2556,42 +2552,42 @@ org.apache.camel camel-stax - 4.9.0 + 4.10.0 org.apache.camel camel-stitch - 4.9.0 + 4.10.0 org.apache.camel camel-stomp - 4.9.0 + 4.10.0 org.apache.camel camel-stream - 4.9.0 + 4.10.0 org.apache.camel camel-stringtemplate - 4.9.0 + 4.10.0 org.apache.camel camel-stub - 4.9.0 + 4.10.0 org.apache.camel camel-support - 4.9.0 + 4.10.0 org.apache.camel camel-swift - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2602,22 +2598,22 @@ org.apache.camel camel-syslog - 4.9.0 + 4.10.0 org.apache.camel camel-tarfile - 4.9.0 + 4.10.0 org.apache.camel camel-telegram - 4.9.0 + 4.10.0 org.apache.camel camel-test-junit5 - 4.9.0 + 4.10.0 org.apache.camel @@ -2628,42 +2624,42 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-thrift - 4.9.0 + 4.10.0 org.apache.camel camel-tika - 4.9.0 + 4.10.0 org.apache.camel camel-timer - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-model - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-util - 4.9.0 + 4.10.0 org.apache.camel camel-tracing - 4.9.0 + 4.10.0 org.apache.camel camel-twilio - 4.9.0 + 4.10.0 commons-logging @@ -2682,62 +2678,62 @@ org.apache.camel camel-twitter - 4.9.0 + 4.10.0 org.apache.camel camel-univocity-parsers - 4.9.0 + 4.10.0 org.apache.camel camel-util - 4.9.0 + 4.10.0 org.apache.camel camel-util-json - 4.9.0 + 4.10.0 org.apache.camel camel-validator - 4.9.0 + 4.10.0 org.apache.camel camel-velocity - 4.9.0 + 4.10.0 org.apache.camel camel-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-common - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-http - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-websocket - 4.9.0 + 4.10.0 org.apache.camel camel-wasm - 4.9.0 + 4.10.0 org.apache.camel camel-weather - 4.9.0 + 4.10.0 commons-logging @@ -2748,17 +2744,17 @@ org.apache.camel camel-web3j - 4.9.0 + 4.10.0 org.apache.camel camel-webhook - 4.9.0 + 4.10.0 org.apache.camel camel-wordpress - 4.9.0 + 4.10.0 org.checkerframework @@ -2769,7 +2765,7 @@ org.apache.camel camel-workday - 4.9.0 + 4.10.0 commons-logging @@ -2780,7 +2776,7 @@ org.apache.camel camel-xchange - 4.9.0 + 4.10.0 org.checkerframework @@ -2791,27 +2787,27 @@ org.apache.camel camel-xj - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-util - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2826,37 +2822,37 @@ org.apache.camel camel-xml-jaxp - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxp-util - 4.9.0 + 4.10.0 org.apache.camel camel-xmlsecurity - 4.9.0 + 4.10.0 org.apache.camel camel-xmpp - 4.9.0 + 4.10.0 org.apache.camel camel-xpath - 4.9.0 + 4.10.0 org.apache.camel camel-xslt - 4.9.0 + 4.10.0 org.apache.camel camel-xslt-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2867,42 +2863,42 @@ org.apache.camel camel-yaml-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-common - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-deserializers - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-io - 4.9.0 + 4.10.0 org.apache.camel camel-zendesk - 4.9.0 + 4.10.0 org.apache.camel camel-zip-deflater - 4.9.0 + 4.10.0 org.apache.camel camel-zipfile - 4.9.0 + 4.10.0 org.apache.camel camel-zookeeper - 4.9.0 + 4.10.0 org.checkerframework @@ -2913,7 +2909,7 @@ org.apache.camel camel-zookeeper-master - 4.9.0 + 4.10.0 org.checkerframework @@ -6354,52 +6350,52 @@ ca.uhn.hapi hapi-base - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v21 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v22 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v23 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v231 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v24 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v25 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v251 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v26 - 2.5.1 + 2.6.0 ca.uhn.hapi.fhir hapi-fhir-base - 7.6.0 + 7.6.1 com.google.code.findbugs @@ -6418,12 +6414,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.6.0 + 7.6.1 junit @@ -6438,22 +6434,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir @@ -6490,6 +6486,25 @@ azure-core-http-vertx 1.0.0 + + com.datastax.oss + java-driver-query-builder + 4.15.0 + + + com.github.spotbugs + spotbugs-annotations + + + com.github.stephenc.jcip + jcip-annotations + + + com.google.code.findbugs + jsr305 + + + com.esotericsoftware.kryo kryo @@ -6524,17 +6539,17 @@ com.github.mwiede jsch - 0.2.21 + 0.2.23 com.google.auth google-auth-library-credentials - 1.29.0 + 1.31.0 com.google.auth google-auth-library-oauth2-http - 1.29.0 + 1.31.0 com.google.code.findbugs @@ -6545,7 +6560,7 @@ com.google.cloud google-cloud-pubsub - 1.134.1 + 1.136.1 com.google.android @@ -6576,7 +6591,7 @@ com.google.oauth-client google-oauth-client - 1.36.0 + 1.37.0 commons-logging @@ -6627,7 +6642,7 @@ com.orbitz.consul consul-client - 1.4.2 + 1.5.0 com.google.code.findbugs @@ -6734,12 +6749,12 @@ io.dropwizard.metrics dropwizard-core - 4.2.29 + 4.2.30 io.dropwizard.metrics metrics-jmx - 4.2.29 + 4.2.30 io.minio @@ -6776,12 +6791,12 @@ io.projectreactor reactor-core - 3.4.38 + 3.4.41 io.projectreactor.netty reactor-netty - 1.2.0 + 1.2.2 io.quarkiverse.freemarker @@ -6842,12 +6857,12 @@ io.quarkiverse.jsch quarkus-jsch - 3.0.12 + 3.0.13 io.quarkiverse.jsch quarkus-jsch-deployment - 3.0.12 + 3.0.13 io.quarkiverse.langchain4j @@ -6967,7 +6982,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.24 + 2.1.25 com.google.code.findbugs @@ -6999,7 +7014,7 @@ joda-time joda-time - 2.13.0 + 2.13.1 net.i2p.crypto @@ -7009,7 +7024,7 @@ net.java.dev.jna jna-platform - 5.6.0 + 5.13.0 net.minidev @@ -7075,7 +7090,7 @@ org.apache.kudu kudu-client - 1.17.0 + 1.17.1 com.google.code.findbugs @@ -7090,7 +7105,7 @@ org.apache.pdfbox fontbox - 3.0.3 + 3.0.4 commons-logging @@ -7217,7 +7232,7 @@ org.kiwiproject consul-client - 1.4.2 + 1.5.0 com.google.code.findbugs @@ -7272,12 +7287,12 @@ org.snakeyaml snakeyaml-engine - 2.8 + 2.9 org.springframework spring-aop - 6.2.0 + 6.2.2 org.springframework @@ -7292,7 +7307,7 @@ org.springframework spring-expression - 6.2.0 + 6.2.2 org.springframework @@ -7303,7 +7318,7 @@ org.springframework spring-jdbc - 6.2.0 + 6.2.2 org.springframework @@ -7318,7 +7333,7 @@ org.springframework spring-jms - 6.2.0 + 6.2.2 org.springframework @@ -7333,7 +7348,7 @@ org.springframework spring-messaging - 6.2.0 + 6.2.2 org.springframework @@ -7348,7 +7363,7 @@ org.springframework spring-orm - 6.2.0 + 6.2.2 org.springframework @@ -7363,7 +7378,7 @@ org.springframework spring-tx - 6.2.0 + 6.2.2 org.springframework @@ -7378,7 +7393,7 @@ org.springframework spring-web - 6.2.0 + 6.2.2 org.springframework @@ -7397,7 +7412,7 @@ org.springframework.data spring-data-redis - 3.4.0 + 3.4.2 org.springframework @@ -23333,624 +23348,634 @@ 2.2 - org.eclipse.jetty - jetty-alpn-client - 12.0.15 + org.eclipse.jetty + jetty-alpn-client + 12.0.16 + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + 12.0.16 + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + 12.0.16 - org.eclipse.jetty - jetty-alpn-conscrypt-client - 12.0.15 + org.eclipse.jetty + jetty-alpn-java-client + 12.0.16 - org.eclipse.jetty - jetty-alpn-conscrypt-server - 12.0.15 + org.eclipse.jetty + jetty-alpn-java-server + 12.0.16 - org.eclipse.jetty - jetty-alpn-java-client - 12.0.15 + org.eclipse.jetty + jetty-alpn-server + 12.0.16 - org.eclipse.jetty - jetty-alpn-java-server - 12.0.15 + org.eclipse.jetty + jetty-client + 12.0.16 - org.eclipse.jetty - jetty-alpn-server - 12.0.15 + org.eclipse.jetty + jetty-deploy + 12.0.16 - org.eclipse.jetty - jetty-client - 12.0.15 + org.eclipse.jetty + jetty-http + 12.0.16 - org.eclipse.jetty - jetty-deploy - 12.0.15 + org.eclipse.jetty + jetty-http-spi + 12.0.16 - org.eclipse.jetty - jetty-http - 12.0.15 + org.eclipse.jetty + jetty-http-tools + 12.0.16 - org.eclipse.jetty - jetty-http-spi - 12.0.15 + org.eclipse.jetty + jetty-io + 12.0.16 - org.eclipse.jetty - jetty-http-tools - 12.0.15 + org.eclipse.jetty + jetty-jmx + 12.0.16 - org.eclipse.jetty - jetty-io - 12.0.15 + org.eclipse.jetty + jetty-jndi + 12.0.16 - org.eclipse.jetty - jetty-jmx - 12.0.15 + org.eclipse.jetty + jetty-keystore + 12.0.16 - org.eclipse.jetty - jetty-jndi - 12.0.15 + org.eclipse.jetty + jetty-openid + 12.0.16 - org.eclipse.jetty - jetty-keystore - 12.0.15 + org.eclipse.jetty + jetty-osgi + 12.0.16 - org.eclipse.jetty - jetty-openid - 12.0.15 + org.eclipse.jetty + jetty-plus + 12.0.16 - org.eclipse.jetty - jetty-osgi - 12.0.15 + org.eclipse.jetty + jetty-proxy + 12.0.16 - org.eclipse.jetty - jetty-plus - 12.0.15 + org.eclipse.jetty + jetty-rewrite + 12.0.16 - org.eclipse.jetty - jetty-proxy - 12.0.15 + org.eclipse.jetty + jetty-security + 12.0.16 - org.eclipse.jetty - jetty-rewrite - 12.0.15 + org.eclipse.jetty + jetty-server + 12.0.16 - org.eclipse.jetty - jetty-security - 12.0.15 + org.eclipse.jetty + jetty-session + 12.0.16 - org.eclipse.jetty - jetty-server - 12.0.15 + org.eclipse.jetty + jetty-slf4j-impl + 12.0.16 - org.eclipse.jetty - jetty-session - 12.0.15 + org.eclipse.jetty + jetty-start + 12.0.16 - org.eclipse.jetty - jetty-slf4j-impl - 12.0.15 + org.eclipse.jetty + jetty-unixdomain-server + 12.0.16 - org.eclipse.jetty - jetty-start - 12.0.15 + org.eclipse.jetty + jetty-util + 12.0.16 - org.eclipse.jetty - jetty-unixdomain-server - 12.0.15 + org.eclipse.jetty + jetty-util-ajax + 12.0.16 - org.eclipse.jetty - jetty-util - 12.0.15 + org.eclipse.jetty + jetty-xml + 12.0.16 - org.eclipse.jetty - jetty-util-ajax - 12.0.15 + org.eclipse.jetty.demos + jetty-demo-handler + 12.0.16 - org.eclipse.jetty - jetty-xml - 12.0.15 + org.eclipse.jetty.fcgi + jetty-fcgi-client + 12.0.16 - org.eclipse.jetty.demos - jetty-demo-handler - 12.0.15 + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + 12.0.16 - org.eclipse.jetty.fcgi - jetty-fcgi-client - 12.0.15 + org.eclipse.jetty.fcgi + jetty-fcgi-server + 12.0.16 - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - 12.0.15 + org.eclipse.jetty.http2 + jetty-http2-client + 12.0.16 - org.eclipse.jetty.fcgi - jetty-fcgi-server - 12.0.15 + org.eclipse.jetty.http2 + jetty-http2-client-transport + 12.0.16 - org.eclipse.jetty.http2 - jetty-http2-client - 12.0.15 + org.eclipse.jetty.http2 + jetty-http2-common + 12.0.16 - org.eclipse.jetty.http2 - jetty-http2-client-transport - 12.0.15 + org.eclipse.jetty.http2 + jetty-http2-hpack + 12.0.16 - org.eclipse.jetty.http2 - jetty-http2-common - 12.0.15 + org.eclipse.jetty.http2 + jetty-http2-server + 12.0.16 - org.eclipse.jetty.http2 - jetty-http2-hpack - 12.0.15 + org.eclipse.jetty.http3 + jetty-http3-client + 12.0.16 - org.eclipse.jetty.http2 - jetty-http2-server - 12.0.15 + org.eclipse.jetty.http3 + jetty-http3-client-transport + 12.0.16 - org.eclipse.jetty.http3 - jetty-http3-client - 12.0.15 + org.eclipse.jetty.http3 + jetty-http3-common + 12.0.16 - org.eclipse.jetty.http3 - jetty-http3-client-transport - 12.0.15 + org.eclipse.jetty.http3 + jetty-http3-qpack + 12.0.16 - org.eclipse.jetty.http3 - jetty-http3-common - 12.0.15 + org.eclipse.jetty.http3 + jetty-http3-server + 12.0.16 - org.eclipse.jetty.http3 - jetty-http3-qpack - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-client + 12.0.16 - org.eclipse.jetty.http3 - jetty-http3-server - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-common + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-client - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-quiche-common + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-common - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-quiche-foreign + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-quiche-common - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-quiche-jna + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-quiche-foreign - 12.0.15 + org.eclipse.jetty.quic + jetty-quic-server + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-quiche-jna - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-core-client + 12.0.16 - org.eclipse.jetty.quic - jetty-quic-server - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-core-common + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-core-client - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-core-server + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-core-common - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-core-server - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - 12.0.15 + com.azure + azure-ai-contentsafety + 1.0.9 - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - 12.0.15 + com.azure + azure-ai-formrecognizer + 4.1.12 - com.azure - azure-ai-contentsafety - 1.0.8 + com.azure + azure-ai-documentintelligence + 1.0.0 - com.azure - azure-ai-formrecognizer - 4.1.11 + com.azure + azure-ai-metricsadvisor + 1.2.4 - com.azure - azure-ai-metricsadvisor - 1.2.3 + com.azure + azure-ai-textanalytics + 5.5.4 - com.azure - azure-ai-textanalytics - 5.5.3 + com.azure + azure-ai-translation-document + 1.0.0 - com.azure - azure-ai-translation-text - 1.0.0 + com.azure + azure-ai-translation-text + 1.1.0 - com.azure - azure-communication-callautomation - 1.2.6 + com.azure + azure-communication-callautomation + 1.3.1 - com.azure - azure-communication-chat - 1.5.6 + com.azure + azure-communication-chat + 1.5.7 - com.azure - azure-communication-common - 1.3.8 + com.azure + azure-communication-common + 1.3.9 - com.azure - azure-communication-email - 1.0.18 + com.azure + azure-communication-email + 1.0.19 - com.azure - azure-communication-identity - 1.6.1 + com.azure + azure-communication-identity + 1.6.2 - com.azure - azure-communication-jobrouter - 1.1.9 + com.azure + azure-communication-jobrouter + 1.1.10 - com.azure - azure-communication-messages - 1.1.0 + com.azure + azure-communication-messages + 1.1.1 - com.azure - azure-communication-phonenumbers - 1.1.18 + com.azure + azure-communication-phonenumbers + 1.1.19 - com.azure - azure-communication-rooms - 1.1.7 + com.azure + azure-communication-rooms + 1.1.8 - com.azure - azure-communication-sms - 1.1.29 + com.azure + azure-communication-sms + 1.1.30 - com.azure - azure-containers-containerregistry - 1.2.13 + com.azure + azure-containers-containerregistry + 1.2.14 - com.azure - azure-core - 1.53.0 + com.azure + azure-core + 1.54.1 - com.azure - azure-core-amqp - 2.9.10 + com.azure + azure-core-amqp + 2.9.12 - com.azure - azure-core-http-netty - 1.15.5 + com.azure + azure-core-http-netty + 1.15.7 - com.azure - azure-core-http-okhttp - 1.12.4 + com.azure + azure-core-http-okhttp + 1.12.6 - com.azure - azure-core-management - 1.15.4 + com.azure + azure-core-management + 1.15.6 - com.azure - azure-core-serializer-json-gson - 1.3.2 + com.azure + azure-core-serializer-json-gson + 1.3.4 - com.azure - azure-core-serializer-json-jackson - 1.5.2 + com.azure + azure-core-serializer-json-jackson + 1.5.4 - com.azure - azure-cosmos - 4.64.0 + com.azure + azure-cosmos + 4.66.0 - com.azure - azure-cosmos-encryption - 2.15.0 + com.azure + azure-cosmos-encryption + 2.17.0 - com.azure - azure-data-appconfiguration - 1.7.2 + com.azure + azure-data-appconfiguration + 1.7.3 - com.azure - azure-data-schemaregistry - 1.5.1 + com.azure + azure-data-schemaregistry + 1.5.2 - com.azure - azure-data-schemaregistry-apacheavro - 1.1.22 + com.azure + azure-data-schemaregistry-apacheavro + 1.1.23 - com.azure - azure-data-schemaregistry-jsonschema - 1.0.0 + com.azure + azure-data-schemaregistry-jsonschema + 1.0.0 - com.azure - azure-data-tables - 12.4.6 + com.azure + azure-data-tables + 12.5.0 - com.azure - azure-developer-devcenter - 1.0.5 + com.azure + azure-developer-devcenter + 1.0.6 - com.azure - azure-developer-loadtesting - 1.0.18 + com.azure + azure-developer-loadtesting + 1.0.20 - com.azure - azure-digitaltwins-core - 1.3.25 + com.azure + azure-digitaltwins-core + 1.4.0 - com.azure - azure-health-deidentification - 1.0.0 + com.azure + azure-health-deidentification + 1.0.0 - com.azure - azure-identity - 1.14.0 + com.azure + azure-identity + 1.15.0 - com.azure - azure-identity-broker - 1.1.6 + com.azure + azure-identity-broker + 1.1.9 - com.azure - azure-identity-extensions - 1.1.21 + com.azure + azure-identity-extensions + 1.2.0 - com.azure - azure-iot-deviceupdate - 1.0.23 + com.azure + azure-iot-deviceupdate + 1.0.24 - com.azure - azure-json - 1.3.0 + com.azure + azure-json + 1.3.0 - com.azure - azure-messaging-eventgrid - 4.26.0 + com.azure + azure-messaging-eventgrid + 4.28.0 - com.azure - azure-messaging-eventgrid-namespaces - 1.1.0 + com.azure + azure-messaging-eventgrid-namespaces + 1.1.1 - com.azure - azure-messaging-eventhubs - 5.19.1 + com.azure + azure-messaging-eventhubs + 5.20.0 - com.azure - azure-messaging-eventhubs-checkpointstore-blob - 1.20.1 + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.20.2 - com.azure - azure-messaging-servicebus - 7.17.5 + com.azure + azure-messaging-servicebus + 7.17.8 - com.azure - azure-messaging-webpubsub - 1.3.2 + com.azure + azure-messaging-webpubsub + 1.3.3 - com.azure - azure-messaging-webpubsub-client - 1.0.8 + com.azure + azure-messaging-webpubsub-client + 1.0.9 - com.azure - azure-mixedreality-authentication - 1.2.29 + com.azure + azure-mixedreality-authentication + 1.2.30 - com.azure - azure-mixedreality-remoterendering - 1.1.34 + com.azure + azure-mixedreality-remoterendering + 1.1.35 - com.azure - azure-monitor-ingestion - 1.2.6 + com.azure + azure-monitor-ingestion + 1.2.7 - com.azure - azure-monitor-query - 1.5.3 + com.azure + azure-monitor-query + 1.5.4 - com.azure - azure-search-documents - 11.7.3 + com.azure + azure-search-documents + 11.7.4 - com.azure - azure-security-attestation - 1.1.29 + com.azure + azure-security-attestation + 1.1.30 - com.azure - azure-security-confidentialledger - 1.0.25 + com.azure + azure-security-confidentialledger + 1.0.26 - com.azure - azure-security-keyvault-administration - 4.6.0 + com.azure + azure-security-keyvault-administration + 4.6.2 - com.azure - azure-security-keyvault-certificates - 4.7.0 + com.azure + azure-security-keyvault-certificates + 4.7.2 - com.azure - azure-security-keyvault-jca - 2.9.0 + com.azure + azure-security-keyvault-jca + 2.10.0 - com.azure - azure-security-keyvault-keys - 4.9.0 + com.azure + azure-security-keyvault-keys + 4.9.2 - com.azure - azure-security-keyvault-secrets - 4.9.0 + com.azure + azure-security-keyvault-secrets + 4.9.2 - com.azure - azure-storage-blob - 12.28.1 + com.azure + azure-storage-blob + 12.29.0 - com.azure - azure-storage-blob-batch - 12.24.0 + com.azure + azure-storage-blob-batch + 12.25.0 - com.azure - azure-storage-blob-cryptography - 12.27.1 + com.azure + azure-storage-blob-cryptography + 12.28.0 - com.azure - azure-storage-common - 12.27.1 + com.azure + azure-storage-common + 12.28.0 - com.azure - azure-storage-file-datalake - 12.21.0 + com.azure + azure-storage-file-datalake + 12.22.0 - com.azure - azure-storage-file-share - 12.24.0 + com.azure + azure-storage-file-share + 12.25.0 - com.azure - azure-storage-internal-avro - 12.13.0 + com.azure + azure-storage-internal-avro + 12.14.0 - com.azure - azure-storage-queue - 12.23.0 + com.azure + azure-storage-queue + 12.24.0 - com.azure - azure-xml - 1.1.0 + com.azure + azure-xml + 1.1.0 - com.azure - azure-ai-vision-imageanalysis - 1.0.0 + com.azure + azure-ai-vision-imageanalysis + 1.0.0 com.datastax.oss @@ -24050,25 +24075,6 @@ java-driver-mapper-runtime 4.15.0 - - com.datastax.oss - java-driver-query-builder - 4.15.0 - - - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations - - - com.google.code.findbugs - jsr305 - - - com.datastax.oss java-driver-test-infra diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 3e6f4253c119..f05104d63199 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.9.0 + 4.10.0 org.apache.camel camel-amqp - 4.9.0 + 4.10.0 org.apache.camel camel-api - 4.9.0 + 4.10.0 org.apache.camel camel-arangodb - 4.9.0 + 4.10.0 org.apache.camel camel-as2 - 4.9.0 + 4.10.0 org.apache.camel camel-as2-api - 4.9.0 + 4.10.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.9.0 + 4.10.0 org.apache.camel camel-asterisk - 4.9.0 + 4.10.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.9.0 + 4.10.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.9.0 + 4.10.0 org.apache.camel camel-avro - 4.9.0 + 4.10.0 org.apache.camel camel-aws-bedrock - 4.9.0 + 4.10.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.9.0 + 4.10.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.9.0 + 4.10.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.9.0 + 4.10.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.9.0 + 4.10.0 commons-logging @@ -185,7 +185,7 @@ org.apache.camel camel-aws2-ddb - 4.9.0 + 4.10.0 commons-logging @@ -200,7 +200,7 @@ org.apache.camel camel-aws2-ec2 - 4.9.0 + 4.10.0 commons-logging @@ -211,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.9.0 + 4.10.0 commons-logging @@ -222,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.9.0 + 4.10.0 commons-logging @@ -233,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.9.0 + 4.10.0 commons-logging @@ -244,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.9.0 + 4.10.0 commons-logging @@ -255,7 +255,7 @@ org.apache.camel camel-aws2-kinesis - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -278,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.9.0 + 4.10.0 commons-logging @@ -289,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.9.0 + 4.10.0 commons-logging @@ -300,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.9.0 + 4.10.0 commons-logging @@ -311,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.9.0 + 4.10.0 commons-logging @@ -322,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.9.0 + 4.10.0 commons-logging @@ -333,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.9.0 + 4.10.0 commons-logging @@ -344,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.9.0 + 4.10.0 commons-logging @@ -355,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.9.0 + 4.10.0 commons-logging @@ -366,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.9.0 + 4.10.0 commons-logging @@ -377,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.9.0 + 4.10.0 commons-logging @@ -388,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.9.0 + 4.10.0 com.azure @@ -399,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.9.0 + 4.10.0 com.azure @@ -410,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.9.0 + 4.10.0 com.azure @@ -421,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.9.0 + 4.10.0 com.azure @@ -432,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.9.0 + 4.10.0 com.azure @@ -443,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.9.0 + 4.10.0 com.azure @@ -454,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.9.0 + 4.10.0 com.azure @@ -465,37 +465,37 @@ org.apache.camel camel-barcode - 4.9.0 + 4.10.0 org.apache.camel camel-base - 4.9.0 + 4.10.0 org.apache.camel camel-base-engine - 4.9.0 + 4.10.0 org.apache.camel camel-base64 - 4.9.0 + 4.10.0 org.apache.camel camel-bean - 4.9.0 + 4.10.0 org.apache.camel camel-bean-validator - 4.9.0 + 4.10.0 org.apache.camel camel-beanio - 4.9.0 + 4.10.0 jakarta.activation @@ -510,17 +510,17 @@ org.apache.camel camel-bindy - 4.9.0 + 4.10.0 org.apache.camel camel-bonita - 4.9.0 + 4.10.0 org.apache.camel camel-box - 4.9.0 + 4.10.0 commons-logging @@ -531,82 +531,78 @@ org.apache.camel camel-box-api - 4.9.0 + 4.10.0 org.apache.camel camel-braintree - 4.9.0 + 4.10.0 org.apache.camel camel-browse - 4.9.0 + 4.10.0 org.apache.camel camel-caffeine - 4.9.0 + 4.10.0 org.apache.camel camel-cassandraql - 4.9.0 + 4.10.0 - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations + org.apache.cassandra + * org.apache.camel camel-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-cbor - 4.9.0 + 4.10.0 org.apache.camel camel-chatscript - 4.9.0 + 4.10.0 org.apache.camel camel-chunk - 4.9.0 + 4.10.0 org.apache.camel camel-cli-connector - 4.9.0 + 4.10.0 org.apache.camel camel-cloud - 4.9.0 + 4.10.0 org.apache.camel camel-cloudevents - 4.9.0 + 4.10.0 org.apache.camel camel-cluster - 4.9.0 + 4.10.0 org.apache.camel camel-cm-sms - 4.9.0 + 4.10.0 commons-logging @@ -617,27 +613,27 @@ org.apache.camel camel-coap - 4.9.0 + 4.10.0 org.apache.camel camel-cometd - 4.9.0 + 4.10.0 org.apache.camel camel-componentdsl - 4.9.0 + 4.10.0 org.apache.camel camel-console - 4.9.0 + 4.10.0 org.apache.camel camel-consul - 4.9.0 + 4.10.0 org.checkerframework @@ -648,47 +644,47 @@ org.apache.camel camel-controlbus - 4.9.0 + 4.10.0 org.apache.camel camel-core-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-core-engine - 4.9.0 + 4.10.0 org.apache.camel camel-core-languages - 4.9.0 + 4.10.0 org.apache.camel camel-core-model - 4.9.0 + 4.10.0 org.apache.camel camel-core-processor - 4.9.0 + 4.10.0 org.apache.camel camel-core-reifier - 4.9.0 + 4.10.0 org.apache.camel camel-couchbase - 4.9.0 + 4.10.0 org.apache.camel camel-couchdb - 4.9.0 + 4.10.0 commons-logging @@ -699,12 +695,12 @@ org.apache.camel camel-cron - 4.9.0 + 4.10.0 org.apache.camel camel-crypto - 4.9.0 + 4.10.0 org.bouncycastle @@ -715,42 +711,42 @@ org.apache.camel camel-crypto-pgp - 4.9.0 + 4.10.0 org.apache.camel camel-csv - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-common - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-soap - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-transport - 4.9.0 + 4.10.0 org.apache.camel camel-dataformat - 4.9.0 + 4.10.0 org.apache.camel camel-dataset - 4.9.0 + 4.10.0 org.apache.camel camel-datasonnet - 4.9.0 + 4.10.0 ch.qos.logback @@ -781,7 +777,7 @@ org.apache.camel camel-debezium-common - 4.9.0 + 4.10.0 javax.ws.rs @@ -792,32 +788,32 @@ org.apache.camel camel-debezium-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-mysql - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-postgres - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-sqlserver - 4.9.0 + 4.10.0 org.apache.camel camel-debug - 4.9.0 + 4.10.0 org.apache.camel camel-digitalocean - 4.9.0 + 4.10.0 commons-logging @@ -828,17 +824,17 @@ org.apache.camel camel-direct - 4.9.0 + 4.10.0 org.apache.camel camel-disruptor - 4.9.0 + 4.10.0 org.apache.camel camel-djl - 4.9.0 + 4.10.0 org.checkerframework @@ -849,12 +845,12 @@ org.apache.camel camel-dns - 4.9.0 + 4.10.0 org.apache.camel camel-drill - 4.9.0 + 4.10.0 ch.qos.logback @@ -881,7 +877,7 @@ org.apache.camel camel-dropbox - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -892,22 +888,22 @@ org.apache.camel camel-dsl-modeline - 4.9.0 + 4.10.0 org.apache.camel camel-dsl-support - 4.9.0 + 4.10.0 org.apache.camel camel-ehcache - 4.9.0 + 4.10.0 org.apache.camel camel-elasticsearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -922,7 +918,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.9.0 + 4.10.0 commons-logging @@ -933,7 +929,7 @@ org.apache.camel camel-endpointdsl - 4.9.0 + 4.10.0 com.sun.mail @@ -944,7 +940,7 @@ org.apache.camel camel-etcd3 - 4.9.0 + 4.10.0 com.google.android @@ -967,42 +963,42 @@ org.apache.camel camel-exec - 4.9.0 + 4.10.0 org.apache.camel camel-fastjson - 4.9.0 + 4.10.0 org.apache.camel camel-fhir - 4.9.0 + 4.10.0 org.apache.camel camel-fhir-api - 4.9.0 + 4.10.0 org.apache.camel camel-file - 4.9.0 + 4.10.0 org.apache.camel camel-file-watch - 4.9.0 + 4.10.0 org.apache.camel camel-flatpack - 4.9.0 + 4.10.0 org.apache.camel camel-flink - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -1013,7 +1009,7 @@ org.apache.camel camel-fop - 4.9.0 + 4.10.0 commons-logging @@ -1028,17 +1024,17 @@ org.apache.camel camel-freemarker - 4.9.0 + 4.10.0 org.apache.camel camel-ftp - 4.9.0 + 4.10.0 org.apache.camel camel-fury - 4.9.0 + 4.10.0 org.checkerframework @@ -1049,7 +1045,7 @@ org.apache.camel camel-geocoder - 4.9.0 + 4.10.0 commons-logging @@ -1060,17 +1056,17 @@ org.apache.camel camel-git - 4.9.0 + 4.10.0 org.apache.camel camel-github - 4.9.0 + 4.10.0 org.apache.camel camel-google-bigquery - 4.9.0 + 4.10.0 com.google.android @@ -1097,7 +1093,7 @@ org.apache.camel camel-google-calendar - 4.9.0 + 4.10.0 commons-logging @@ -1112,7 +1108,7 @@ org.apache.camel camel-google-drive - 4.9.0 + 4.10.0 commons-logging @@ -1127,7 +1123,7 @@ org.apache.camel camel-google-functions - 4.9.0 + 4.10.0 com.google.android @@ -1154,7 +1150,7 @@ org.apache.camel camel-google-mail - 4.9.0 + 4.10.0 commons-logging @@ -1169,7 +1165,7 @@ org.apache.camel camel-google-pubsub - 4.9.0 + 4.10.0 com.google.android @@ -1196,7 +1192,7 @@ org.apache.camel camel-google-secret-manager - 4.9.0 + 4.10.0 com.google.android @@ -1227,7 +1223,7 @@ org.apache.camel camel-google-sheets - 4.9.0 + 4.10.0 commons-logging @@ -1242,7 +1238,7 @@ org.apache.camel camel-google-storage - 4.9.0 + 4.10.0 com.google.android @@ -1269,7 +1265,7 @@ org.apache.camel camel-graphql - 4.9.0 + 4.10.0 commons-logging @@ -1280,17 +1276,17 @@ org.apache.camel camel-grok - 4.9.0 + 4.10.0 org.apache.camel camel-groovy - 4.9.0 + 4.10.0 org.apache.camel camel-grpc - 4.9.0 + 4.10.0 com.google.android @@ -1321,12 +1317,12 @@ org.apache.camel camel-gson - 4.9.0 + 4.10.0 org.apache.camel camel-guava-eventbus - 4.9.0 + 4.10.0 org.checkerframework @@ -1337,7 +1333,7 @@ org.apache.camel camel-hashicorp-vault - 4.9.0 + 4.10.0 org.springframework @@ -1356,12 +1352,12 @@ org.apache.camel camel-hazelcast - 4.9.0 + 4.10.0 org.apache.camel camel-headersmap - 4.9.0 + 4.10.0 ch.qos.logback @@ -1372,17 +1368,17 @@ org.apache.camel camel-health - 4.9.0 + 4.10.0 org.apache.camel camel-hl7 - 4.9.0 + 4.10.0 org.apache.camel camel-http - 4.9.0 + 4.10.0 commons-logging @@ -1393,27 +1389,27 @@ org.apache.camel camel-http-base - 4.9.0 + 4.10.0 org.apache.camel camel-http-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-smn - 4.9.0 + 4.10.0 org.apache.camel camel-ical - 4.9.0 + 4.10.0 commons-logging @@ -1424,7 +1420,7 @@ org.apache.camel camel-iec60870 - 4.9.0 + 4.10.0 org.checkerframework @@ -1435,12 +1431,12 @@ org.apache.camel camel-ignite - 4.9.0 + 4.10.0 org.apache.camel camel-infinispan - 4.9.0 + 4.10.0 org.infinispan @@ -1459,57 +1455,57 @@ org.apache.camel camel-infinispan-common - 4.9.0 + 4.10.0 org.apache.camel camel-influxdb - 4.9.0 + 4.10.0 org.apache.camel camel-irc - 4.9.0 + 4.10.0 org.apache.camel camel-jackson - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-avro - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-protobuf - 4.9.0 + 4.10.0 org.apache.camel camel-jacksonxml - 4.9.0 + 4.10.0 org.apache.camel camel-jasypt - 4.9.0 + 4.10.0 org.apache.camel camel-java-joor-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-javascript - 4.9.0 + 4.10.0 org.apache.camel camel-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -1520,12 +1516,12 @@ org.apache.camel camel-jcache - 4.9.0 + 4.10.0 org.apache.camel camel-jcr - 4.9.0 + 4.10.0 org.slf4j @@ -1536,27 +1532,27 @@ org.apache.camel camel-jdbc - 4.9.0 + 4.10.0 org.apache.camel camel-jfr - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups-raft - 4.9.0 + 4.10.0 org.apache.camel camel-jira - 4.9.0 + 4.10.0 commons-logging @@ -1575,7 +1571,7 @@ org.apache.camel camel-jms - 4.9.0 + 4.10.0 org.apache.camel @@ -1594,12 +1590,12 @@ org.apache.camel camel-jolt - 4.9.0 + 4.10.0 org.apache.camel camel-jooq - 4.9.0 + 4.10.0 org.springframework @@ -1610,12 +1606,12 @@ org.apache.camel camel-joor - 4.9.0 + 4.10.0 org.apache.camel camel-jpa - 4.9.0 + 4.10.0 org.apache.camel @@ -1630,7 +1626,7 @@ org.apache.camel camel-jq - 4.9.0 + 4.10.0 net.thisptr @@ -1645,82 +1641,82 @@ org.apache.camel camel-jsch - 4.9.0 + 4.10.0 org.apache.camel camel-jslt - 4.9.0 + 4.10.0 org.apache.camel camel-json-patch - 4.9.0 + 4.10.0 org.apache.camel camel-json-validator - 4.9.0 + 4.10.0 org.apache.camel camel-jsonapi - 4.9.0 + 4.10.0 org.apache.camel camel-jsonata - 4.9.0 + 4.10.0 org.apache.camel camel-jsonb - 4.9.0 + 4.10.0 org.apache.camel camel-jsonpath - 4.9.0 + 4.10.0 org.apache.camel camel-jt400 - 4.9.0 + 4.10.0 org.apache.camel camel-jta - 4.9.0 + 4.10.0 org.apache.camel camel-kafka - 4.9.0 + 4.10.0 org.apache.camel camel-kamelet - 4.9.0 + 4.10.0 org.apache.camel camel-knative - 4.9.0 + 4.10.0 org.apache.camel camel-knative-api - 4.9.0 + 4.10.0 org.apache.camel camel-knative-http - 4.9.0 + 4.10.0 org.apache.camel camel-kubernetes - 4.9.0 + 4.10.0 io.fabric8 @@ -1743,57 +1739,57 @@ org.apache.camel camel-kudu - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-chat - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-core - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-embeddings - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tokenizer - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tools - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-web-search - 4.9.0 + 4.10.0 org.apache.camel camel-language - 4.9.0 + 4.10.0 org.apache.camel camel-ldap - 4.9.0 + 4.10.0 org.apache.camel camel-ldif - 4.9.0 + 4.10.0 org.apache.camel camel-leveldb - 4.9.0 + 4.10.0 org.checkerframework @@ -1804,82 +1800,82 @@ org.apache.camel camel-log - 4.9.0 + 4.10.0 org.apache.camel camel-lra - 4.9.0 + 4.10.0 org.apache.camel camel-lucene - 4.9.0 + 4.10.0 org.apache.camel camel-lumberjack - 4.9.0 + 4.10.0 org.apache.camel camel-lzf - 4.9.0 + 4.10.0 org.apache.camel camel-mail - 4.9.0 + 4.10.0 org.apache.camel camel-mail-microsoft-oauth - 4.9.0 + 4.10.0 org.apache.camel camel-main - 4.9.0 + 4.10.0 org.apache.camel camel-management - 4.9.0 + 4.10.0 org.apache.camel camel-management-api - 4.9.0 + 4.10.0 org.apache.camel camel-mapstruct - 4.9.0 + 4.10.0 org.apache.camel camel-master - 4.9.0 + 4.10.0 org.apache.camel camel-micrometer - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-config - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-fault-tolerance - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-health - 4.9.0 + 4.10.0 org.eclipse.parsson @@ -1894,7 +1890,7 @@ org.apache.camel camel-milvus - 4.9.0 + 4.10.0 com.google.android @@ -1933,62 +1929,62 @@ org.apache.camel camel-minio - 4.9.0 + 4.10.0 org.apache.camel camel-mllp - 4.9.0 + 4.10.0 org.apache.camel camel-mock - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb-gridfs - 4.9.0 + 4.10.0 org.apache.camel camel-mustache - 4.9.0 + 4.10.0 org.apache.camel camel-mvel - 4.9.0 + 4.10.0 org.apache.camel camel-mybatis - 4.9.0 + 4.10.0 org.apache.camel camel-nats - 4.9.0 + 4.10.0 org.apache.camel camel-netty - 4.9.0 + 4.10.0 org.apache.camel camel-netty-http - 4.9.0 + 4.10.0 org.apache.camel camel-nitrite - 4.9.0 + 4.10.0 javax.validation @@ -1999,7 +1995,7 @@ org.apache.camel camel-oaipmh - 4.9.0 + 4.10.0 commons-logging @@ -2010,12 +2006,12 @@ org.apache.camel camel-ognl - 4.9.0 + 4.10.0 org.apache.camel camel-olingo4 - 4.9.0 + 4.10.0 commons-logging @@ -2026,7 +2022,7 @@ org.apache.camel camel-olingo4-api - 4.9.0 + 4.10.0 commons-logging @@ -2037,7 +2033,7 @@ org.apache.camel camel-openapi-java - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2052,7 +2048,7 @@ org.apache.camel camel-opensearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2067,7 +2063,7 @@ org.apache.camel camel-openstack - 4.9.0 + 4.10.0 com.github.fge @@ -2082,7 +2078,7 @@ org.apache.camel camel-opentelemetry - 4.9.0 + 4.10.0 io.grpc @@ -2093,7 +2089,7 @@ org.apache.camel camel-optaplanner - 4.9.0 + 4.10.0 org.optaplanner @@ -2112,17 +2108,17 @@ org.apache.camel camel-paho - 4.9.0 + 4.10.0 org.apache.camel camel-paho-mqtt5 - 4.9.0 + 4.10.0 org.apache.camel camel-pdf - 4.9.0 + 4.10.0 commons-logging @@ -2133,12 +2129,12 @@ org.apache.camel camel-pg-replication-slot - 4.9.0 + 4.10.0 org.apache.camel camel-pgevent - 4.9.0 + 4.10.0 org.testcontainers @@ -2149,7 +2145,7 @@ org.apache.camel camel-pinecone - 4.9.0 + 4.10.0 com.google.android @@ -2172,22 +2168,22 @@ org.apache.camel camel-platform-http - 4.9.0 + 4.10.0 org.apache.camel camel-platform-http-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-printer - 4.9.0 + 4.10.0 org.apache.camel camel-protobuf - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2198,12 +2194,12 @@ org.apache.camel camel-pubnub - 4.9.0 + 4.10.0 org.apache.camel camel-pulsar - 4.9.0 + 4.10.0 com.sun.activation @@ -2238,7 +2234,7 @@ org.apache.camel camel-qdrant - 4.9.0 + 4.10.0 com.google.android @@ -2261,7 +2257,7 @@ org.apache.camel camel-quartz - 4.9.0 + 4.10.0 jakarta.activation @@ -2284,37 +2280,37 @@ org.apache.camel camel-quickfix - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-executor-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-streams - 4.9.0 + 4.10.0 org.apache.camel camel-redis - 4.9.0 + 4.10.0 org.apache.camel camel-ref - 4.9.0 + 4.10.0 org.apache.camel camel-rest - 4.9.0 + 4.10.0 org.apache.camel camel-rest-openapi - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2329,22 +2325,22 @@ org.apache.camel camel-robotframework - 4.9.0 + 4.10.0 org.apache.camel camel-rss - 4.9.0 + 4.10.0 org.apache.camel camel-saga - 4.9.0 + 4.10.0 org.apache.camel camel-salesforce - 4.9.0 + 4.10.0 com.google.android @@ -2371,12 +2367,12 @@ org.apache.camel camel-sap-netweaver - 4.9.0 + 4.10.0 org.apache.camel camel-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2387,12 +2383,12 @@ org.apache.camel camel-scheduler - 4.9.0 + 4.10.0 org.apache.camel camel-schematron - 4.9.0 + 4.10.0 xml-apis @@ -2403,42 +2399,42 @@ org.apache.camel camel-seda - 4.9.0 + 4.10.0 org.apache.camel camel-servicenow - 4.9.0 + 4.10.0 org.apache.camel camel-servlet - 4.9.0 + 4.10.0 org.apache.camel camel-shiro - 4.9.0 + 4.10.0 org.apache.camel camel-sjms - 4.9.0 + 4.10.0 org.apache.camel camel-sjms2 - 4.9.0 + 4.10.0 org.apache.camel camel-slack - 4.9.0 + 4.10.0 org.apache.camel camel-smb - 4.9.0 + 4.10.0 junit @@ -2449,7 +2445,7 @@ org.apache.camel camel-smooks - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2464,22 +2460,22 @@ org.apache.camel camel-smpp - 4.9.0 + 4.10.0 org.apache.camel camel-snakeyaml - 4.9.0 + 4.10.0 org.apache.camel camel-snmp - 4.9.0 + 4.10.0 org.apache.camel camel-soap - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2494,12 +2490,12 @@ org.apache.camel camel-splunk - 4.9.0 + 4.10.0 org.apache.camel camel-splunk-hec - 4.9.0 + 4.10.0 commons-logging @@ -2510,7 +2506,7 @@ org.apache.camel camel-spring-rabbitmq - 4.9.0 + 4.10.0 org.springframework @@ -2525,17 +2521,17 @@ org.apache.camel camel-spring-redis - 4.9.0 + 4.10.0 org.apache.camel camel-sql - 4.9.0 + 4.10.0 org.apache.camel camel-ssh - 4.9.0 + 4.10.0 org.slf4j @@ -2546,42 +2542,42 @@ org.apache.camel camel-stax - 4.9.0 + 4.10.0 org.apache.camel camel-stitch - 4.9.0 + 4.10.0 org.apache.camel camel-stomp - 4.9.0 + 4.10.0 org.apache.camel camel-stream - 4.9.0 + 4.10.0 org.apache.camel camel-stringtemplate - 4.9.0 + 4.10.0 org.apache.camel camel-stub - 4.9.0 + 4.10.0 org.apache.camel camel-support - 4.9.0 + 4.10.0 org.apache.camel camel-swift - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2592,22 +2588,22 @@ org.apache.camel camel-syslog - 4.9.0 + 4.10.0 org.apache.camel camel-tarfile - 4.9.0 + 4.10.0 org.apache.camel camel-telegram - 4.9.0 + 4.10.0 org.apache.camel camel-test-junit5 - 4.9.0 + 4.10.0 org.apache.camel @@ -2618,42 +2614,42 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-thrift - 4.9.0 + 4.10.0 org.apache.camel camel-tika - 4.9.0 + 4.10.0 org.apache.camel camel-timer - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-model - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-util - 4.9.0 + 4.10.0 org.apache.camel camel-tracing - 4.9.0 + 4.10.0 org.apache.camel camel-twilio - 4.9.0 + 4.10.0 commons-logging @@ -2672,62 +2668,62 @@ org.apache.camel camel-twitter - 4.9.0 + 4.10.0 org.apache.camel camel-univocity-parsers - 4.9.0 + 4.10.0 org.apache.camel camel-util - 4.9.0 + 4.10.0 org.apache.camel camel-util-json - 4.9.0 + 4.10.0 org.apache.camel camel-validator - 4.9.0 + 4.10.0 org.apache.camel camel-velocity - 4.9.0 + 4.10.0 org.apache.camel camel-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-common - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-http - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-websocket - 4.9.0 + 4.10.0 org.apache.camel camel-wasm - 4.9.0 + 4.10.0 org.apache.camel camel-weather - 4.9.0 + 4.10.0 commons-logging @@ -2738,17 +2734,17 @@ org.apache.camel camel-web3j - 4.9.0 + 4.10.0 org.apache.camel camel-webhook - 4.9.0 + 4.10.0 org.apache.camel camel-wordpress - 4.9.0 + 4.10.0 org.checkerframework @@ -2759,7 +2755,7 @@ org.apache.camel camel-workday - 4.9.0 + 4.10.0 commons-logging @@ -2770,7 +2766,7 @@ org.apache.camel camel-xchange - 4.9.0 + 4.10.0 org.checkerframework @@ -2781,27 +2777,27 @@ org.apache.camel camel-xj - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-util - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2816,37 +2812,37 @@ org.apache.camel camel-xml-jaxp - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxp-util - 4.9.0 + 4.10.0 org.apache.camel camel-xmlsecurity - 4.9.0 + 4.10.0 org.apache.camel camel-xmpp - 4.9.0 + 4.10.0 org.apache.camel camel-xpath - 4.9.0 + 4.10.0 org.apache.camel camel-xslt - 4.9.0 + 4.10.0 org.apache.camel camel-xslt-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2857,42 +2853,42 @@ org.apache.camel camel-yaml-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-common - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-deserializers - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-io - 4.9.0 + 4.10.0 org.apache.camel camel-zendesk - 4.9.0 + 4.10.0 org.apache.camel camel-zip-deflater - 4.9.0 + 4.10.0 org.apache.camel camel-zipfile - 4.9.0 + 4.10.0 org.apache.camel camel-zookeeper - 4.9.0 + 4.10.0 org.checkerframework @@ -2903,7 +2899,7 @@ org.apache.camel camel-zookeeper-master - 4.9.0 + 4.10.0 org.checkerframework @@ -6344,52 +6340,52 @@ ca.uhn.hapi hapi-base - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v21 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v22 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v23 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v231 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v24 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v25 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v251 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v26 - 2.5.1 + 2.6.0 ca.uhn.hapi.fhir hapi-fhir-base - 7.6.0 + 7.6.1 com.google.code.findbugs @@ -6408,12 +6404,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.6.0 + 7.6.1 junit @@ -6428,22 +6424,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir @@ -6480,6 +6476,25 @@ azure-core-http-vertx 1.0.0 + + com.datastax.oss + java-driver-query-builder + 4.15.0 + + + com.github.spotbugs + spotbugs-annotations + + + com.github.stephenc.jcip + jcip-annotations + + + com.google.code.findbugs + jsr305 + + + com.esotericsoftware.kryo kryo @@ -6514,17 +6529,17 @@ com.github.mwiede jsch - 0.2.21 + 0.2.23 com.google.auth google-auth-library-credentials - 1.29.0 + 1.31.0 com.google.auth google-auth-library-oauth2-http - 1.29.0 + 1.31.0 com.google.code.findbugs @@ -6535,7 +6550,7 @@ com.google.cloud google-cloud-pubsub - 1.134.1 + 1.136.1 com.google.android @@ -6566,7 +6581,7 @@ com.google.oauth-client google-oauth-client - 1.36.0 + 1.37.0 commons-logging @@ -6741,12 +6756,12 @@ io.projectreactor reactor-core - 3.4.38 + 3.4.41 io.projectreactor.netty reactor-netty - 1.2.0 + 1.2.2 io.quarkiverse.freemarker @@ -6807,12 +6822,12 @@ io.quarkiverse.jsch quarkus-jsch - 3.0.12 + 3.0.13 io.quarkiverse.jsch quarkus-jsch-deployment - 3.0.12 + 3.0.13 io.quarkiverse.langchain4j @@ -6922,7 +6937,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.24 + 2.1.25 com.google.code.findbugs @@ -6954,7 +6969,7 @@ joda-time joda-time - 2.13.0 + 2.13.1 net.i2p.crypto @@ -6964,7 +6979,7 @@ net.java.dev.jna jna-platform - 5.6.0 + 5.13.0 net.minidev @@ -7020,7 +7035,7 @@ org.apache.kudu kudu-client - 1.17.0 + 1.17.1 com.google.code.findbugs @@ -7035,7 +7050,7 @@ org.apache.pdfbox fontbox - 3.0.3 + 3.0.4 commons-logging @@ -7157,7 +7172,7 @@ org.kiwiproject consul-client - 1.4.2 + 1.5.0 com.google.code.findbugs @@ -7212,12 +7227,12 @@ org.snakeyaml snakeyaml-engine - 2.8 + 2.9 org.springframework spring-aop - 6.2.0 + 6.2.2 org.springframework @@ -7232,7 +7247,7 @@ org.springframework spring-expression - 6.2.0 + 6.2.2 org.springframework @@ -7243,7 +7258,7 @@ org.springframework spring-jdbc - 6.2.0 + 6.2.2 org.springframework @@ -7258,7 +7273,7 @@ org.springframework spring-jms - 6.2.0 + 6.2.2 org.springframework @@ -7273,7 +7288,7 @@ org.springframework spring-messaging - 6.2.0 + 6.2.2 org.springframework @@ -7288,7 +7303,7 @@ org.springframework spring-tx - 6.2.0 + 6.2.2 org.springframework @@ -7303,7 +7318,7 @@ org.springframework spring-web - 6.2.0 + 6.2.2 org.springframework @@ -7322,7 +7337,7 @@ org.springframework.data spring-data-redis - 3.4.0 + 3.4.2 org.springframework @@ -8213,92 +8228,92 @@ org.eclipse.jetty jetty-alpn-client - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-client - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-http - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-io - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-security - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-server - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-session - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-util - 12.0.15 + 12.0.16 org.eclipse.jetty jetty-util-ajax - 12.0.15 + 12.0.16 org.eclipse.jetty.websocket jetty-websocket-core-common - 12.0.15 + 12.0.16 org.eclipse.jetty.websocket jetty-websocket-core-server - 12.0.15 + 12.0.16 org.eclipse.jetty.websocket jetty-websocket-jetty-api - 12.0.15 + 12.0.16 org.eclipse.jetty.websocket jetty-websocket-jetty-common - 12.0.15 + 12.0.16 org.eclipse.jetty.websocket jetty-websocket-jetty-server - 12.0.15 + 12.0.16 com.azure azure-core - 1.53.0 + 1.54.1 com.azure azure-core-amqp - 2.9.10 + 2.9.12 com.azure azure-cosmos - 4.64.0 + 4.66.0 com.azure azure-identity - 1.14.0 + 1.15.0 com.azure @@ -8308,47 +8323,47 @@ com.azure azure-messaging-eventhubs - 5.19.1 + 5.20.0 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.20.1 + 1.20.2 com.azure azure-messaging-servicebus - 7.17.5 + 7.17.8 com.azure azure-security-keyvault-secrets - 4.9.0 + 4.9.2 com.azure azure-storage-blob - 12.28.1 + 12.29.0 com.azure azure-storage-common - 12.27.1 + 12.28.0 com.azure azure-storage-file-datalake - 12.21.0 + 12.22.0 com.azure azure-storage-internal-avro - 12.13.0 + 12.14.0 com.azure azure-storage-queue - 12.23.0 + 12.24.0 com.azure @@ -8392,25 +8407,6 @@ cassandra-quarkus-client-deployment 1.2.0 - - com.datastax.oss - java-driver-query-builder - 4.15.0 - - - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations - - - com.google.code.findbugs - jsr305 - - - com.datastax.oss native-protocol diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 03a39e847fd4..ae918b15e630 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.9.0 + 4.10.0 org.apache.camel camel-amqp - 4.9.0 + 4.10.0 org.apache.camel camel-api - 4.9.0 + 4.10.0 org.apache.camel camel-arangodb - 4.9.0 + 4.10.0 org.apache.camel camel-as2 - 4.9.0 + 4.10.0 org.apache.camel camel-as2-api - 4.9.0 + 4.10.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.9.0 + 4.10.0 org.apache.camel camel-asterisk - 4.9.0 + 4.10.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.9.0 + 4.10.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.9.0 + 4.10.0 org.apache.camel camel-avro - 4.9.0 + 4.10.0 org.apache.camel camel-aws-bedrock - 4.9.0 + 4.10.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.9.0 + 4.10.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.9.0 + 4.10.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.9.0 + 4.10.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.9.0 + 4.10.0 commons-logging @@ -185,7 +185,7 @@ org.apache.camel camel-aws2-ddb - 4.9.0 + 4.10.0 commons-logging @@ -200,7 +200,7 @@ org.apache.camel camel-aws2-ec2 - 4.9.0 + 4.10.0 commons-logging @@ -211,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.9.0 + 4.10.0 commons-logging @@ -222,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.9.0 + 4.10.0 commons-logging @@ -233,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.9.0 + 4.10.0 commons-logging @@ -244,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.9.0 + 4.10.0 commons-logging @@ -255,7 +255,7 @@ org.apache.camel camel-aws2-kinesis - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -278,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.9.0 + 4.10.0 commons-logging @@ -289,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.9.0 + 4.10.0 commons-logging @@ -300,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.9.0 + 4.10.0 commons-logging @@ -311,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.9.0 + 4.10.0 commons-logging @@ -322,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.9.0 + 4.10.0 commons-logging @@ -333,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.9.0 + 4.10.0 commons-logging @@ -344,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.9.0 + 4.10.0 commons-logging @@ -355,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.9.0 + 4.10.0 commons-logging @@ -366,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.9.0 + 4.10.0 commons-logging @@ -377,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.9.0 + 4.10.0 commons-logging @@ -388,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.9.0 + 4.10.0 com.azure @@ -399,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.9.0 + 4.10.0 com.azure @@ -410,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.9.0 + 4.10.0 com.azure @@ -421,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.9.0 + 4.10.0 com.azure @@ -432,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.9.0 + 4.10.0 com.azure @@ -443,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.9.0 + 4.10.0 com.azure @@ -454,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.9.0 + 4.10.0 com.azure @@ -465,37 +465,37 @@ org.apache.camel camel-barcode - 4.9.0 + 4.10.0 org.apache.camel camel-base - 4.9.0 + 4.10.0 org.apache.camel camel-base-engine - 4.9.0 + 4.10.0 org.apache.camel camel-base64 - 4.9.0 + 4.10.0 org.apache.camel camel-bean - 4.9.0 + 4.10.0 org.apache.camel camel-bean-validator - 4.9.0 + 4.10.0 org.apache.camel camel-beanio - 4.9.0 + 4.10.0 jakarta.activation @@ -510,17 +510,17 @@ org.apache.camel camel-bindy - 4.9.0 + 4.10.0 org.apache.camel camel-bonita - 4.9.0 + 4.10.0 org.apache.camel camel-box - 4.9.0 + 4.10.0 commons-logging @@ -531,82 +531,78 @@ org.apache.camel camel-box-api - 4.9.0 + 4.10.0 org.apache.camel camel-braintree - 4.9.0 + 4.10.0 org.apache.camel camel-browse - 4.9.0 + 4.10.0 org.apache.camel camel-caffeine - 4.9.0 + 4.10.0 org.apache.camel camel-cassandraql - 4.9.0 + 4.10.0 - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations + org.apache.cassandra + * org.apache.camel camel-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-cbor - 4.9.0 + 4.10.0 org.apache.camel camel-chatscript - 4.9.0 + 4.10.0 org.apache.camel camel-chunk - 4.9.0 + 4.10.0 org.apache.camel camel-cli-connector - 4.9.0 + 4.10.0 org.apache.camel camel-cloud - 4.9.0 + 4.10.0 org.apache.camel camel-cloudevents - 4.9.0 + 4.10.0 org.apache.camel camel-cluster - 4.9.0 + 4.10.0 org.apache.camel camel-cm-sms - 4.9.0 + 4.10.0 commons-logging @@ -617,27 +613,27 @@ org.apache.camel camel-coap - 4.9.0 + 4.10.0 org.apache.camel camel-cometd - 4.9.0 + 4.10.0 org.apache.camel camel-componentdsl - 4.9.0 + 4.10.0 org.apache.camel camel-console - 4.9.0 + 4.10.0 org.apache.camel camel-consul - 4.9.0 + 4.10.0 org.checkerframework @@ -648,47 +644,47 @@ org.apache.camel camel-controlbus - 4.9.0 + 4.10.0 org.apache.camel camel-core-catalog - 4.9.0 + 4.10.0 org.apache.camel camel-core-engine - 4.9.0 + 4.10.0 org.apache.camel camel-core-languages - 4.9.0 + 4.10.0 org.apache.camel camel-core-model - 4.9.0 + 4.10.0 org.apache.camel camel-core-processor - 4.9.0 + 4.10.0 org.apache.camel camel-core-reifier - 4.9.0 + 4.10.0 org.apache.camel camel-couchbase - 4.9.0 + 4.10.0 org.apache.camel camel-couchdb - 4.9.0 + 4.10.0 commons-logging @@ -699,12 +695,12 @@ org.apache.camel camel-cron - 4.9.0 + 4.10.0 org.apache.camel camel-crypto - 4.9.0 + 4.10.0 org.bouncycastle @@ -715,42 +711,42 @@ org.apache.camel camel-crypto-pgp - 4.9.0 + 4.10.0 org.apache.camel camel-csv - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-common - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-soap - 4.9.0 + 4.10.0 org.apache.camel camel-cxf-transport - 4.9.0 + 4.10.0 org.apache.camel camel-dataformat - 4.9.0 + 4.10.0 org.apache.camel camel-dataset - 4.9.0 + 4.10.0 org.apache.camel camel-datasonnet - 4.9.0 + 4.10.0 ch.qos.logback @@ -781,7 +777,7 @@ org.apache.camel camel-debezium-common - 4.9.0 + 4.10.0 javax.ws.rs @@ -792,32 +788,32 @@ org.apache.camel camel-debezium-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-mysql - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-postgres - 4.9.0 + 4.10.0 org.apache.camel camel-debezium-sqlserver - 4.9.0 + 4.10.0 org.apache.camel camel-debug - 4.9.0 + 4.10.0 org.apache.camel camel-digitalocean - 4.9.0 + 4.10.0 commons-logging @@ -828,17 +824,17 @@ org.apache.camel camel-direct - 4.9.0 + 4.10.0 org.apache.camel camel-disruptor - 4.9.0 + 4.10.0 org.apache.camel camel-djl - 4.9.0 + 4.10.0 org.checkerframework @@ -849,12 +845,12 @@ org.apache.camel camel-dns - 4.9.0 + 4.10.0 org.apache.camel camel-drill - 4.9.0 + 4.10.0 ch.qos.logback @@ -881,7 +877,7 @@ org.apache.camel camel-dropbox - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -892,22 +888,22 @@ org.apache.camel camel-dsl-modeline - 4.9.0 + 4.10.0 org.apache.camel camel-dsl-support - 4.9.0 + 4.10.0 org.apache.camel camel-ehcache - 4.9.0 + 4.10.0 org.apache.camel camel-elasticsearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -922,7 +918,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.9.0 + 4.10.0 commons-logging @@ -933,7 +929,7 @@ org.apache.camel camel-endpointdsl - 4.9.0 + 4.10.0 com.sun.mail @@ -944,7 +940,7 @@ org.apache.camel camel-etcd3 - 4.9.0 + 4.10.0 com.google.android @@ -967,42 +963,42 @@ org.apache.camel camel-exec - 4.9.0 + 4.10.0 org.apache.camel camel-fastjson - 4.9.0 + 4.10.0 org.apache.camel camel-fhir - 4.9.0 + 4.10.0 org.apache.camel camel-fhir-api - 4.9.0 + 4.10.0 org.apache.camel camel-file - 4.9.0 + 4.10.0 org.apache.camel camel-file-watch - 4.9.0 + 4.10.0 org.apache.camel camel-flatpack - 4.9.0 + 4.10.0 org.apache.camel camel-flink - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -1013,7 +1009,7 @@ org.apache.camel camel-fop - 4.9.0 + 4.10.0 commons-logging @@ -1028,17 +1024,17 @@ org.apache.camel camel-freemarker - 4.9.0 + 4.10.0 org.apache.camel camel-ftp - 4.9.0 + 4.10.0 org.apache.camel camel-fury - 4.9.0 + 4.10.0 org.checkerframework @@ -1049,7 +1045,7 @@ org.apache.camel camel-geocoder - 4.9.0 + 4.10.0 commons-logging @@ -1060,17 +1056,17 @@ org.apache.camel camel-git - 4.9.0 + 4.10.0 org.apache.camel camel-github - 4.9.0 + 4.10.0 org.apache.camel camel-google-bigquery - 4.9.0 + 4.10.0 com.google.android @@ -1097,7 +1093,7 @@ org.apache.camel camel-google-calendar - 4.9.0 + 4.10.0 commons-logging @@ -1112,7 +1108,7 @@ org.apache.camel camel-google-drive - 4.9.0 + 4.10.0 commons-logging @@ -1127,7 +1123,7 @@ org.apache.camel camel-google-functions - 4.9.0 + 4.10.0 com.google.android @@ -1154,7 +1150,7 @@ org.apache.camel camel-google-mail - 4.9.0 + 4.10.0 commons-logging @@ -1169,7 +1165,7 @@ org.apache.camel camel-google-pubsub - 4.9.0 + 4.10.0 com.google.android @@ -1196,7 +1192,7 @@ org.apache.camel camel-google-secret-manager - 4.9.0 + 4.10.0 com.google.android @@ -1227,7 +1223,7 @@ org.apache.camel camel-google-sheets - 4.9.0 + 4.10.0 commons-logging @@ -1242,7 +1238,7 @@ org.apache.camel camel-google-storage - 4.9.0 + 4.10.0 com.google.android @@ -1269,7 +1265,7 @@ org.apache.camel camel-graphql - 4.9.0 + 4.10.0 commons-logging @@ -1280,17 +1276,17 @@ org.apache.camel camel-grok - 4.9.0 + 4.10.0 org.apache.camel camel-groovy - 4.9.0 + 4.10.0 org.apache.camel camel-grpc - 4.9.0 + 4.10.0 com.google.android @@ -1321,12 +1317,12 @@ org.apache.camel camel-gson - 4.9.0 + 4.10.0 org.apache.camel camel-guava-eventbus - 4.9.0 + 4.10.0 org.checkerframework @@ -1337,7 +1333,7 @@ org.apache.camel camel-hashicorp-vault - 4.9.0 + 4.10.0 org.springframework @@ -1356,12 +1352,12 @@ org.apache.camel camel-hazelcast - 4.9.0 + 4.10.0 org.apache.camel camel-headersmap - 4.9.0 + 4.10.0 ch.qos.logback @@ -1372,17 +1368,17 @@ org.apache.camel camel-health - 4.9.0 + 4.10.0 org.apache.camel camel-hl7 - 4.9.0 + 4.10.0 org.apache.camel camel-http - 4.9.0 + 4.10.0 commons-logging @@ -1393,27 +1389,27 @@ org.apache.camel camel-http-base - 4.9.0 + 4.10.0 org.apache.camel camel-http-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-common - 4.9.0 + 4.10.0 org.apache.camel camel-huaweicloud-smn - 4.9.0 + 4.10.0 org.apache.camel camel-ical - 4.9.0 + 4.10.0 commons-logging @@ -1424,7 +1420,7 @@ org.apache.camel camel-iec60870 - 4.9.0 + 4.10.0 org.checkerframework @@ -1435,12 +1431,12 @@ org.apache.camel camel-ignite - 4.9.0 + 4.10.0 org.apache.camel camel-infinispan - 4.9.0 + 4.10.0 org.infinispan @@ -1459,57 +1455,57 @@ org.apache.camel camel-infinispan-common - 4.9.0 + 4.10.0 org.apache.camel camel-influxdb - 4.9.0 + 4.10.0 org.apache.camel camel-irc - 4.9.0 + 4.10.0 org.apache.camel camel-jackson - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-avro - 4.9.0 + 4.10.0 org.apache.camel camel-jackson-protobuf - 4.9.0 + 4.10.0 org.apache.camel camel-jacksonxml - 4.9.0 + 4.10.0 org.apache.camel camel-jasypt - 4.9.0 + 4.10.0 org.apache.camel camel-java-joor-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-javascript - 4.9.0 + 4.10.0 org.apache.camel camel-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -1520,12 +1516,12 @@ org.apache.camel camel-jcache - 4.9.0 + 4.10.0 org.apache.camel camel-jcr - 4.9.0 + 4.10.0 org.slf4j @@ -1536,27 +1532,27 @@ org.apache.camel camel-jdbc - 4.9.0 + 4.10.0 org.apache.camel camel-jfr - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups - 4.9.0 + 4.10.0 org.apache.camel camel-jgroups-raft - 4.9.0 + 4.10.0 org.apache.camel camel-jira - 4.9.0 + 4.10.0 commons-logging @@ -1575,7 +1571,7 @@ org.apache.camel camel-jms - 4.9.0 + 4.10.0 org.apache.camel @@ -1594,12 +1590,12 @@ org.apache.camel camel-jolt - 4.9.0 + 4.10.0 org.apache.camel camel-jooq - 4.9.0 + 4.10.0 org.springframework @@ -1610,12 +1606,12 @@ org.apache.camel camel-joor - 4.9.0 + 4.10.0 org.apache.camel camel-jpa - 4.9.0 + 4.10.0 org.apache.camel @@ -1630,7 +1626,7 @@ org.apache.camel camel-jq - 4.9.0 + 4.10.0 net.thisptr @@ -1645,82 +1641,82 @@ org.apache.camel camel-jsch - 4.9.0 + 4.10.0 org.apache.camel camel-jslt - 4.9.0 + 4.10.0 org.apache.camel camel-json-patch - 4.9.0 + 4.10.0 org.apache.camel camel-json-validator - 4.9.0 + 4.10.0 org.apache.camel camel-jsonapi - 4.9.0 + 4.10.0 org.apache.camel camel-jsonata - 4.9.0 + 4.10.0 org.apache.camel camel-jsonb - 4.9.0 + 4.10.0 org.apache.camel camel-jsonpath - 4.9.0 + 4.10.0 org.apache.camel camel-jt400 - 4.9.0 + 4.10.0 org.apache.camel camel-jta - 4.9.0 + 4.10.0 org.apache.camel camel-kafka - 4.9.0 + 4.10.0 org.apache.camel camel-kamelet - 4.9.0 + 4.10.0 org.apache.camel camel-knative - 4.9.0 + 4.10.0 org.apache.camel camel-knative-api - 4.9.0 + 4.10.0 org.apache.camel camel-knative-http - 4.9.0 + 4.10.0 org.apache.camel camel-kubernetes - 4.9.0 + 4.10.0 io.fabric8 @@ -1743,57 +1739,57 @@ org.apache.camel camel-kudu - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-chat - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-core - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-embeddings - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tokenizer - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-tools - 4.9.0 + 4.10.0 org.apache.camel camel-langchain4j-web-search - 4.9.0 + 4.10.0 org.apache.camel camel-language - 4.9.0 + 4.10.0 org.apache.camel camel-ldap - 4.9.0 + 4.10.0 org.apache.camel camel-ldif - 4.9.0 + 4.10.0 org.apache.camel camel-leveldb - 4.9.0 + 4.10.0 org.checkerframework @@ -1804,82 +1800,82 @@ org.apache.camel camel-log - 4.9.0 + 4.10.0 org.apache.camel camel-lra - 4.9.0 + 4.10.0 org.apache.camel camel-lucene - 4.9.0 + 4.10.0 org.apache.camel camel-lumberjack - 4.9.0 + 4.10.0 org.apache.camel camel-lzf - 4.9.0 + 4.10.0 org.apache.camel camel-mail - 4.9.0 + 4.10.0 org.apache.camel camel-mail-microsoft-oauth - 4.9.0 + 4.10.0 org.apache.camel camel-main - 4.9.0 + 4.10.0 org.apache.camel camel-management - 4.9.0 + 4.10.0 org.apache.camel camel-management-api - 4.9.0 + 4.10.0 org.apache.camel camel-mapstruct - 4.9.0 + 4.10.0 org.apache.camel camel-master - 4.9.0 + 4.10.0 org.apache.camel camel-micrometer - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-config - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-fault-tolerance - 4.9.0 + 4.10.0 org.apache.camel camel-microprofile-health - 4.9.0 + 4.10.0 org.eclipse.parsson @@ -1894,7 +1890,7 @@ org.apache.camel camel-milvus - 4.9.0 + 4.10.0 com.google.android @@ -1933,62 +1929,62 @@ org.apache.camel camel-minio - 4.9.0 + 4.10.0 org.apache.camel camel-mllp - 4.9.0 + 4.10.0 org.apache.camel camel-mock - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb - 4.9.0 + 4.10.0 org.apache.camel camel-mongodb-gridfs - 4.9.0 + 4.10.0 org.apache.camel camel-mustache - 4.9.0 + 4.10.0 org.apache.camel camel-mvel - 4.9.0 + 4.10.0 org.apache.camel camel-mybatis - 4.9.0 + 4.10.0 org.apache.camel camel-nats - 4.9.0 + 4.10.0 org.apache.camel camel-netty - 4.9.0 + 4.10.0 org.apache.camel camel-netty-http - 4.9.0 + 4.10.0 org.apache.camel camel-nitrite - 4.9.0 + 4.10.0 javax.validation @@ -1999,7 +1995,7 @@ org.apache.camel camel-oaipmh - 4.9.0 + 4.10.0 commons-logging @@ -2010,12 +2006,12 @@ org.apache.camel camel-ognl - 4.9.0 + 4.10.0 org.apache.camel camel-olingo4 - 4.9.0 + 4.10.0 commons-logging @@ -2026,7 +2022,7 @@ org.apache.camel camel-olingo4-api - 4.9.0 + 4.10.0 commons-logging @@ -2037,7 +2033,7 @@ org.apache.camel camel-openapi-java - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2052,7 +2048,7 @@ org.apache.camel camel-opensearch - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2067,7 +2063,7 @@ org.apache.camel camel-openstack - 4.9.0 + 4.10.0 com.github.fge @@ -2082,7 +2078,7 @@ org.apache.camel camel-opentelemetry - 4.9.0 + 4.10.0 io.grpc @@ -2093,7 +2089,7 @@ org.apache.camel camel-optaplanner - 4.9.0 + 4.10.0 org.optaplanner @@ -2112,17 +2108,17 @@ org.apache.camel camel-paho - 4.9.0 + 4.10.0 org.apache.camel camel-paho-mqtt5 - 4.9.0 + 4.10.0 org.apache.camel camel-pdf - 4.9.0 + 4.10.0 commons-logging @@ -2133,12 +2129,12 @@ org.apache.camel camel-pg-replication-slot - 4.9.0 + 4.10.0 org.apache.camel camel-pgevent - 4.9.0 + 4.10.0 org.testcontainers @@ -2149,7 +2145,7 @@ org.apache.camel camel-pinecone - 4.9.0 + 4.10.0 com.google.android @@ -2172,22 +2168,22 @@ org.apache.camel camel-platform-http - 4.9.0 + 4.10.0 org.apache.camel camel-platform-http-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-printer - 4.9.0 + 4.10.0 org.apache.camel camel-protobuf - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2198,12 +2194,12 @@ org.apache.camel camel-pubnub - 4.9.0 + 4.10.0 org.apache.camel camel-pulsar - 4.9.0 + 4.10.0 com.sun.activation @@ -2238,7 +2234,7 @@ org.apache.camel camel-qdrant - 4.9.0 + 4.10.0 com.google.android @@ -2261,7 +2257,7 @@ org.apache.camel camel-quartz - 4.9.0 + 4.10.0 jakarta.activation @@ -2284,37 +2280,37 @@ org.apache.camel camel-quickfix - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-executor-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-reactive-streams - 4.9.0 + 4.10.0 org.apache.camel camel-redis - 4.9.0 + 4.10.0 org.apache.camel camel-ref - 4.9.0 + 4.10.0 org.apache.camel camel-rest - 4.9.0 + 4.10.0 org.apache.camel camel-rest-openapi - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2329,22 +2325,22 @@ org.apache.camel camel-robotframework - 4.9.0 + 4.10.0 org.apache.camel camel-rss - 4.9.0 + 4.10.0 org.apache.camel camel-saga - 4.9.0 + 4.10.0 org.apache.camel camel-salesforce - 4.9.0 + 4.10.0 com.google.android @@ -2371,12 +2367,12 @@ org.apache.camel camel-sap-netweaver - 4.9.0 + 4.10.0 org.apache.camel camel-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2387,12 +2383,12 @@ org.apache.camel camel-scheduler - 4.9.0 + 4.10.0 org.apache.camel camel-schematron - 4.9.0 + 4.10.0 xml-apis @@ -2403,42 +2399,42 @@ org.apache.camel camel-seda - 4.9.0 + 4.10.0 org.apache.camel camel-servicenow - 4.9.0 + 4.10.0 org.apache.camel camel-servlet - 4.9.0 + 4.10.0 org.apache.camel camel-shiro - 4.9.0 + 4.10.0 org.apache.camel camel-sjms - 4.9.0 + 4.10.0 org.apache.camel camel-sjms2 - 4.9.0 + 4.10.0 org.apache.camel camel-slack - 4.9.0 + 4.10.0 org.apache.camel camel-smb - 4.9.0 + 4.10.0 junit @@ -2449,7 +2445,7 @@ org.apache.camel camel-smooks - 4.9.0 + 4.10.0 com.google.code.findbugs @@ -2464,22 +2460,22 @@ org.apache.camel camel-smpp - 4.9.0 + 4.10.0 org.apache.camel camel-snakeyaml - 4.9.0 + 4.10.0 org.apache.camel camel-snmp - 4.9.0 + 4.10.0 org.apache.camel camel-soap - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2494,12 +2490,12 @@ org.apache.camel camel-splunk - 4.9.0 + 4.10.0 org.apache.camel camel-splunk-hec - 4.9.0 + 4.10.0 commons-logging @@ -2510,7 +2506,7 @@ org.apache.camel camel-spring-rabbitmq - 4.9.0 + 4.10.0 org.springframework @@ -2525,17 +2521,17 @@ org.apache.camel camel-spring-redis - 4.9.0 + 4.10.0 org.apache.camel camel-sql - 4.9.0 + 4.10.0 org.apache.camel camel-ssh - 4.9.0 + 4.10.0 org.slf4j @@ -2546,42 +2542,42 @@ org.apache.camel camel-stax - 4.9.0 + 4.10.0 org.apache.camel camel-stitch - 4.9.0 + 4.10.0 org.apache.camel camel-stomp - 4.9.0 + 4.10.0 org.apache.camel camel-stream - 4.9.0 + 4.10.0 org.apache.camel camel-stringtemplate - 4.9.0 + 4.10.0 org.apache.camel camel-stub - 4.9.0 + 4.10.0 org.apache.camel camel-support - 4.9.0 + 4.10.0 org.apache.camel camel-swift - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2592,22 +2588,22 @@ org.apache.camel camel-syslog - 4.9.0 + 4.10.0 org.apache.camel camel-tarfile - 4.9.0 + 4.10.0 org.apache.camel camel-telegram - 4.9.0 + 4.10.0 org.apache.camel camel-test-junit5 - 4.9.0 + 4.10.0 org.apache.camel @@ -2618,42 +2614,42 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-thrift - 4.9.0 + 4.10.0 org.apache.camel camel-tika - 4.9.0 + 4.10.0 org.apache.camel camel-timer - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-model - 4.9.0 + 4.10.0 org.apache.camel camel-tooling-util - 4.9.0 + 4.10.0 org.apache.camel camel-tracing - 4.9.0 + 4.10.0 org.apache.camel camel-twilio - 4.9.0 + 4.10.0 commons-logging @@ -2672,62 +2668,62 @@ org.apache.camel camel-twitter - 4.9.0 + 4.10.0 org.apache.camel camel-univocity-parsers - 4.9.0 + 4.10.0 org.apache.camel camel-util - 4.9.0 + 4.10.0 org.apache.camel camel-util-json - 4.9.0 + 4.10.0 org.apache.camel camel-validator - 4.9.0 + 4.10.0 org.apache.camel camel-velocity - 4.9.0 + 4.10.0 org.apache.camel camel-vertx - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-common - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-http - 4.9.0 + 4.10.0 org.apache.camel camel-vertx-websocket - 4.9.0 + 4.10.0 org.apache.camel camel-wasm - 4.9.0 + 4.10.0 org.apache.camel camel-weather - 4.9.0 + 4.10.0 commons-logging @@ -2738,17 +2734,17 @@ org.apache.camel camel-web3j - 4.9.0 + 4.10.0 org.apache.camel camel-webhook - 4.9.0 + 4.10.0 org.apache.camel camel-wordpress - 4.9.0 + 4.10.0 org.checkerframework @@ -2759,7 +2755,7 @@ org.apache.camel camel-workday - 4.9.0 + 4.10.0 commons-logging @@ -2770,7 +2766,7 @@ org.apache.camel camel-xchange - 4.9.0 + 4.10.0 org.checkerframework @@ -2781,27 +2777,27 @@ org.apache.camel camel-xj - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-xml-io-util - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxb - 4.9.0 + 4.10.0 com.sun.xml.bind @@ -2816,37 +2812,37 @@ org.apache.camel camel-xml-jaxp - 4.9.0 + 4.10.0 org.apache.camel camel-xml-jaxp-util - 4.9.0 + 4.10.0 org.apache.camel camel-xmlsecurity - 4.9.0 + 4.10.0 org.apache.camel camel-xmpp - 4.9.0 + 4.10.0 org.apache.camel camel-xpath - 4.9.0 + 4.10.0 org.apache.camel camel-xslt - 4.9.0 + 4.10.0 org.apache.camel camel-xslt-saxon - 4.9.0 + 4.10.0 xml-apis @@ -2857,42 +2853,42 @@ org.apache.camel camel-yaml-dsl - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-common - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-dsl-deserializers - 4.9.0 + 4.10.0 org.apache.camel camel-yaml-io - 4.9.0 + 4.10.0 org.apache.camel camel-zendesk - 4.9.0 + 4.10.0 org.apache.camel camel-zip-deflater - 4.9.0 + 4.10.0 org.apache.camel camel-zipfile - 4.9.0 + 4.10.0 org.apache.camel camel-zookeeper - 4.9.0 + 4.10.0 org.checkerframework @@ -2903,7 +2899,7 @@ org.apache.camel camel-zookeeper-master - 4.9.0 + 4.10.0 org.checkerframework @@ -6344,52 +6340,52 @@ ca.uhn.hapi hapi-base - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v21 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v22 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v23 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v231 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v24 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v25 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v251 - 2.5.1 + 2.6.0 ca.uhn.hapi hapi-structures-v26 - 2.5.1 + 2.6.0 ca.uhn.hapi.fhir hapi-fhir-base - 7.6.0 + 7.6.1 com.google.code.findbugs @@ -6408,12 +6404,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.6.0 + 7.6.1 junit @@ -6428,22 +6424,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.6.0 + 7.6.1 ca.uhn.hapi.fhir @@ -6480,6 +6476,25 @@ azure-core-http-vertx 1.0.0 + + com.datastax.oss + java-driver-query-builder + 4.15.0 + + + com.github.spotbugs + spotbugs-annotations + + + com.github.stephenc.jcip + jcip-annotations + + + com.google.code.findbugs + jsr305 + + + com.esotericsoftware.kryo kryo @@ -6514,17 +6529,17 @@ com.github.mwiede jsch - 0.2.21 + 0.2.23 com.google.auth google-auth-library-credentials - 1.29.0 + 1.31.0 com.google.auth google-auth-library-oauth2-http - 1.29.0 + 1.31.0 com.google.code.findbugs @@ -6535,7 +6550,7 @@ com.google.cloud google-cloud-pubsub - 1.134.1 + 1.136.1 com.google.android @@ -6566,7 +6581,7 @@ com.google.oauth-client google-oauth-client - 1.36.0 + 1.37.0 commons-logging @@ -6741,12 +6756,12 @@ io.projectreactor reactor-core - 3.4.38 + 3.4.41 io.projectreactor.netty reactor-netty - 1.2.0 + 1.2.2 io.quarkiverse.freemarker @@ -6807,12 +6822,12 @@ io.quarkiverse.jsch quarkus-jsch - 3.0.12 + 3.0.13 io.quarkiverse.jsch quarkus-jsch-deployment - 3.0.12 + 3.0.13 io.quarkiverse.langchain4j @@ -6922,7 +6937,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.24 + 2.1.25 com.google.code.findbugs @@ -6954,7 +6969,7 @@ joda-time joda-time - 2.13.0 + 2.13.1 net.i2p.crypto @@ -6964,7 +6979,7 @@ net.java.dev.jna jna-platform - 5.6.0 + 5.13.0 net.minidev @@ -7020,7 +7035,7 @@ org.apache.kudu kudu-client - 1.17.0 + 1.17.1 com.google.code.findbugs @@ -7035,7 +7050,7 @@ org.apache.pdfbox fontbox - 3.0.3 + 3.0.4 commons-logging @@ -7157,7 +7172,7 @@ org.kiwiproject consul-client - 1.4.2 + 1.5.0 com.google.code.findbugs @@ -7212,12 +7227,12 @@ org.snakeyaml snakeyaml-engine - 2.8 + 2.9 org.springframework spring-aop - 6.2.0 + 6.2.2 org.springframework @@ -7232,7 +7247,7 @@ org.springframework spring-expression - 6.2.0 + 6.2.2 org.springframework @@ -7243,7 +7258,7 @@ org.springframework spring-jdbc - 6.2.0 + 6.2.2 org.springframework @@ -7258,7 +7273,7 @@ org.springframework spring-jms - 6.2.0 + 6.2.2 org.springframework @@ -7273,7 +7288,7 @@ org.springframework spring-messaging - 6.2.0 + 6.2.2 org.springframework @@ -7288,7 +7303,7 @@ org.springframework spring-tx - 6.2.0 + 6.2.2 org.springframework @@ -7303,7 +7318,7 @@ org.springframework spring-web - 6.2.0 + 6.2.2 org.springframework @@ -7322,7 +7337,7 @@ org.springframework.data spring-data-redis - 3.4.0 + 3.4.2 org.springframework @@ -8211,149 +8226,149 @@ 2.7.1 - org.eclipse.jetty - jetty-alpn-client - 12.0.15 + org.eclipse.jetty + jetty-alpn-client + 12.0.16 - org.eclipse.jetty - jetty-client - 12.0.15 + org.eclipse.jetty + jetty-client + 12.0.16 - org.eclipse.jetty - jetty-http - 12.0.15 + org.eclipse.jetty + jetty-http + 12.0.16 - org.eclipse.jetty - jetty-io - 12.0.15 + org.eclipse.jetty + jetty-io + 12.0.16 - org.eclipse.jetty - jetty-security - 12.0.15 + org.eclipse.jetty + jetty-security + 12.0.16 - org.eclipse.jetty - jetty-server - 12.0.15 + org.eclipse.jetty + jetty-server + 12.0.16 - org.eclipse.jetty - jetty-session - 12.0.15 + org.eclipse.jetty + jetty-session + 12.0.16 - org.eclipse.jetty - jetty-util - 12.0.15 + org.eclipse.jetty + jetty-util + 12.0.16 - org.eclipse.jetty - jetty-util-ajax - 12.0.15 + org.eclipse.jetty + jetty-util-ajax + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-core-common - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-core-common + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-core-server - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-core-server + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + 12.0.16 - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - 12.0.15 + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + 12.0.16 - com.azure - azure-core - 1.53.0 + com.azure + azure-core + 1.54.1 - com.azure - azure-core-amqp - 2.9.10 + com.azure + azure-core-amqp + 2.9.12 - com.azure - azure-cosmos - 4.64.0 + com.azure + azure-cosmos + 4.66.0 - com.azure - azure-identity - 1.14.0 + com.azure + azure-identity + 1.15.0 - com.azure - azure-json - 1.3.0 + com.azure + azure-json + 1.3.0 - com.azure - azure-messaging-eventhubs - 5.19.1 + com.azure + azure-messaging-eventhubs + 5.20.0 - com.azure - azure-messaging-eventhubs-checkpointstore-blob - 1.20.1 + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.20.2 - com.azure - azure-messaging-servicebus - 7.17.5 + com.azure + azure-messaging-servicebus + 7.17.8 - com.azure - azure-security-keyvault-secrets - 4.9.0 + com.azure + azure-security-keyvault-secrets + 4.9.2 - com.azure - azure-storage-blob - 12.28.1 + com.azure + azure-storage-blob + 12.29.0 - com.azure - azure-storage-common - 12.27.1 + com.azure + azure-storage-common + 12.28.0 - com.azure - azure-storage-file-datalake - 12.21.0 + com.azure + azure-storage-file-datalake + 12.22.0 - com.azure - azure-storage-internal-avro - 12.13.0 + com.azure + azure-storage-internal-avro + 12.14.0 - com.azure - azure-storage-queue - 12.23.0 + com.azure + azure-storage-queue + 12.24.0 - com.azure - azure-xml - 1.1.0 + com.azure + azure-xml + 1.1.0 com.datastax.oss @@ -8392,25 +8407,6 @@ cassandra-quarkus-client-deployment 1.2.0 - - com.datastax.oss - java-driver-query-builder - 4.15.0 - - - com.github.spotbugs - spotbugs-annotations - - - com.github.stephenc.jcip - jcip-annotations - - - com.google.code.findbugs - jsr305 - - - com.datastax.oss native-protocol From e9615550a19b1dc90eb6652fa2b59fa81e944671 Mon Sep 17 00:00:00 2001 From: Pasquale Congiusti Date: Fri, 31 Jan 2025 10:13:29 +0100 Subject: [PATCH 2/3] Support base-endpoint-uri-exchange-event-notifier metrics parameter Closes #6960 --- .../reference/extensions/micrometer.adoc | 8 ++ ...ntUriExchangeEventNotifierDisableTest.java | 76 +++++++++++++++++++ ...crometerMetricsNamingPolicyLegacyTest.java | 4 +- .../micrometer/CamelMicrometerConfig.java | 10 +++ .../micrometer/CamelMicrometerRecorder.java | 13 +++- 5 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerBaseEndpointUriExchangeEventNotifierDisableTest.java diff --git a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc index 35ff3c6cfe07..4188fdebe512 100644 --- a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc @@ -111,6 +111,14 @@ Set whether to enable the MicrometerExchangeEventNotifier for capturing metrics | `boolean` | `true` +|icon:lock[title=Fixed at build time] [[quarkus.camel.metrics.base-endpoint-uri-exchange-event-notifier]]`link:#quarkus.camel.metrics.base-endpoint-uri-exchange-event-notifier[quarkus.camel.metrics.base-endpoint-uri-exchange-event-notifier]` + +Whether to use static or dynamic values for Endpoint Name tags in captured metrics. By default, static values are +used. When using dynamic tags, then a dynamic to (toD) can compute many different endpoint URIs that, +can lead to many tags as the URI is dynamic, so use this with care if setting this option to false. +| `boolean` +| `true` + |icon:lock[title=Fixed at build time] [[quarkus.camel.metrics.enable-route-event-notifier]]`link:#quarkus.camel.metrics.enable-route-event-notifier[quarkus.camel.metrics.enable-route-event-notifier]` Set whether to enable the MicrometerRouteEventNotifier for capturing metrics on the total number of routes and total diff --git a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerBaseEndpointUriExchangeEventNotifierDisableTest.java b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerBaseEndpointUriExchangeEventNotifierDisableTest.java new file mode 100644 index 000000000000..41a34085df6a --- /dev/null +++ b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerBaseEndpointUriExchangeEventNotifierDisableTest.java @@ -0,0 +1,76 @@ +/* + * 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 + * + * http://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.camel.quarkus.component.micrometer.deployment; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Optional; +import java.util.Properties; + +import io.quarkus.test.QuarkusUnitTest; +import jakarta.inject.Inject; +import org.apache.camel.CamelContext; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; +import org.apache.camel.spi.EventNotifier; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class MicrometerBaseEndpointUriExchangeEventNotifierDisableTest { + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addAsResource(applicationProperties(), "application.properties")); + + @Inject + CamelContext context; + + @Test + public void testBaseEndpointURIDisabled() { + Optional optionalExchangeEventNotifier = context.getManagementStrategy() + .getEventNotifiers() + .stream() + .filter(eventNotifier -> eventNotifier.getClass().equals(MicrometerExchangeEventNotifier.class)) + .findFirst(); + assertTrue(optionalExchangeEventNotifier.isPresent()); + + MicrometerExchangeEventNotifier eventNotifier = (MicrometerExchangeEventNotifier) optionalExchangeEventNotifier.get(); + assertFalse(eventNotifier.isBaseEndpointURI()); + } + + public static Asset applicationProperties() { + Writer writer = new StringWriter(); + + Properties props = new Properties(); + props.setProperty("quarkus.camel.metrics.base-endpoint-uri-exchange-event-notifier", "false"); + + try { + props.store(writer, ""); + } catch (IOException e) { + throw new RuntimeException(e); + } + + return new StringAsset(writer.toString()); + } +} diff --git a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsNamingPolicyLegacyTest.java b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsNamingPolicyLegacyTest.java index bab63673347e..a080f32ef638 100644 --- a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsNamingPolicyLegacyTest.java +++ b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsNamingPolicyLegacyTest.java @@ -27,7 +27,7 @@ import jakarta.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; -import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategy; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategyLegacy; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifierNamingStrategy; import org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryFactory; @@ -93,7 +93,7 @@ void legacyNamingPolicy() { MicrometerExchangeEventNotifier micrometerExchangeEventNotifier = (MicrometerExchangeEventNotifier) optionalExchangeEventNotifier .get(); - assertEquals(MicrometerExchangeEventNotifierNamingStrategy.LEGACY, + assertInstanceOf(MicrometerExchangeEventNotifierNamingStrategyLegacy.class, micrometerExchangeEventNotifier.getNamingStrategy()); Optional optionalRouteEventNotifier = context.getManagementStrategy() diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java index 94d9db32240c..c897c09301e5 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java @@ -52,6 +52,16 @@ public interface CamelMicrometerConfig { @WithDefault("true") boolean enableExchangeEventNotifier(); + /** + * Whether to use static or dynamic values for Endpoint Name tags in captured metrics. By default, static values are + * used. When using dynamic tags, then a dynamic to (toD) can compute many different endpoint URIs that, + * can lead to many tags as the URI is dynamic, so use this with care if setting this option to false. + * + * @asciidoclet + */ + @WithDefault("true") + public boolean baseEndpointURIExchangeEventNotifier(); + /** * Set whether to enable the MicrometerRouteEventNotifier for capturing metrics on the total number of routes and total * number of routes running. diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java index d1449bc9e165..82ee4f6efc1e 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java @@ -23,7 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.MicrometerUtils; import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; -import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategy; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategyDefault; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategyLegacy; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifierNamingStrategy; import org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryFactory; @@ -92,8 +93,16 @@ public void configure(CamelContext camelContext) { ManagementStrategy managementStrategy = camelContext.getManagementStrategy(); if (config.enableExchangeEventNotifier()) { MicrometerExchangeEventNotifier eventNotifier = new MicrometerExchangeEventNotifier(); + eventNotifier.setBaseEndpointURI(config.baseEndpointURIExchangeEventNotifier()); + if (config.namingStrategy().equals(MetricsNamingStrategy.LEGACY)) { - eventNotifier.setNamingStrategy(MicrometerExchangeEventNotifierNamingStrategy.LEGACY); + eventNotifier.setNamingStrategy( + new MicrometerExchangeEventNotifierNamingStrategyLegacy( + config.baseEndpointURIExchangeEventNotifier())); + } else { + eventNotifier.setNamingStrategy( + new MicrometerExchangeEventNotifierNamingStrategyDefault( + config.baseEndpointURIExchangeEventNotifier())); } managementStrategy.addEventNotifier(eventNotifier); } From 33b627caf6e99d28d8e519d703c9923c4c4cd4a3 Mon Sep 17 00:00:00 2001 From: Jiri Ondrusek Date: Wed, 5 Feb 2025 10:22:33 +0100 Subject: [PATCH 3/3] Fixes #6976: Aws-secret-manager test coverage for reload with sqs --- .../aws2/aws-secrets-manager/pom.xml | 17 +++ .../AwsSecretsManagerTestEnvCustomizer.java | 34 +++++- .../manager/it/CamelContextSqsReloadTest.java | 105 ++++++++++++++++++ .../it/ContextSqsReloadTestProfile.java | 36 ++++++ 4 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java create mode 100644 integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/ContextSqsReloadTestProfile.java diff --git a/integration-test-groups/aws2/aws-secrets-manager/pom.xml b/integration-test-groups/aws2/aws-secrets-manager/pom.xml index 79e67e7e90c4..50ad18fdff0b 100644 --- a/integration-test-groups/aws2/aws-secrets-manager/pom.xml +++ b/integration-test-groups/aws2/aws-secrets-manager/pom.xml @@ -35,6 +35,10 @@ org.apache.camel.quarkus camel-quarkus-aws-secrets-manager + + org.apache.camel.quarkus + camel-quarkus-aws2-sqs + org.apache.camel.quarkus camel-quarkus-direct @@ -121,6 +125,19 @@ + + org.apache.camel.quarkus + camel-quarkus-aws2-sqs-deployment + ${project.version} + pom + test + + + * + * + + + org.apache.camel.quarkus camel-quarkus-direct-deployment diff --git a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java index 2ad66e216085..c9961261e558 100644 --- a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java @@ -16,18 +16,23 @@ */ package org.apache.camel.quarkus.component.aws.secrets.manager.it; +import java.util.Locale; import java.util.Map; import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.commons.lang3.RandomStringUtils; import org.testcontainers.containers.localstack.LocalStackContainer.Service; +import software.amazon.awssdk.services.sqs.SqsClient; +import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; +import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest; public class AwsSecretsManagerTestEnvCustomizer implements Aws2TestEnvCustomizer { @Override public Service[] localstackServices() { - return new Service[] { Service.SECRETSMANAGER }; + return new Service[] { Service.SECRETSMANAGER, Service.SQS }; } @Override @@ -51,5 +56,32 @@ public void customize(Aws2TestEnvContext envContext) { envContext.property("camel.vault.aws.secretKey", System.getenv("AWS_SECRET_KEY")); envContext.property("camel.vault.aws.region", System.getenv("AWS_REGION")); } + + /* SQS */ + final String queueName = "cq-secret-manager-sqs-reload-" + + RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT); + + //configure endpoint override for properties function + if (envContext.isLocalStack()) { + envContext.property("camel.vault.aws.override-endpoint", + envContext.getProperties().get("camel.component.aws-secrets-manager.override-endpoint")); + envContext.property("camel.vault.aws.uri-endpoint-override", + envContext.getProperties().get("camel.component.aws-secrets-manager.uri-endpoint-override")); + } + + final SqsClient sqsClient = envContext.client(Service.SQS, SqsClient::builder); + { + final String queueUrl = sqsClient.createQueue( + CreateQueueRequest.builder() + .queueName(queueName) + .build()) + .queueUrl(); + //queue url for the vault configuration + envContext.property("camel.vault.aws.sqsQueueUrl", queueUrl); + + envContext.closeable(() -> { + sqsClient.deleteQueue(DeleteQueueRequest.builder().queueUrl(queueUrl).build()); + }); + } } } diff --git a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java new file mode 100644 index 000000000000..37a54a3cdea9 --- /dev/null +++ b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java @@ -0,0 +1,105 @@ +/* + * 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 + * + * http://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.camel.quarkus.component.aws.secrets.manager.it; + +import java.time.Instant; +import java.util.Collections; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants; +import org.apache.camel.component.aws.secretsmanager.SecretsManagerOperations; +import org.apache.camel.quarkus.test.support.aws2.Aws2Client; +import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; +import org.eclipse.microprofile.config.ConfigProvider; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.testcontainers.containers.localstack.LocalStackContainer; +import org.testcontainers.shaded.org.awaitility.Awaitility; +import software.amazon.awssdk.services.sqs.SqsClient; +import software.amazon.awssdk.services.sqs.model.SendMessageRequest; +import software.amazon.awssdk.services.sqs.model.SendMessageResponse; + +import static org.hamcrest.CoreMatchers.is; + +@QuarkusTest +@QuarkusTestResource(Aws2TestResource.class) +@TestProfile(ContextSqsReloadTestProfile.class) +public class CamelContextSqsReloadTest { + + private static String eventMsg(String secretId) { + return "{\n" + + " \"detail\": {\n" + + " \"eventSource\": \"secretsmanager.amazonaws.com\",\n" + + " \"eventName\" : \"PutSecretValue\",\n" + + " \"requestParameters\" : {\n" + + " \"secretId\" : \"" + secretId + "\"\n" + + " },\n" + + " \"eventTime\" : \"" + Instant.now() + "\"\n" + + " }\n" + + "}"; + } + + @Aws2Client(LocalStackContainer.Service.SQS) + SqsClient sqsClient; + + @Test + public void testCamelContextReloadOnSecretRefresh() { + String secretArn = null; + try { + final String myUniqueSecretValue = "value" + UUID.randomUUID(); + //create secret + secretArn = AwsSecretsManagerUtil.createSecret( + ConfigProvider.getConfig().getValue("camel.vault.aws.secrets", String.class), + myUniqueSecretValue); + //update secret + RestAssured.given() + .contentType(ContentType.JSON) + .body(Collections.singletonMap(SecretsManagerConstants.SECRET_ID, secretArn)) + .queryParam("body", myUniqueSecretValue + "-updated") + .post("/aws-secrets-manager/operation/" + SecretsManagerOperations.updateSecret) + .then() + .statusCode(201) + .body(is("true")); + + //trigger context reload + SendMessageRequest.Builder request = SendMessageRequest.builder() + .queueUrl(ConfigProvider.getConfig().getValue("camel.vault.aws.sqsQueueUrl", String.class)); + request.messageBody(eventMsg(secretArn)); + SendMessageResponse response = sqsClient.sendMessage(request.build()); + Assertions.assertEquals(200, response.sdkHttpResponse().statusCode()); + + //assert context reload + Awaitility.await().pollInterval(5, TimeUnit.SECONDS).atMost(5, TimeUnit.MINUTES).untilAsserted( + () -> { + RestAssured.get("/aws-secrets-manager/context/reload") + .then() + .statusCode(200) + .body(is("true")); + }); + } finally { + if (secretArn != null) { + AwsSecretsManagerUtil.deleteSecretImmediately(secretArn); + } + } + } +} diff --git a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/ContextSqsReloadTestProfile.java b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/ContextSqsReloadTestProfile.java new file mode 100644 index 000000000000..e8fedcc9a2c8 --- /dev/null +++ b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/ContextSqsReloadTestProfile.java @@ -0,0 +1,36 @@ +/* + * 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 + * + * http://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.camel.quarkus.component.aws.secrets.manager.it; + +import java.util.HashMap; +import java.util.Map; + +import io.quarkus.test.junit.QuarkusTestProfile; + +public class ContextSqsReloadTestProfile implements QuarkusTestProfile { + @Override + public Map getConfigOverrides() { + Map props = new HashMap<>(); + props.put("camel.vault.aws.refreshEnabled", "true"); + props.put("camel.vault.aws.refreshPeriod", "5000"); + props.put("camel.vault.aws.secrets", "CQTestSecretContextReload" + System.currentTimeMillis()); + props.put("camel.main.context-reload-enabled", "true"); + + props.put("camel.vault.aws.useSqsNotification", "true"); + return props; + } +}