diff --git a/docs/antora.yml b/docs/antora.yml index 91343679a330..ea7bbfb990c6 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 a9d8de30034a..99a78b795c37 100644 --- a/integration-tests/camel-k-runtime/pom.xml +++ b/integration-tests/camel-k-runtime/pom.xml @@ -30,6 +30,11 @@ Camel Quarkus :: Integration Tests :: Camel K Runtime Integration tests for Camel Quarkus K Runtime extension + + + true + + org.apache.camel.quarkus @@ -118,10 +123,9 @@ ci - 5g + 6g - virtualDependencies diff --git a/integration-tests/kafka-oauth/pom.xml b/integration-tests/kafka-oauth/pom.xml index ac0694db7d2c..7542b7eca675 100644 --- a/integration-tests/kafka-oauth/pom.xml +++ b/integration-tests/kafka-oauth/pom.xml @@ -61,6 +61,16 @@ + + io.strimzi + kafka-oauth-common + + + com.github.stephenc.jcip + jcip-annotations + + + diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml index c90ffc63efbf..0740ebc901af 100644 --- a/integration-tests/kubernetes/pom.xml +++ b/integration-tests/kubernetes/pom.xml @@ -30,6 +30,11 @@ Camel Quarkus :: Integration Tests :: Kubernetes Integration tests for Camel Quarkus Kubernetes extension + + + true + + org.apache.camel.quarkus @@ -78,10 +83,9 @@ ci - 5g + 6g - virtualDependencies 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 bf6f230c9187..4529ac5abbfa 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.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 3d5923b41dec..eba2353350a1 100644 --- a/integration-tests/master-openshift/pom.xml +++ b/integration-tests/master-openshift/pom.xml @@ -32,6 +32,8 @@ ${project.build.directory}/quarkus-app/quarkus-run.jar + + true @@ -115,7 +117,7 @@ ci - 5g + 6g @@ -154,7 +156,6 @@ - virtualDependencies diff --git a/pom.xml b/pom.xml index 48319fddc31a..23141de3d7dd 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.0 2.2.0 2.0.2 - 3.5.1 + 3.6.0.CR1 4.0.0 2.4.0 @@ -103,7 +103,7 @@ 1.125.8 23.0.1 4.0.15 - 1.57.2 + 1.59.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -113,7 +113,7 @@ ${icu4j-version} 2.9.3 ${influx-java-driver-version} - 2.15.2 + 2.15.3 ${jakarta-jms-api-version} ${json-patch-version} ${jodatime2-version} @@ -129,7 +129,7 @@ ${json-path-version} ${jedis-client-version} 2.4.10 - 3.5.1 + 3.6.0 ${kudu-version} 1.9.10 2.24.0 @@ -142,15 +142,15 @@ ${squareup-okio-version} 0.31.0 0.26.0 - 3.22.0 + 3.24.4 3.4.33 ${reactor-netty-version} 2.9.0 4.10.1 + 2.2 + ${snakeyaml-engine-version} ${spring-version} ${spring-data-redis-version} - 2.1 - ${snakeyaml-engine-version} 0.43.1 1.6.0 2.7.2 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 82d2ec377a61..1fd0fd8f736e 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 @@ com.google.protobuf protoc - 3.22.0 + 3.24.4 exe linux-ppcle_64 @@ -6213,7 +6213,7 @@ io.grpc protoc-gen-grpc-java - 1.57.2 + 1.59.0 exe linux-ppcle_64 @@ -6483,7 +6483,7 @@ org.apache.kafka connect-runtime - 3.5.1 + 3.6.0 javax.activation diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d2abbff8b048..84ae2abef145 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 @@ com.google.protobuf protoc - 3.22.0 + 3.24.4 exe linux-ppcle_64 @@ -6203,7 +6203,7 @@ io.grpc protoc-gen-grpc-java - 1.57.2 + 1.59.0 exe linux-ppcle_64 @@ -6428,7 +6428,7 @@ org.apache.kafka connect-runtime - 3.5.1 + 3.6.0 javax.activation 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 b63946a253d5..21d589e3e354 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 @@ com.google.protobuf protoc - 3.22.0 + 3.24.4 exe linux-ppcle_64 @@ -6203,7 +6203,7 @@ io.grpc protoc-gen-grpc-java - 1.57.2 + 1.59.0 exe linux-ppcle_64 @@ -6428,7 +6428,7 @@ org.apache.kafka connect-runtime - 3.5.1 + 3.6.0 javax.activation