Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Quarkus to 3.14.0.CR1 #6349

Merged
merged 5 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,19 @@

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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
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;
Expand Down Expand Up @@ -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;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.mongodb.gridfs.it;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.junit.jupiter.api.Disabled;

@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusIntegrationTest
class MongodbGridfsIT extends MongodbGridfsTest {
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
import io.restassured.http.ContentType;
import org.apache.camel.quarkus.test.support.mongodb.MongoDbTestResource;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static org.hamcrest.Matchers.is;

@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusTest
@WithTestResource(MongoDbTestResource.class)
class MongodbGridfsTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.mongodb.it;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.junit.jupiter.api.Disabled;

@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusIntegrationTest
class MongoDbIT extends MongoDbTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand All @@ -50,6 +51,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusTest
@WithTestResource(MongoDbTestResource.class)
class MongoDbTest {
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/camel-k-runtime-model-reifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -154,6 +155,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/camel-k-runtime-shutdown/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</plugins>
</build>
</profile>

<!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -160,7 +160,7 @@
</plugins>
</build>
</profile>

-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/camel-k-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -154,6 +155,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/debezium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@


<profiles>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6341
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -155,6 +156,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>mysqlDriver</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.junit.jupiter.api.Disabled;

@Disabled("https://github.com/apache/camel-quarkus/issues/4638")
@Disabled("https://github.com/apache/camel-quarkus/issues/4638, https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusIntegrationTest
class DebeziumMongodbIT extends DebeziumMongodbTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
Expand All @@ -47,6 +48,7 @@
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
@QuarkusTest
@WithTestResource(DebeziumMongodbTestResource.class)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public AvroMapper avroMapper() {

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;
}
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -108,6 +109,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/master-openshift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
</plugins>
</build>
</profile>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -213,6 +214,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/microprofile-fault-tolerance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
</dependencies>

<profiles>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6285
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -97,6 +98,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.junit.jupiter.api.Disabled;

@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
@QuarkusIntegrationTest
class MicroProfileFaultToleranceConfigurationIT extends MicroProfileFaultToleranceConfigurationTest {
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import static org.hamcrest.Matchers.is;

@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
@QuarkusTest
@TestProfile(MicroProfileFaultToleranceConfigurationTestProfile.class)
class MicroProfileFaultToleranceConfigurationTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.junit.jupiter.api.Disabled;

@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
@QuarkusIntegrationTest
class MicroprofileFaultToleranceIT extends MicroprofileFaultToleranceTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
Expand All @@ -26,6 +27,7 @@
import static org.apache.camel.quarkus.component.microprofile.it.faulttolerance.MicroProfileFaultToleranceRoutes.EXCEPTION_MESSAGE;
import static org.hamcrest.Matchers.is;

@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
@QuarkusTest
class MicroprofileFaultToleranceTest {

Expand Down
2 changes: 2 additions & 0 deletions integration-tests/mongodb-grouped/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
</build>

<profiles>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6341
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -130,6 +131,7 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
15 changes: 2 additions & 13 deletions integration-tests/slack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@

<dependencies>
<!-- Mongo dependency exists as a test for https://github.com/apache/camel-quarkus/issues/2489 -->
<!-- TODO: https://github.com/apache/camel-quarkus/issues/6341
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mongodb</artifactId>
</dependency>
-->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-slack</artifactId>
Expand Down Expand Up @@ -101,19 +103,6 @@
</activation>
<dependencies>
<!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mongodb-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-slack-deployment</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/ -->

Expand All @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
Loading
Loading