You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2025/10/01 06:46:13 UTC
(camel-quarkus) branch quarkus-main updated (2620b42d48 -> aad23f43de)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 2620b42d48 Disable NATS TLS testing due to #7771
discard 006f6340e3 Upgrade Quarkus to 3.29.0.CR1
add 3c7a5d3df1 Add quarkus-netty to google-storage extension
add 32301f1dab Fixes #7785 -respect min size of test password for KafkaSaslSslTest
add bee89c53b4 Bump quarkiverse-groovy.version from 3.26.3 to 3.28.1
add 928933735a Set ES_JAVA_OPTS for ElasticSearch container JVM only tests
add 1ab080bf60 Bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0
add a084ed446f Bump quarkiverse-cxf.version from 3.27.0 to 3.27.1
new 66ad699c96 Upgrade Quarkus to 3.29.0.CR1
new aad23f43de Disable NATS TLS testing due to #7771
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2620b42d48)
\
N -- N -- N refs/heads/quarkus-main (aad23f43de)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
extensions/google-storage/deployment/pom.xml | 4 +
extensions/google-storage/runtime/pom.xml | 4 +
.../it/ElasticsearchTestResource.java | 2 +
.../kafka/sasl/KafkaSaslSslTestResource.java | 2 +-
.../test/resources/config/kafka_server_jaas.conf | 2 +-
pom.xml | 6 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 597 +++++++++++----------
.../src/main/generated/flattened-reduced-pom.xml | 65 +--
.../generated/flattened-reduced-verbose-pom.xml | 597 +++++++++++----------
9 files changed, 652 insertions(+), 627 deletions(-)
(camel-quarkus) 01/02: Upgrade Quarkus to 3.29.0.CR1
Posted by ja...@apache.org.
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 66ad699c9664442620227668d90fdc092fcceb43
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Sep 23 07:27:04 2025 +0100
Upgrade Quarkus to 3.29.0.CR1
---
docs/antora.yml | 2 +-
.../test/support/kafka/KafkaTestResource.java | 9 -------
.../kafka/oauth/it/KafkaKeycloakTestResource.java | 2 +-
.../kafka/sasl/KafkaSaslSslTestResource.java | 31 +++++++++++++++++-----
.../quarkus/kafka/sasl/KafkaSaslTestResource.java | 14 +++++++++-
.../quarkus/kafka/ssl/KafkaSslTestResource.java | 14 ++++++++--
.../component/kafka/CamelKafkaResource.java | 2 +-
.../quarkus/component/kafka/CamelKafkaRoutes.java | 21 ++++++++++++---
.../quarkus/component/kafka/it/CamelKafkaTest.java | 3 ---
pom.xml | 14 +++++-----
poms/bom/src/main/generated/flattened-full-pom.xml | 4 +--
.../src/main/generated/flattened-reduced-pom.xml | 4 +--
.../generated/flattened-reduced-verbose-pom.xml | 4 +--
13 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index f0042db945..6381335059 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -36,7 +36,7 @@ asciidoc:
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.6.3 # replace ${mapstruct.version}
min-maven-version: 3.8.2 # replace ${min-maven-version}
- target-maven-version: 3.9.9 # replace ${target-maven-version}
+ target-maven-version: 3.9.11 # replace ${target-maven-version}
# Attributes used in xrefs to other Antora components
cq-camel-components: 4.14.x@components
diff --git a/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java b/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java
index 1de17e0126..c4446c65d2 100644
--- a/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java
+++ b/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java
@@ -23,20 +23,15 @@ import java.util.function.Function;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
import org.eclipse.microprofile.config.ConfigProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME = ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
- private static final Logger LOGGER = LoggerFactory.getLogger(KafkaTestResource.class);
-
private StrimziKafkaContainer container;
@Override
public Map<String, String> start() {
try {
start(name -> new StrimziKafkaContainer(name));
-
return Collections.singletonMap("camel.component.kafka.brokers", container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
@@ -45,13 +40,9 @@ public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
public String start(Function<String, StrimziKafkaContainer> containerSupplier) {
container = containerSupplier.apply(KAFKA_IMAGE_NAME);
-
- /* Added container startup logging because of https://github.com/apache/camel-quarkus/issues/2461 */
container.withLogConsumer(frame -> System.out.print(frame.getUtf8String()))
- // .withEnv("KAFKA_LOG4J_OPTS", "-Dlog4j.configuration=file:/log4j.properties")
.waitForRunning()
.start();
-
return container.getBootstrapServers();
}
diff --git a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
index 8c6c17e270..bebbd44260 100644
--- a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
+++ b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
@@ -88,7 +88,7 @@ public class KafkaKeycloakTestResource implements QuarkusTestResourceLifecycleMa
this.kafka = new StrimziKafkaContainer(imageName)
.withBrokerId(1)
.withKafkaConfigurationMap(Map.ofEntries(
- entry("listener.security.protocol.map", "JWT:SASL_PLAINTEXT,BROKER1:PLAINTEXT"),
+ entry("listener.security.protocol.map", "JWT:SASL_PLAINTEXT,BROKER1:PLAINTEXT,CONTROLLER:PLAINTEXT"),
entry("listener.name.jwt.oauthbearer.sasl.jaas.config",
getOauthSaslJaasConfig(keycloak.getInternalUrl(), keycloak.getServerUrl())),
entry("listener.name.jwt.plain.sasl.jaas.config",
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
index fe33234803..ab1e9b34c7 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -19,22 +19,25 @@ package org.apache.camel.quarkus.kafka.sasl;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Map;
+import java.util.function.Consumer;
import java.util.stream.Stream;
+import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.command.InspectContainerResponse;
import io.strimzi.test.container.StrimziKafkaContainer;
import org.apache.camel.quarkus.test.support.kafka.KafkaTestResource;
import org.apache.camel.util.CollectionHelper;
+import org.jboss.logging.Logger;
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.MountableFile;
-import static io.strimzi.test.container.StrimziZookeeperContainer.ZOOKEEPER_PORT;
-
public class KafkaSaslSslTestResource extends KafkaTestResource {
+ static final Logger LOG = Logger.getLogger(KafkaSaslSslTestResource.class);
static final String KAFKA_KEYSTORE_PASSWORD = "changeit";
- //min lengthe is 32 because of SCRAM-SHA-512
+ //min length is 32 because of SCRAM-SHA-512
static final String ALICE_PASSWORD = "changeitchangeitchangeitchangeit";
static final String KAFKA_HOSTNAME = "localhost";
+ static final String KAFKA_BROKER_HOSTNAME = "broker-1";
static final String CERTS_BASEDIR = "target/certs";
static final String KAFKA_KEYSTORE_FILE = KAFKA_HOSTNAME + "-keystore.p12";
@@ -79,11 +82,10 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
protected void configure() {
super.configure();
- String protocolMap = "SASL_SSL:SASL_SSL,BROKER1:PLAINTEXT";
+ String protocolMap = "SASL_SSL:SASL_SSL,BROKER1:PLAINTEXT,CONTROLLER:PLAINTEXT";
Map<String, String> config = Map.ofEntries(
Map.entry("inter.broker.listener.name", "BROKER1"),
Map.entry("listener.security.protocol.map", protocolMap),
- Map.entry("zookeeper.sasl.enabled", "false"),
Map.entry("sasl.enabled.mechanisms", "SCRAM-SHA-512"),
Map.entry("sasl.mechanism.inter.broker.protocol", "SCRAM-SHA-512"),
Map.entry("ssl.keystore.location", "/etc/kafka/secrets/" + KAFKA_KEYSTORE_FILE),
@@ -95,8 +97,17 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
Map.entry("ssl.endpoint.identification.algorithm", ""));
withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
+ withCreateContainerCmdModifier(new Consumer<CreateContainerCmd>() {
+ @Override
+ public void accept(CreateContainerCmd createContainerCmd) {
+ createContainerCmd.withName(KAFKA_BROKER_HOSTNAME);
+ createContainerCmd.withHostName(KAFKA_BROKER_HOSTNAME);
+ }
+ });
withBrokerId(1);
+ withNodeId(1);
withKafkaConfigurationMap(config);
+ withEnv("KAFKA_HEAP_OPTS", "-Xmx512m -Xms256m");
withLogConsumer(frame -> System.out.print(frame.getUtf8String()));
}
@@ -115,7 +126,8 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
});
String setupUsersScript = "#!/bin/bash\n"
- + "KAFKA_OPTS= /opt/kafka/bin/kafka-configs.sh --zookeeper localhost:" + ZOOKEEPER_PORT
+ + "/opt/kafka/bin/kafka-configs.sh"
+ + " --bootstrap-server :" + INTER_BROKER_LISTENER_PORT
+ " --alter --add-config 'SCRAM-SHA-512=[iterations=8192,password=" + ALICE_PASSWORD
+ "]' --entity-type users --entity-name alice";
@@ -128,7 +140,12 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
protected void containerIsStarted(InspectContainerResponse containerInfo) {
super.containerIsStarted(containerInfo);
try {
- execInContainer("/setup-users.sh");
+ ExecResult execResult = execInContainer("/setup-users.sh");
+ if (execResult.getExitCode() != 0) {
+ LOG.warnf("Execution of setup-users.sh failed with exit code %d", execResult.getExitCode());
+ LOG.warnf("STDOUT: %s", execResult.getStdout());
+ LOG.warnf("STDERR: %s", execResult.getStderr());
+ }
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
index e5542d9d5b..444edfb7f3 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
@@ -21,8 +21,10 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;
+import java.util.function.Consumer;
import java.util.stream.Stream;
+import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.command.InspectContainerResponse;
import io.strimzi.test.container.StrimziKafkaContainer;
import org.apache.camel.quarkus.test.support.kafka.KafkaTestResource;
@@ -32,6 +34,8 @@ import org.apache.kafka.clients.CommonClientConfigs;
import org.testcontainers.utility.MountableFile;
public class KafkaSaslTestResource extends KafkaTestResource {
+ static final String KAFKA_BROKER_HOSTNAME = "broker-1";
+
private Path serviceBindingDir;
private SaslKafkaContainer container;
@@ -90,7 +94,7 @@ public class KafkaSaslTestResource extends KafkaTestResource {
protected void configure() {
super.configure();
- String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER1:PLAINTEXT";
+ String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER1:PLAINTEXT,CONTROLLER:PLAINTEXT";
Map<String, String> config = Map.ofEntries(
Map.entry("inter.broker.listener.name", "BROKER1"),
Map.entry("listener.security.protocol.map", protocolMap),
@@ -99,7 +103,15 @@ public class KafkaSaslTestResource extends KafkaTestResource {
Map.entry("sasl.mechanism.inter.broker.protocol", "PLAIN"));
withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
+ withCreateContainerCmdModifier(new Consumer<CreateContainerCmd>() {
+ @Override
+ public void accept(CreateContainerCmd createContainerCmd) {
+ createContainerCmd.withName(KAFKA_BROKER_HOSTNAME);
+ createContainerCmd.withHostName(KAFKA_BROKER_HOSTNAME);
+ }
+ });
withBrokerId(1);
+ withNodeId(1);
withKafkaConfigurationMap(config);
withLogConsumer(frame -> System.out.print(frame.getUtf8String()));
}
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
index ecf218e39f..5d0e05eeea 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
@@ -18,8 +18,10 @@ package org.apache.camel.quarkus.kafka.ssl;
import java.nio.file.Path;
import java.util.Map;
+import java.util.function.Consumer;
import java.util.stream.Stream;
+import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.command.InspectContainerResponse;
import io.strimzi.test.container.StrimziKafkaContainer;
import org.apache.camel.quarkus.test.support.kafka.KafkaTestResource;
@@ -31,6 +33,7 @@ public class KafkaSslTestResource extends KafkaTestResource {
static final String KAFKA_KEYSTORE_PASSWORD = "changeit";
static final String KAFKA_HOSTNAME = "localhost";
+ static final String KAFKA_BROKER_HOSTNAME = "broker-1";
static final String CERTS_BASEDIR = "target/certs";
static final String KAFKA_KEYSTORE_FILE = KAFKA_HOSTNAME + "-keystore.p12";
@@ -71,7 +74,7 @@ public class KafkaSslTestResource extends KafkaTestResource {
protected void configure() {
super.configure();
- String protocolMap = "SSL:SSL,BROKER1:PLAINTEXT";
+ String protocolMap = "SSL:SSL,BROKER1:PLAINTEXT,CONTROLLER:PLAINTEXT";
Map<String, String> config = Map.ofEntries(
Map.entry("inter.broker.listener.name", "BROKER1"),
Map.entry("listener.security.protocol.map", protocolMap),
@@ -83,8 +86,15 @@ public class KafkaSslTestResource extends KafkaTestResource {
Map.entry("ssl.truststore.type", KAFKA_KEYSTORE_TYPE),
Map.entry("ssl.endpoint.identification.algorithm", ""));
- withEnv("STRIMZI_TEST_ROOT_LOG_LEVEL", "DEBUG");
+ withCreateContainerCmdModifier(new Consumer<CreateContainerCmd>() {
+ @Override
+ public void accept(CreateContainerCmd createContainerCmd) {
+ createContainerCmd.withName(KAFKA_BROKER_HOSTNAME);
+ createContainerCmd.withHostName(KAFKA_BROKER_HOSTNAME);
+ }
+ });
withBrokerId(1);
+ withNodeId(1);
withKafkaConfigurationMap(config);
withLogConsumer(frame -> System.out.print(frame.getUtf8String()));
}
diff --git a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaResource.java b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaResource.java
index dbe194e187..cc9ded2f88 100644
--- a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaResource.java
+++ b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaResource.java
@@ -120,7 +120,7 @@ public class CamelKafkaResource {
@Path("idempotent/{id}")
@PUT
- @Consumes(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.TEXT_PLAIN)
public Response addMessage(@PathParam("id") Integer id, String message) {
producerTemplate.sendBodyAndHeader("direct:idempotent", message, "id", id);
return Response.accepted().build();
diff --git a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
index cdbc5874d0..b48ed8786d 100644
--- a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
+++ b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.quarkus.component.kafka;
+import java.util.List;
+import java.util.Properties;
+
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Named;
@@ -23,6 +26,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.processor.idempotent.kafka.KafkaIdempotentRepository;
+import org.apache.camel.quarkus.test.support.kafka.KafkaTestSupport;
+import org.apache.kafka.clients.CommonClientConfigs;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.NewTopic;
import org.eclipse.microprofile.config.inject.ConfigProperty;
public class CamelKafkaRoutes extends RouteBuilder {
@@ -38,10 +45,16 @@ public class CamelKafkaRoutes extends RouteBuilder {
@ConfigProperty(name = "camel.component.kafka.brokers")
String brokers;
- @Produces
- @ApplicationScoped
- @Named("kafkaIdempotentRepository")
KafkaIdempotentRepository kafkaIdempotentRepository() {
+ Properties props = new Properties();
+ props.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, KafkaTestSupport.getBootstrapServers());
+ props.put(CommonClientConfigs.GROUP_ID_CONFIG, "camel-quarkus-group");
+
+ try (AdminClient admin = AdminClient.create(props)) {
+ NewTopic topic = new NewTopic("idempotent-topic", 1, (short) 1);
+ admin.createTopics(List.of(topic));
+ }
+
return new KafkaIdempotentRepository("idempotent-topic", brokers);
}
@@ -60,7 +73,7 @@ public class CamelKafkaRoutes extends RouteBuilder {
from("direct:idempotent")
.idempotentConsumer(header("id"))
- .idempotentRepository("kafkaIdempotentRepository")
+ .idempotentRepository(kafkaIdempotentRepository())
.to("mock:idempotent-results")
.end();
diff --git a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
index f6876a2639..6ad0fc5767 100644
--- a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
+++ b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
@@ -63,11 +63,9 @@ public class CamelKafkaTest {
@Test
void testIndempotent() {
-
for (int i = 0; i < 10; i++) {
int id = i % 5;
given()
- .contentType(ContentType.JSON)
.body("Test message")
.put("/kafka/idempotent/" + id)
.then()
@@ -76,7 +74,6 @@ public class CamelKafkaTest {
String[] body = RestAssured.get("/kafka/idempotent").then().extract().body().as(String[].class);
assertEquals(5, body.length);
-
}
@Test
diff --git a/pom.xml b/pom.xml
index 600e751537..1d9516fa8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-minio.version>3.8.5</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.27.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.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.10.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/ -->
@@ -73,7 +73,7 @@
<avro.version>1.12.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.32.4</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<awscrt.version>0.38.1</awscrt.version><!-- @sync software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version -->
- <assertj.version>3.27.4</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
+ <assertj.version>3.27.6</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
<azure-core.version>1.55.5</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
@@ -132,9 +132,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.3.0</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version -->
+ <keycloak.version>26.3.4</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>2.2.10</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>2.2.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.5.0</langchain4j.version><!-- @sync io.quarkiverse.langchain4j:quarkus-langchain4j-parent:${quarkiverse-langchain4j.version} prop:langchain4j.version -->
@@ -157,7 +157,7 @@
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
<rxjava3.version>3.1.8</rxjava3.version><!-- Used by amazon-kinesis-client and infinispan-client-hotrod-jakarta -->
<smooks.version>${smooks-version}</smooks.version>
- <snakeyaml.version>2.4</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
+ <snakeyaml.version>2.5</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>
<spring.data.redis.version>${spring-data-redis-version}</spring.data.redis.version>
@@ -244,7 +244,7 @@
<hashicorp-vault.container.image>mirror.gcr.io/hashicorp/vault:1.17</hashicorp-vault.container.image>
<ibm-mq.container.image>icr.io/ibm-messaging/mq:9.4.3.0-r1</ibm-mq.container.image>
<influxdb.container.image>mirror.gcr.io/influxdb:1.8.10-alpine</influxdb.container.image>
- <kafka.container.image>quay.io/strimzi-test-container/test-container:latest-kafka-3.9.0</kafka.container.image>
+ <kafka.container.image>quay.io/strimzi-test-container/test-container:latest-kafka-4.1.0</kafka.container.image>
<keycloak.container.image>quay.io/keycloak/keycloak:${keycloak.version}</keycloak.container.image>
<kudu.container.image>mirror.gcr.io/apache/kudu:1.17.0</kudu.container.image>
<localstack.container.image>mirror.gcr.io/localstack/localstack:3.7.2</localstack.container.image>
@@ -283,7 +283,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
- <target-maven-version>3.9.9</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.9.11</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 54e7dbfcce..878f56db36 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7598,12 +7598,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.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.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.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.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 1ac5cafeae..95c7b92fe2 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7538,12 +7538,12 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
- <version>2.2.10</version>
+ <version>2.2.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-impl-embeddable</artifactId>
- <version>2.2.10</version>
+ <version>2.2.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 5fe827eb8b..17640cc48f 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7538,12 +7538,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.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.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.2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.2.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} -->
(camel-quarkus) 02/02: Disable NATS TLS testing due to #7771
Posted by ja...@apache.org.
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 aad23f43de615e12b8fd77d2992b87befb0d2168
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 24 12:12:25 2025 +0100
Disable NATS TLS testing due to #7771
---
.../apache/camel/quarkus/component/nats/it/NatsTest.java | 10 ++++------
.../camel/quarkus/component/nats/it/NatsTestResource.java | 13 +++++++------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java
index 34e79b159f..0d969c8882 100644
--- a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java
+++ b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java
@@ -21,9 +21,6 @@ import java.util.concurrent.TimeUnit;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.Header;
-import io.smallrye.certs.Format;
-import io.smallrye.certs.junit5.Certificate;
-import org.apache.camel.quarkus.test.support.certificate.TestCertificates;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -31,9 +28,10 @@ import static io.restassured.RestAssured.given;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@TestCertificates(certificates = {
- @Certificate(name = "nats", formats = {
- Format.PKCS12, Format.PEM }, password = "password") })
+// TODO: Restore TLS tests - https://github.com/apache/camel-quarkus/issues/7771
+//@TestCertificates(certificates = {
+// @Certificate(name = "nats", formats = {
+// Format.PKCS12, Format.PEM }, password = "password") })
@QuarkusTestResource(NatsTestResource.class)
@QuarkusTest
class NatsTest {
diff --git a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
index 71f0cd54c4..18f14e5d64 100644
--- a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
+++ b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
@@ -55,12 +55,13 @@ public class NatsTestResource implements QuarkusTestResourceLifecycleManager {
noAuthContainer = noAuthContainer(properties);
tokenAuthContainer = tokenAuthContainer(properties);
- if ("true".equals(System.getenv("ENABLE_TLS_TESTS"))) {
- LOG.info("TLS tests enabled so starting the TLS auth container");
- tlsAuthContainer = tlsAuthContainer(properties);
- } else {
- LOG.info("TLS tests NOT enabled, so NOT starting the TLS auth container");
- }
+ // TODO: Restore TLS tests - https://github.com/apache/camel-quarkus/issues/7771
+ // if ("true".equals(System.getenv("ENABLE_TLS_TESTS"))) {
+ // LOG.info("TLS tests enabled so starting the TLS auth container");
+ // tlsAuthContainer = tlsAuthContainer(properties);
+ // } else {
+ // LOG.info("TLS tests NOT enabled, so NOT starting the TLS auth container");
+ // }
LOG.info("Properties: {}", properties);