This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 03cf30616507a63fa69abbe595a3a694579ddbba
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Mar 13 19:00:20 2024 +0000
Upgrade Quarkus to 3.10.0.CR1
---
.../apache/camel/quarkus/component/jasypt/JasyptDevUITest.java | 2 ++
.../camel/quarkus/component/joor/deployment/JoorProcessor.java | 6 +++---
.../core/faulttolerance/it/CoreFaultToleranceProducers.java | 2 +-
integration-test-groups/pom.xml | 3 ++-
integration-tests/cxf-soap-grouped/pom.xml | 6 ++++++
integration-tests/quartz-clustered/pom.xml | 4 ++++
integration-tests/ssh/pom.xml | 2 --
.../java/org/apache/camel/quarkus/component/ssh/it/SshIT.java | 2 --
.../java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 --
pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
13 files changed, 25 insertions(+), 18 deletions(-)
diff --git
a/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
b/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
index cd770f4d77..17445d072d 100644
---
a/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
+++
b/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
@@ -23,12 +23,14 @@ import io.quarkus.test.QuarkusDevModeTest;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5946";)
public class JasyptDevUITest extends DevUIJsonRPCTest {
@RegisterExtension
static final QuarkusDevModeTest CONFIG = new
QuarkusDevModeTest().withEmptyApplication();
diff --git
a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index a7832e7508..b97ce0b86d 100644
---
a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++
b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -30,7 +30,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.NativeConfig;
import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
import io.quarkus.maven.dependency.ResolvedDependency;
import io.quarkus.paths.PathCollection;
@@ -196,11 +196,11 @@ class JoorProcessor {
*/
public static final class CompileAtBuildTime implements BooleanSupplier {
JoorExpressionConfig config;
- PackageConfig packageConfig;
+ NativeConfig nativeConfig;
@Override
public boolean getAsBoolean() {
- return config.compileAtBuildTime ||
packageConfig.type.equalsIgnoreCase(PackageConfig.BuiltInType.NATIVE.name());
+ return config.compileAtBuildTime || nativeConfig.enabled();
}
}
}
diff --git
a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
index 4317184f98..7b82e4867b 100644
---
a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
+++
b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
@@ -59,7 +59,7 @@ public class CoreFaultToleranceProducers {
@ApplicationScoped
@Named("threadTimer")
ThreadTimer threadTimer(@Named("threadTimerExecutor") ExecutorService
executorService) {
- return new ThreadTimer(executorService);
+ return ThreadTimer.create(executorService);
}
@ApplicationScoped
diff --git a/integration-test-groups/pom.xml b/integration-test-groups/pom.xml
index badac9ba9d..bdcc0d98b2 100644
--- a/integration-test-groups/pom.xml
+++ b/integration-test-groups/pom.xml
@@ -42,7 +42,8 @@
<module>aws2-quarkus-client</module>
<module>azure</module>
<module>compression</module>
- <module>cxf-soap</module>
+ <!-- TODO: Reinstate this:
https://github.com/apache/camel-quarkus/issues/5926 -->
+ <!-- <module>cxf-soap</module> -->
<module>dataformats-json</module>
<module>foundation</module>
<module>http</module>
diff --git a/integration-tests/cxf-soap-grouped/pom.xml
b/integration-tests/cxf-soap-grouped/pom.xml
index 75e095ee76..1e50107f51 100644
--- a/integration-tests/cxf-soap-grouped/pom.xml
+++ b/integration-tests/cxf-soap-grouped/pom.xml
@@ -30,6 +30,12 @@
<name>Camel Quarkus :: Integration Tests :: Cxf Soap Grouped</name>
<description>Cxf Soap tests from ../integration-test-groups/cxf-soap
merged together</description>
+ <!-- TODO: Remove this:
https://github.com/apache/camel-quarkus/issues/5926 -->
+ <properties>
+ <quarkus.build.skip>true</quarkus.build.skip>
+ <skipTests>true</skipTests>
+ </properties>
+
<!-- Regenerate the dependencies via `mvn process-resources -Pformat -N`
from the source tree root directory -->
<dependencies>
<dependency>
diff --git a/integration-tests/quartz-clustered/pom.xml
b/integration-tests/quartz-clustered/pom.xml
index e80c59db49..3fbc633428 100644
--- a/integration-tests/quartz-clustered/pom.xml
+++ b/integration-tests/quartz-clustered/pom.xml
@@ -59,6 +59,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-flyway</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-database-postgresql</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml
index daa69211da..56f8b5edae 100644
--- a/integration-tests/ssh/pom.xml
+++ b/integration-tests/ssh/pom.xml
@@ -71,7 +71,6 @@
<profiles>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5850
<profile>
<id>native</id>
<activation>
@@ -99,7 +98,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git
a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
index 5ffdcc87ee..92af64875a 100644
---
a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
+++
b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.ssh.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5850";)
@QuarkusIntegrationTest
class SshIT extends SshTest {
diff --git
a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
index b1df19d4e7..4681ee0a94 100644
---
a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
+++
b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
@@ -20,12 +20,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5850";)
@QuarkusTest
@QuarkusTestResource(SshTestResource.class)
class SshTest {
diff --git a/pom.xml b/pom.xml
index c55f8bb169..f1d0f55be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.2</quarkiverse-mybatis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/
-->
<quarkiverse-pooled-jms.version>2.3.1</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.9.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.6.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/ -->
@@ -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.16.1</jackson.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:com.fasterxml.jackson.core:jackson-core -->
+ <jackson.version>2.17.0</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 -->
@@ -149,7 +149,7 @@
<reactor-core.version>3.4.34</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.18.0</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+
<smallrye.reactive.messaging.camel.version>4.20.0</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>
@@ -170,7 +170,7 @@
<hamcrest.version>2.2</hamcrest.version><!-- Awaitility and Wiremock
-->
<htmlunit-driver.version>4.13.0</htmlunit-driver.version>
<pdfbox.version>${pdfbox-version}</pdfbox.version>
- <sshd.version>2.12.0</sshd.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
+ <sshd.version>2.12.1</sshd.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
<unboundid-ldapsdk.version>7.0.0</unboundid-ldapsdk.version>
<wiremock.version>3.3.1</wiremock.version>
<zt-exec.version>1.12</zt-exec.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 53d443db48..d819e75700 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6560,7 +6560,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.18.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.20.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 e1b89a1e22..29ad49f45c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6520,7 +6520,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.18.0</version>
+ <version>4.20.0</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 1074dd23b0..4b60a8b6a0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6520,7 +6520,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.18.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.20.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
