From cdd9555464c6b7f08663a7ba410b476b4b02d65e Mon Sep 17 00:00:00 2001 From: James Netherton Date: Mon, 20 Jan 2025 09:42:24 +0000 Subject: [PATCH] Upgrade Quarkus to 3.19.0.CR1 --- .../component/kafka/deployment/KafkaProcessor.java | 5 +++-- .../deployment/MicroProfileHealthProcessor.java | 2 +- .../kubernetes/it/KubernetesClientProducer.java | 13 +++++++++++++ pom.xml | 10 +++++----- poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++---- .../src/main/generated/flattened-reduced-pom.xml | 8 ++++---- .../generated/flattened-reduced-verbose-pom.xml | 8 ++++---- 7 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 integration-tests/kubernetes/src/main/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesClientProducer.java diff --git a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java index c9fba0b9eacf..ebdc2f607336 100644 --- a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java +++ b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java @@ -31,6 +31,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.dev.devservices.DevServicesConfig; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig; import org.apache.camel.quarkus.component.kafka.KafkaClientFactoryProducer; @@ -63,7 +64,7 @@ void createKafkaClientFactoryProducerBean( } } - @BuildStep(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class) + @BuildStep(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class) public void configureKafkaComponentForDevServices( DevServicesLauncherConfigResultBuildItem devServiceResult, KafkaBuildTimeConfig kafkaBuildTimeConfig, @@ -72,7 +73,7 @@ public void configureKafkaComponentForDevServices( Config config = ConfigProvider.getConfig(); Optional brokers = config.getOptionalValue(CAMEL_KAFKA_BROKERS, String.class); - if (brokers.isEmpty() && kafkaBuildTimeConfig.devservices.enabled.orElse(true)) { + if (brokers.isEmpty() && kafkaBuildTimeConfig.devservices().enabled().orElse(true)) { String kafkaBootstrapServers = devServiceResult.getConfig().get(KAFKA_BOOTSTRAP_SERVERS); if (kafkaBootstrapServers != null) { runTimeConfig.produce(new RunTimeConfigurationDefaultBuildItem(CAMEL_KAFKA_BROKERS, kafkaBootstrapServers)); diff --git a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java index cce62463de09..5df3d27bdfcc 100644 --- a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java +++ b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java @@ -70,7 +70,7 @@ public boolean getAsBoolean() { .orElse(true); return !mpHealthDisabled && camelHealthEnabled && camelHealthConfig.enabled - && quarkusHealthConfig.enabled; + && quarkusHealthConfig.enabled(); } } diff --git a/integration-tests/kubernetes/src/main/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesClientProducer.java b/integration-tests/kubernetes/src/main/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesClientProducer.java new file mode 100644 index 000000000000..c8dc6326566a --- /dev/null +++ b/integration-tests/kubernetes/src/main/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesClientProducer.java @@ -0,0 +1,13 @@ +package org.apache.camel.quarkus.component.kubernetes.it; + +import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; + +@Singleton +public class KubernetesClientProducer { + @Produces + public KubernetesClient kubernetesClient() { + return null; + } +} diff --git a/pom.xml b/pom.xml index 80bbaff2d52f..638d8c3ccf48 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.4 2.6.0 2.0.4 - 3.18.0 + 999-SNAPSHOT 4.0.0 2.7.1 @@ -74,14 +74,14 @@ 1.12.0 2.29.14 0.31.3 - 3.27.2 + 3.27.3 1.11.714 ${azure-sdk-bom-version} 1.53.0 1.14.0 1.0.0-beta.24 - 1.79 - 3.1.8 + 1.80 + 3.2.0 ${commons-beanutils-version} 1.8.0 ${commons-collections-version} @@ -149,7 +149,7 @@ ${reactor-netty-version} 2.9.0 3.1.8 - 4.26.0 + 4.27.0 2.3 ${snakeyaml-engine-version} ${spring-version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8a78ab2f2cfb..8f050a231daf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6909,7 +6909,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.26.0 + 4.27.0 io.swagger.codegen.v3 @@ -7139,17 +7139,17 @@ org.bouncycastle bcmail-jdk18on - 1.79 + 1.80 org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 org.eclipse.angus diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 674a81246888..f8eedec45bef 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6864,7 +6864,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.26.0 + 4.27.0 io.swagger.codegen.v3 @@ -7084,17 +7084,17 @@ org.bouncycastle bcmail-jdk18on - 1.79 + 1.80 org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 org.eclipse.angus 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 2af22074e2c0..dfad677c81c0 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6864,7 +6864,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.26.0 + 4.27.0 io.swagger.codegen.v3 @@ -7084,17 +7084,17 @@ org.bouncycastle bcmail-jdk18on - 1.79 + 1.80 org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 org.eclipse.angus