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 87f8ee93a7010d9708b73ee9ab5587f4fc7761c6
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Mar 24 15:39:17 2025 +0000
Upgrade Quarkus to 3.22.0.CR1
---
.../TestCertificateGenerationExtension.java | 25 ++++++++++++----------
.../test/mock/backend/MockBackendUtils.java | 12 ++++++++---
integration-tests/couchdb/pom.xml | 2 ++
.../quarkus/component/couchdb/it/CouchdbTest.java | 2 ++
pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 8 +++----
.../src/main/generated/flattened-reduced-pom.xml | 8 +++----
.../generated/flattened-reduced-verbose-pom.xml | 8 +++----
.../apache/camel/quarkus/test/CallbackUtil.java | 16 ++++++++++++++
9 files changed, 58 insertions(+), 29 deletions(-)
diff --git
a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java
b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java
index 0e4150c8f8..1104903631 100644
---
a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java
+++
b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java
@@ -68,8 +68,8 @@ public class TestCertificateGenerationExtension implements
BeforeAllCallback {
Optional<String> cn = Optional.empty();
Optional<String> altSubName = Optional.empty();
if (annotation.docker()) {
- cn = resolveDockerHost();
- altSubName = cn.stream().map(h -> "IP:%s".formatted(h)).findAny();
+ cn = resolveDockerHost(extensionContext);
+ altSubName = cn.stream().map("IP:%s"::formatted).findAny();
}
for (Certificate certificate : annotation.certificates()) {
@@ -86,9 +86,7 @@ public class TestCertificateGenerationExtension implements
BeforeAllCallback {
.withPassword(certificate.password().isEmpty() ? null :
certificate.password())
.withDuration(Duration.ofDays(certificate.duration()));
- if (altSubName.isPresent()) {
- request.withSubjectAlternativeName(altSubName.get());
- }
+ altSubName.ifPresent(request::withSubjectAlternativeName);
for (String san : certificate.subjectAlternativeNames()) {
request.withSubjectAlternativeName(san);
@@ -109,12 +107,17 @@ public class TestCertificateGenerationExtension
implements BeforeAllCallback {
}
}
- private Optional<String> resolveDockerHost() {
- String dockerHost =
DockerClientFactory.instance().dockerHostIpAddress();
- if (!dockerHost.equals("localhost") &&
!dockerHost.equals("127.0.0.1")) {
- return Optional.of(dockerHost);
+ private Optional<String> resolveDockerHost(ExtensionContext
extensionContext) {
+ ClassLoader origTCCL = Thread.currentThread().getContextClassLoader();
+ try {
+
Thread.currentThread().setContextClassLoader(extensionContext.getTestClass().get().getClassLoader());
+ String dockerHost =
DockerClientFactory.instance().dockerHostIpAddress();
+ if (!dockerHost.equals("localhost") &&
!dockerHost.equals("127.0.0.1")) {
+ return Optional.of(dockerHost);
+ }
+ return Optional.empty();
+ } finally {
+ Thread.currentThread().setContextClassLoader(origTCCL);
}
- return Optional.empty();
}
-
}
diff --git
a/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
b/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
index 6829413055..b4d378a8bc 100644
---
a/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
+++
b/integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/mock/backend/MockBackendUtils.java
@@ -50,8 +50,14 @@ public class MockBackendUtils {
}
static boolean mockBackendStarted() {
- return ConfigProvider.getConfig()
- .getOptionalValue("camel.quarkus.start-mock-backend",
Boolean.class)
- .orElse(Boolean.TRUE);
+ ClassLoader origTCCL = Thread.currentThread().getContextClassLoader();
+ try {
+
Thread.currentThread().setContextClassLoader(MockBackendUtils.class.getClassLoader());
+ return ConfigProvider.getConfig()
+ .getOptionalValue("camel.quarkus.start-mock-backend",
Boolean.class)
+ .orElse(Boolean.TRUE);
+ } finally {
+ Thread.currentThread().setContextClassLoader(origTCCL);
+ }
}
}
diff --git a/integration-tests/couchdb/pom.xml
b/integration-tests/couchdb/pom.xml
index 7abd358f16..a25590af85 100644
--- a/integration-tests/couchdb/pom.xml
+++ b/integration-tests/couchdb/pom.xml
@@ -80,6 +80,7 @@
<profiles>
+ <!-- see https://github.com/apache/camel-quarkus/issues/7269
<profile>
<id>native</id>
<activation>
@@ -107,6 +108,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git
a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
index 338b85a4d3..9cce8d0e29 100644
---
a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
+++
b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java
@@ -22,6 +22,7 @@ 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.awaitility.Awaitility.await;
@@ -31,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@QuarkusTest
@QuarkusTestResource(CouchdbTestResource.class)
+@Disabled //https://github.com/apache/camel-quarkus/issues/7269
class CouchdbTest {
@Test
diff --git a/pom.xml b/pom.xml
index 1a14a17272..caa8f713f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,14 +54,14 @@
<quarkiverse-fury.version>0.3.0</quarkiverse-fury.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/fury/quarkus-fury-parent/ -->
<quarkiverse-groovy.version>3.21.2</quarkiverse-groovy.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
<quarkiverse-jackson-jq.version>2.2.0</quarkiverse-jackson-jq.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/
-->
- <quarkiverse-jgit.version>3.3.3</quarkiverse-jgit.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
+ <quarkiverse-jgit.version>3.4.2</quarkiverse-jgit.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
<quarkiverse-jsch.version>3.0.15</quarkiverse-jsch.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch/ -->
<quarkiverse-langchain4j.version>0.23.3</quarkiverse-langchain4j.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/langchain4j/quarkus-langchain4j-parent
-->
<quarkiverse-micrometer.version>3.3.1</quarkiverse-micrometer.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/micrometer/registry/quarkus-micrometer-registry-jmx/
-->
<quarkiverse-minio.version>3.8.1</quarkiverse-minio.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.3.2</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.21.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/ -->
@@ -139,7 +139,7 @@
<kafka.version>3.9.0</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<keycloak.version>26.1.3</keycloak.version><!-- @sync
io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version
-->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>2.0.21</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>2.1.20</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.0.0-alpha1</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 22355d054e..3ff7efad66 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7060,12 +7060,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.3.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.3.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7456,12 +7456,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.0.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.20</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.0.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.20</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 2c528f3524..ad9764e474 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7025,12 +7025,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId>
<artifactId>quarkus-jgit</artifactId>
- <version>3.3.3</version>
+ <version>3.4.2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId>
<artifactId>quarkus-jgit-deployment</artifactId>
- <version>3.3.3</version>
+ <version>3.4.2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId>
@@ -7396,12 +7396,12 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
- <version>2.0.21</version>
+ <version>2.1.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId>
- <version>2.0.21</version>
+ <version>2.1.20</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 79f35d1873..b3f1c0f404 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7025,12 +7025,12 @@
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.3.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jgit</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-jgit-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.3.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jsch</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7396,12 +7396,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.0.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.20</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.0.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.1.20</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/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
index 10f32a3298..bb3847dd47 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
@@ -18,6 +18,8 @@ package org.apache.camel.quarkus.test;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -27,7 +29,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExecutableInvoker;
import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.MediaType;
import org.junit.jupiter.api.extension.TestInstances;
+import org.junit.jupiter.api.function.ThrowingConsumer;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.engine.execution.NamespaceAwareStore;
import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
@@ -117,6 +121,11 @@ public class CallbackUtil {
return Optional.empty();
}
+ @Override
+ public List<Class<?>> getEnclosingTestClasses() {
+ return List.of();
+ }
+
@Override
public Optional<TestInstance.Lifecycle> getTestInstanceLifecycle() {
return lifecycle;
@@ -154,7 +163,14 @@ public class CallbackUtil {
@Override
public void publishReportEntry(Map<String, String> map) {
+ }
+ @Override
+ public void publishFile(String name, MediaType mediaType,
ThrowingConsumer<Path> action) {
+ }
+
+ @Override
+ public void publishDirectory(String name, ThrowingConsumer<Path>
action) {
}
@Override
