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 f73ac922f01fbf92cf933974e9b683977f8d2484
Author: James Netherton <[email protected]>
AuthorDate: Wed Nov 18 15:05:27 2026 +0000

    Upgrade Quarkus to 4.0.0
---
 docs/antora.yml                                           |  2 +-
 integration-tests/beanio/pom.xml                          |  5 +++++
 .../camel/quarkus/component/beanio/it/BeanioTest.java     | 15 +++++++++------
 .../quarkus/core/tls/it/TlsRegistryMutualTlsTest.java     |  6 +++++-
 pom.xml                                                   |  4 ++--
 poms/bom/pom.xml                                          |  1 +
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 57660a3e1cd..d907b3da7f2 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
     camel-version: 4.23.0 # replace ${camel.version}
     camel-docs-version: next
     camel-quarkus-version: 4.0.0 # replace ${camel-quarkus.version}
-    quarkus-version: 4.0.0.CR1 # replace ${quarkus.version}
+    quarkus-version: 4.0.0 # replace ${quarkus.version}
     graalvm-version: 25.0.4.1 # replace ${graalvm.version}
     graalvm-docs-version: jdk25 # replace ${graalvm-docs.version}
     langchain4j-version: 1.23.0 # replace ${langchain4j.version}
diff --git a/integration-tests/beanio/pom.xml b/integration-tests/beanio/pom.xml
index 621fd10bebf..bcc9efadc90 100644
--- a/integration-tests/beanio/pom.xml
+++ b/integration-tests/beanio/pom.xml
@@ -67,6 +67,11 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git 
a/integration-tests/beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioTest.java
 
b/integration-tests/beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioTest.java
index b82c10c4618..3e7f259ae09 100644
--- 
a/integration-tests/beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioTest.java
+++ 
b/integration-tests/beanio/src/test/java/org/apache/camel/quarkus/component/beanio/it/BeanioTest.java
@@ -33,9 +33,11 @@ import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.xmlunit.builder.DiffBuilder;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @QuarkusTest
 class BeanioTest {
@@ -72,11 +74,6 @@ class BeanioTest {
         String expected = IOUtils.toString(
                 
BeanioTest.class.getResourceAsStream("/employees-%s.txt".formatted(type.toLowerCase())),
                 StandardCharsets.UTF_8);
-        if (type.equals("XML")) {
-            // Clean up XML to match what is returned from beanio
-            expected = expected.replaceAll("(?s)<!--.*?-->", 
"").replaceAll(">[\\s\r\n]*<", "><");
-        }
-
         String result = RestAssured.given()
                 .queryParam("type", type)
                 .contentType(ContentType.JSON)
@@ -88,7 +85,13 @@ class BeanioTest {
                 .body()
                 .asString();
 
-        assertEquals(expected.trim(), result.trim());
+        if (type.equals("XML")) {
+            assertFalse(DiffBuilder.compare(expected).withTest(result)
+                    
.ignoreComments().ignoreWhitespace().checkForSimilar().build()
+                    .hasDifferences());
+        } else {
+            assertEquals(expected.trim(), result.trim());
+        }
     }
 
     @ParameterizedTest
diff --git 
a/integration-tests/tls-registry/src/test/java/org/apache/camel/quarkus/core/tls/it/TlsRegistryMutualTlsTest.java
 
b/integration-tests/tls-registry/src/test/java/org/apache/camel/quarkus/core/tls/it/TlsRegistryMutualTlsTest.java
index a092b227205..b6bd165083f 100644
--- 
a/integration-tests/tls-registry/src/test/java/org/apache/camel/quarkus/core/tls/it/TlsRegistryMutualTlsTest.java
+++ 
b/integration-tests/tls-registry/src/test/java/org/apache/camel/quarkus/core/tls/it/TlsRegistryMutualTlsTest.java
@@ -28,6 +28,7 @@ import 
org.apache.camel.quarkus.test.support.certificate.TestCertificates;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -79,7 +80,10 @@ class TlsRegistryMutualTlsTest {
                 .get("/tls-registry/mtls/" + component + "/client-no-key")
                 .then()
                 .statusCode(500)
-                .body(containsString("javax.net.ssl.SSLHandshakeException: 
(certificate_required)"));
+                // On Windows the rejection can surface as an aborted 
connection rather than the TLS alert
+                .body(anyOf(
+                        containsString("javax.net.ssl.SSLHandshakeException: 
(certificate_required)"),
+                        containsString("java.net.SocketException: An 
established connection was aborted")));
     }
 
     public static class MutualTlsProfile implements QuarkusTestProfile {
diff --git a/pom.xml b/pom.xml
index 977cec6177c..ffe8f4431cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <quarkiverse-minio.version>3.9.2</quarkiverse-minio.version><!-- 
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
         <quarkiverse-mybatis.version>2.4.3</quarkiverse-mybatis.version><!-- 
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ 
-->
         
<quarkiverse-pooled-jms.version>2.13.0</quarkiverse-pooled-jms.version><!-- 
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
 -->
-        <quarkus.version>4.0.0.CR1</quarkus.version><!-- 
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+        <quarkus.version>4.0.0</quarkus.version><!-- 
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
         
<quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!-- 
https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
         <quarkus-qpid-jms.version>2.14.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/ -->
 
@@ -144,7 +144,7 @@
         <json-smart.version>${json-smart-version}</json-smart.version>
         <jxmpp.version>1.1.0</jxmpp.version><!-- @sync 
org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid -->
         <kafka.version>4.2.2</kafka.version><!-- @sync 
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
-        <keycloak.version>26.8.1</keycloak.version><!-- @sync 
io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version 
-->
+        <keycloak.version>26.8.2</keycloak.version><!-- @sync 
io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version 
-->
         <kudu.version>${kudu-version}</kudu.version>
         <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 
-->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index dabaaec36f3..07587004d99 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -8701,6 +8701,7 @@
                                     
<baseBomPath>${project.basedir}/src/main/generated/flattened-reduced-pom.xml</baseBomPath>
                                     <ignoredOverlaps>
                                         
<ignoredOverlap>org.glassfish.jaxb:jaxb-runtime</ignoredOverlap><!-- Comes from 
quarkus-cxf-bom -->
+                                        
<ignoredOverlap>com.fasterxml.woodstox:woodstox-core</ignoredOverlap><!-- Newly 
managed in quarkus-bom and is also managed in quarkus-cxf-bom -->
                                     </ignoredOverlaps>
                                 </configuration>
                             </execution>

Reply via email to