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
The following commit(s) were added to refs/heads/main by this push:
new ef1028ef18 Upgrade Quarkus to 3.6.0.CR1
ef1028ef18 is described below
commit ef1028ef188b28668e334fa6ca9ea8d2a7b4443a
Author: James Netherton <[email protected]>
AuthorDate: Fri Oct 27 14:27:33 2023 +0100
Upgrade Quarkus to 3.6.0.CR1
---
docs/antora.yml | 2 +-
integration-tests/camel-k-runtime/pom.xml | 9 ++++++---
integration-tests/kafka-oauth/pom.xml | 10 ++++++++++
integration-tests/kubernetes/pom.xml | 9 ++++++---
.../quarkus/component/kubernetes/it/KubernetesTest.java | 2 --
integration-tests/master-openshift/pom.xml | 6 +++---
pom.xml | 14 +++++++-------
poms/bom/src/main/generated/flattened-full-pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++---
.../src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++---
10 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 91343679a3..ea7bbfb990 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -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}
diff --git a/integration-tests/camel-k-runtime/pom.xml
b/integration-tests/camel-k-runtime/pom.xml
index a9d8de3003..99a78b795c 100644
--- a/integration-tests/camel-k-runtime/pom.xml
+++ b/integration-tests/camel-k-runtime/pom.xml
@@ -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>
@@ -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>
@@ -155,7 +159,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/kafka-oauth/pom.xml
b/integration-tests/kafka-oauth/pom.xml
index ac0694db7d..7542b7eca6 100644
--- a/integration-tests/kafka-oauth/pom.xml
+++ b/integration-tests/kafka-oauth/pom.xml
@@ -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>
diff --git a/integration-tests/kubernetes/pom.xml
b/integration-tests/kubernetes/pom.xml
index c90ffc63ef..0740ebc901 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -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>
@@ -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>
@@ -109,7 +113,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git
a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesTest.java
b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesTest.java
index bf6f230c91..4529ac5abb 100644
---
a/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesTest.java
+++
b/integration-tests/kubernetes/src/test/java/org/apache/camel/quarkus/component/kubernetes/it/KubernetesTest.java
@@ -25,12 +25,10 @@ import io.quarkus.test.junit.QuarkusTest;
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 {
diff --git a/integration-tests/master-openshift/pom.xml
b/integration-tests/master-openshift/pom.xml
index 3d5923b41d..eba2353350 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -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>
@@ -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>
@@ -154,7 +156,6 @@
</plugins>
</build>
</profile>
- <!-- disabled because of
https://github.com/apache/camel-quarkus/issues/5447
<profile>
<id>native</id>
<activation>
@@ -192,7 +193,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/pom.xml b/pom.xml
index 48319fddc3..23141de3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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/ -->
@@ -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>
@@ -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 -->
@@ -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
-->
@@ -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-->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 82d2ec377a..1fd0fd8f73 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -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>
@@ -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>
@@ -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} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index d2abbff8b0..84ae2abef1 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -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>
@@ -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>
@@ -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>
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 b63946a253..21d589e3e3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -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>
@@ -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>
@@ -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} -->
