This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 082f1f7a9ffbd5d585ee315b45f5431787b0ad56 Author: James Netherton <[email protected]> AuthorDate: Mon Jun 23 10:28:23 2025 +0100 Upgrade Quarkus to 3.25.0.CR1 --- .../support/reactor/netty/deployment/AzureCoreSupportProcessor.java | 4 ++-- .../quarkus/component/hazelcast/deployment/HazelcastProcessor.java | 4 ++-- .../java/org/apache/camel/quarkus/component/fop/it/FopTest.java | 4 ++-- .../java/org/apache/camel/quarkus/component/pdf/it/PdfTest.java | 4 ++-- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions-support/azure-core/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/AzureCoreSupportProcessor.java b/extensions-support/azure-core/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/AzureCoreSupportProcessor.java index 19c9b094f6..280bdb1a78 100644 --- a/extensions-support/azure-core/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/AzureCoreSupportProcessor.java +++ b/extensions-support/azure-core/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/AzureCoreSupportProcessor.java @@ -38,7 +38,7 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.deployment.util.ServiceUtil; -import io.quarkus.utilities.OS; +import io.smallrye.common.os.OS; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -132,7 +132,7 @@ public class AzureCoreSupportProcessor { @BuildStep(onlyIf = Msal4jAndIdentityIsPresent.class) void enableLoadingOfNativeLibraries(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinitializedClass) { - OS os = OS.determineOS(); + OS os = OS.current(); if (os.equals(OS.LINUX) || os.equals(OS.MAC)) { String iSecurityLibraryClassName = "com.microsoft.aad.msal4jextensions.persistence.%s.ISecurityLibrary" .formatted(os.name().toLowerCase()); diff --git a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java index 95a5d3b2fe..6c6756ddcb 100644 --- a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java +++ b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java @@ -48,7 +48,7 @@ import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; -import io.quarkus.utilities.OS; +import io.smallrye.common.os.OS; import org.apache.camel.tooling.model.MainModel; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; @@ -102,7 +102,7 @@ class HazelcastProcessor { @BuildStep void registerICMPHelper(BuildProducer<RuntimeInitializedClassBuildItem> initializedClasses) { - if (OS.determineOS() != OS.LINUX) { + if (OS.current() != OS.LINUX) { initializedClasses.produce(new RuntimeInitializedClassBuildItem(ICMPHelper.class.getName())); } initializedClasses.produce(new RuntimeInitializedClassBuildItem(OperatingSystemMXBeanSupport.class.getName())); diff --git a/integration-tests/fop/src/test/java/org/apache/camel/quarkus/component/fop/it/FopTest.java b/integration-tests/fop/src/test/java/org/apache/camel/quarkus/component/fop/it/FopTest.java index 61cde5251b..7cc42b51ca 100644 --- a/integration-tests/fop/src/test/java/org/apache/camel/quarkus/component/fop/it/FopTest.java +++ b/integration-tests/fop/src/test/java/org/apache/camel/quarkus/component/fop/it/FopTest.java @@ -27,11 +27,11 @@ import java.util.function.Function; import java.util.stream.Stream; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.utilities.OS; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.ExtractableResponse; import io.restassured.specification.RequestSpecification; +import io.smallrye.common.os.OS; import org.apache.pdfbox.Loader; import org.apache.pdfbox.io.RandomAccessReadBuffer; import org.apache.pdfbox.pdmodel.PDDocument; @@ -76,7 +76,7 @@ class FopTest { @BeforeEach public void beforeEach() { // Disable tests on GitHub Actions Windows runners. Font cache building is too slow and restoring saved caches is too unreliable - Assumptions.assumeFalse(OS.determineOS().equals(OS.WINDOWS) && "true".equals(System.getenv("CI"))); + Assumptions.assumeFalse(OS.current().equals(OS.WINDOWS) && "true".equals(System.getenv("CI"))); } @Test diff --git a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfTest.java b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfTest.java index 23be9a3800..2775659d2c 100644 --- a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfTest.java +++ b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfTest.java @@ -19,9 +19,9 @@ package org.apache.camel.quarkus.component.pdf.it; import java.io.IOException; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.utilities.OS; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import io.smallrye.common.os.OS; import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException; @@ -42,7 +42,7 @@ class PdfTest { @BeforeEach public void beforeEach() { // Disable tests on GitHub Actions Windows runners. Font cache building is too slow and restoring saved caches is too unreliable - Assumptions.assumeFalse(OS.determineOS().equals(OS.WINDOWS) && "true".equals(System.getenv("CI"))); + Assumptions.assumeFalse(OS.current().equals(OS.WINDOWS) && "true".equals(System.getenv("CI"))); } @Order(1) diff --git a/pom.xml b/pom.xml index 1d7edeb7b2..a249235bab 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-minio.version>3.8.4</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>2.4.1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> - <quarkus.version>3.24.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</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.8.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/ --> @@ -138,9 +138,9 @@ <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.0.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> - <keycloak.version>26.2.4</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> + <keycloak.version>26.3.0</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> <kudu.version>${kudu-version}</kudu.version> - <kotlin.version>2.1.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> + <kotlin.version>2.2.0</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>1.1.0</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version --> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b2a06e0f3a..8fe84f1d79 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7604,12 +7604,12 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.1.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.1.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</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 8ad41b1f57..d4479ae1a3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7544,12 +7544,12 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-compiler-embeddable</artifactId> - <version>2.1.21</version> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId> - <version>2.1.21</version> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</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 7ff991310a..824100c53e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7544,12 +7544,12 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.1.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.1.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlinx</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
