You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/08/14 12:30:17 UTC
(camel-quarkus) 01/05: Upgrade Quarkus to 3.14.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a301ff2abb5c581f2e8942e700124940ebce54cc
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jul 22 14:10:11 2024 +0100
Upgrade Quarkus to 3.14.0.CR1
---
docs/antora.yml | 2 +-
.../jackson/avro/deployment/JacksonAvroProcessor.java | 10 +++++++---
.../health/deployment/MicroProfileHealthProcessor.java | 10 +++++-----
.../component/jackson/avro/it/JacksonAvroResource.java | 2 +-
pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 16 ++++++++--------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++++-----
.../src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++++-----
8 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ea67cd16a2..29fd2b129b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
camel-version: 4.7.0 # replace ${camel.version}
camel-docs-version: next
camel-quarkus-version: 3.14.0 # replace ${camel-quarkus.version}
- quarkus-version: 3.13.0 # replace ${quarkus.version}
+ quarkus-version: 3.14.0.CR1 # replace ${quarkus.version}
graalvm-version: 23.1.2 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
diff --git a/extensions/jackson-avro/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/avro/deployment/JacksonAvroProcessor.java b/extensions/jackson-avro/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/avro/deployment/JacksonAvroProcessor.java
index 19a3e81af1..9d9923e786 100644
--- a/extensions/jackson-avro/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/avro/deployment/JacksonAvroProcessor.java
+++ b/extensions/jackson-avro/deployment/src/main/java/org/apache/camel/quarkus/component/jackson/avro/deployment/JacksonAvroProcessor.java
@@ -18,15 +18,19 @@ package org.apache.camel.quarkus.component.jackson.avro.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.jboss.logging.Logger;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import org.apache.avro.file.DataFileWriter;
class JacksonAvroProcessor {
-
- private static final Logger LOG = Logger.getLogger(JacksonAvroProcessor.class);
private static final String FEATURE = "camel-jackson-avro";
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ @BuildStep
+ RuntimeInitializedClassBuildItem runtimeInitializedClass() {
+ return new RuntimeInitializedClassBuildItem(DataFileWriter.class.getName());
+ }
}
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 e5a3b9e4e8..cce62463de 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
@@ -27,7 +27,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.smallrye.health.deployment.HealthBuildTimeConfig;
+import io.quarkus.smallrye.health.deployment.SmallRyeHealthBuildTimeConfig;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
@@ -57,20 +57,20 @@ class MicroProfileHealthProcessor {
static final class HealthEnabled implements BooleanSupplier {
CamelMicroProfileHealthConfig camelHealthConfig;
- HealthBuildTimeConfig quarkusHealthConfig;
+ SmallRyeHealthBuildTimeConfig quarkusHealthConfig;
@Override
public boolean getAsBoolean() {
- Boolean mpHealthDisabled = ConfigProvider.getConfig()
+ boolean mpHealthDisabled = ConfigProvider.getConfig()
.getOptionalValue("mp.health.disable-default-procedures", boolean.class)
.orElse(false);
- Boolean camelHealthEnabled = ConfigProvider.getConfig()
+ boolean camelHealthEnabled = ConfigProvider.getConfig()
.getOptionalValue("camel.health.enabled", boolean.class)
.orElse(true);
return !mpHealthDisabled && camelHealthEnabled && camelHealthConfig.enabled
- && quarkusHealthConfig.extensionsEnabled;
+ && quarkusHealthConfig.enabled;
}
}
diff --git a/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java b/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java
index cd2a24144f..85da1b0e43 100644
--- a/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java
+++ b/integration-tests/jackson-avro/src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java
@@ -128,7 +128,7 @@ public class JacksonAvroResource {
private SchemaResolver createSchemaResolver(String schemaPath) throws IOException {
try (InputStream resource = JacksonAvroResource.class.getResourceAsStream(schemaPath)) {
- Schema raw = new Schema.Parser().setValidate(true).parse(resource);
+ Schema raw = new Schema.Parser().setValidateDefaults(true).parse(resource);
AvroSchema schema = new AvroSchema(raw);
return ex -> schema;
}
diff --git a/pom.xml b/pom.xml
index f68b20b791..08ed789448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<quarkiverse-mybatis.version>2.2.3</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.5.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.13.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>3.14.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.6.1</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -72,7 +72,7 @@
<angus-mail.version>${angus-mail-version}</angus-mail.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
<audience-annotations.version>${yetus-audience-annotations-version}</audience-annotations.version>
- <avro.version>1.11.3</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.12.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.27.0</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<awscrt.version>0.30.3</awscrt.version><!-- @sync software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version -->
<assertj.version>3.26.3</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
@@ -134,7 +134,7 @@
<jxmpp.version>1.0.3</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid -->
<kafka.version>3.7.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>2.0.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>2.0.10</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis -->
<kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo -->
<langchain4j.version>0.33.0</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version -->
@@ -155,7 +155,7 @@
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
<rxjava3.version>3.1.8</rxjava3.version><!-- Used by amazon-kinesis-client and infinispan-client-hotrod-jakarta -->
- <smallrye.reactive.messaging.camel.version>4.23.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>4.24.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<snakeyaml.version>2.2</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!-- Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-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 b4d8ddd478..2c31416a5a 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6847,7 +6847,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.23.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6965,12 +6965,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7149,27 +7149,27 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-script-util</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index a1707f9378..e7546a39d0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6807,7 +6807,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.23.0</version>
+ <version>4.24.0</version>
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId>
@@ -7089,22 +7089,22 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
- <version>2.0.0</version>
+ <version>2.0.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId>
- <version>2.0.0</version>
+ <version>2.0.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm</artifactId>
- <version>2.0.0</version>
+ <version>2.0.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
- <version>2.0.0</version>
+ <version>2.0.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
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 6b39dbe9dc..a3f8cfa0f2 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6807,7 +6807,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.23.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.24.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7089,22 +7089,22 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->