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.6.0.CR1 #5512

Merged
merged 1 commit into from
Nov 16, 2023
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.2.0 # replace ${camel.version}
camel-docs-version: 4.0.x
camel-quarkus-version: 3.6.0 # replace ${camel-quarkus.version}
quarkus-version: 3.5.1 # replace ${quarkus.version}
quarkus-version: 3.6.0.CR1 # replace ${quarkus.version}
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: jdk17
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
Expand Down
9 changes: 6 additions & 3 deletions integration-tests/camel-k-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
<name>Camel Quarkus :: Integration Tests :: Camel K Runtime</name>
<description>Integration tests for Camel Quarkus K Runtime extension</description>

<properties>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
<ci.native.tests.skip>true</ci.native.tests.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -118,10 +123,9 @@
<profile>
<id>ci</id>
<properties>
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<!-- disabled because of https://github.com/apache/camel-quarkus/issues/5447
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -155,7 +159,6 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
10 changes: 10 additions & 0 deletions integration-tests/kafka-oauth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.strimzi</groupId>
<artifactId>kafka-oauth-common</artifactId>
<exclusions>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- test dependencies -->
<dependency>
Expand Down
9 changes: 6 additions & 3 deletions integration-tests/kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
<name>Camel Quarkus :: Integration Tests :: Kubernetes</name>
<description>Integration tests for Camel Quarkus Kubernetes extension</description>

<properties>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
<ci.native.tests.skip>true</ci.native.tests.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -78,10 +83,9 @@
<profile>
<id>ci</id>
<properties>
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<!-- disabled because of https://github.com/apache/camel-quarkus/issues/5447
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -109,7 +113,6 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
import io.quarkus.test.kubernetes.client.KubernetesServerTestResource;
import io.quarkus.test.kubernetes.client.KubernetesTestServer;
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/5318, https://github.com/apache/camel-quarkus/issues/5447
@QuarkusTest
@QuarkusTestResource(KubernetesServerTestResource.class)
public class KubernetesTest {
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/master-openshift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

<properties>
<quarkus.runner>${project.build.directory}/quarkus-app/quarkus-run.jar</quarkus.runner>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
<ci.native.tests.skip>true</ci.native.tests.skip>
</properties>

<dependencies>
Expand Down Expand Up @@ -115,7 +117,7 @@
<profile>
<id>ci</id>
<properties>
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
<quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
</properties>
</profile>
<profile>
Expand Down Expand Up @@ -154,7 +156,6 @@
</plugins>
</build>
</profile>
<!-- disabled because of https://github.com/apache/camel-quarkus/issues/5447
<profile>
<id>native</id>
<activation>
Expand Down Expand Up @@ -192,7 +193,6 @@
</plugins>
</build>
</profile>
-->
<profile>
<id>virtualDependencies</id>
<activation>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.2.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.5.1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus.version>3.6.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.4.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->

Expand Down Expand Up @@ -103,7 +103,7 @@
<google-cloud-pubsub.version>1.125.8</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub -->
<graalvm.version>23.0.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<groovy.version>4.0.15</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version -->
<grpc.version>1.57.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<grpc.version>1.59.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
Expand All @@ -113,7 +113,7 @@
<icu4j.version>${icu4j-version}</icu4j.version>
<immutables.version>2.9.3</immutables.version>
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<jackson.version>2.15.2</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
<jackson.version>2.15.3</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
<jakarta.jms-api.version>${jakarta-jms-api-version}</jakarta.jms-api.version>
<java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch -->
<jodatime.version>${jodatime2-version}</jodatime.version><!-- Mess in transitive dependencies of Splunk -->
Expand All @@ -129,7 +129,7 @@
<json-path.version>${json-path-version}</json-path.version>
<jedis-client.version>${jedis-client-version}</jedis-client.version>
<json-smart.version>2.4.10</json-smart.version><!-- @sync com.jayway.jsonpath:json-path:${json-path.version} dep:net.minidev:json-smart -->
<kafka.version>3.5.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kafka.version>3.6.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.9.10</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo -->
Expand All @@ -142,15 +142,15 @@
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
<perfmark-api.version>0.26.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
<protobuf.version>3.22.0</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<protobuf.version>3.24.4</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<reactor-core.version>3.4.33</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<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 -->
<smallrye.reactive.messaging.camel.version>4.10.1</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>
<spring.data.redis.version>${spring-data-redis-version}</spring.data.redis.version>
<snakeyaml.version>2.1</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 -->
<tablesaw.version>0.43.1</tablesaw.version>
<threetenbp.version>1.6.0</threetenbp.version>
<xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065-->
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-full-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6114,7 +6114,7 @@
<dependency>
<groupId>com.google.protobuf</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>protoc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.22.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.24.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<type>exe</type><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<classifier>linux-ppcle_64</classifier><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
Expand Down Expand Up @@ -6213,7 +6213,7 @@
<dependency>
<groupId>io.grpc</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>protoc-gen-grpc-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.57.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.59.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<type>exe</type><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<classifier>linux-ppcle_64</classifier><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
Expand Down Expand Up @@ -6483,7 +6483,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6114,7 +6114,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>3.22.0</version>
<version>3.24.4</version>
<type>exe</type>
<classifier>linux-ppcle_64</classifier>
</dependency>
Expand Down Expand Up @@ -6203,7 +6203,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<version>1.57.2</version>
<version>1.59.0</version>
<type>exe</type>
<classifier>linux-ppcle_64</classifier>
</dependency>
Expand Down Expand Up @@ -6428,7 +6428,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6114,7 +6114,7 @@
<dependency>
<groupId>com.google.protobuf</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>protoc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.22.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.24.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<type>exe</type><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<classifier>linux-ppcle_64</classifier><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
Expand Down Expand Up @@ -6203,7 +6203,7 @@
<dependency>
<groupId>io.grpc</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>protoc-gen-grpc-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.57.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.59.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<type>exe</type><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<classifier>linux-ppcle_64</classifier><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
Expand Down Expand Up @@ -6428,7 +6428,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down
Loading