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 2021/11/11 07:31:10 UTC
[camel-quarkus] branch quarkus-2.5.0.CR1 created (now 386f211)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-2.5.0.CR1
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
at 386f211 Re-enable Kafka ssl sasl tests (#3252)
This branch includes the following new commits:
new 8916f47 Upgrade Quarkus to 2.5.0.CR1
new c848569 Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
new 386f211 Re-enable Kafka ssl sasl tests (#3252)
The 3 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.
[camel-quarkus] 02/03: Temporarily disable kafka-sasl & kafka-ssl
tests due to #3239
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-2.5.0.CR1
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c848569b5d3284545dbaf5eaa0c6aa2dcecc767e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 27 10:35:20 2021 +0100
Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
---
.../test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 ++
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 ++
.../src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 ++
.../src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 ++
4 files changed, 8 insertions(+)
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 947a7ee..71d482b 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,10 +22,12 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index c4a246b..968749a 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,10 +22,12 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 6b25cb4..297a3f4 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
+import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
@NativeImageTest
public class KafkaSaslIT extends KafkaSaslBindingTest {
}
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
index 8cc3a89..f25e8c0 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
@@ -22,11 +22,13 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSslTestResource.class)
public class KafkaSslTest {
[camel-quarkus] 01/03: Upgrade Quarkus to 2.5.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-2.5.0.CR1
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8916f47d34cc5e199f8ca2de220b247feb270b43
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 14 07:49:19 2021 +0100
Upgrade Quarkus to 2.5.0.CR1
---
docs/antora.yml | 2 +-
.../core/deployment/CamelContextCustomizerTest.java | 2 +-
.../optaplanner/deployment/OptaplannerProcessor.java | 1 +
integration-tests-support/azure/pom.xml | 6 ++++++
.../camel/quarkus/component/fop/it/FopResource.java | 16 ++++++----------
.../quarkus/component/salesforce/SalesforceResource.java | 4 ++--
pom.xml | 8 ++++----
poms/bom/pom.xml | 2 +-
8 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 30b5114..ddc7f67 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,7 +27,7 @@ asciidoc:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
camel-version: 3.12.0 # replace ${camel.version}
- quarkus-version: 2.4.0.Final # replace ${quarkus.version}
+ quarkus-version: 2.5.0.CR1 # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index d059d74..69f04c3 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -53,7 +53,7 @@ public class CamelContextCustomizerTest {
public void execute(BuildContext context) {
String methodName = "execute";
BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
- Integer.toString(methodName.hashCode()), true);
+ Integer.toString(methodName.hashCode()), true, s -> null);
RuntimeValue<CamelContextCustomizer> value = bri
.newInstance(RestConfigurationCustomizer.class.getName());
context.produce(new CamelContextCustomizerBuildItem(value));
diff --git a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 497bfa3..488752b 100644
--- a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++ b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -35,5 +35,6 @@ class OptaplannerProcessor {
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.util.Drools$XSTreamChekcer"));
runtimeInitializedClass
.produce(new RuntimeInitializedClassBuildItem("org.drools.compiler.kproject.models.KieModuleMarshaller"));
+ runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.rule.JavaDialectRuntimeData"));
}
}
diff --git a/integration-tests-support/azure/pom.xml b/integration-tests-support/azure/pom.xml
index 42ed843..bca5eff 100644
--- a/integration-tests-support/azure/pom.xml
+++ b/integration-tests-support/azure/pom.xml
@@ -41,6 +41,12 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java b/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
index 54319ee..b04ba56 100644
--- a/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
+++ b/integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.fop.it;
-import java.io.InputStream;
import java.net.URI;
import javax.enterprise.context.ApplicationScoped;
@@ -52,14 +51,11 @@ public class FopResource {
public Response post(String message, @QueryParam("userConfigURL") String userConfigURL) throws Exception {
LOG.infof("Sending to fop: %s", message);
String endpointUri = userConfigURL == null ? "fop:pdf" : "fop:application/pdf?userConfigURL=" + userConfigURL;
- try (InputStream response = producerTemplate.requestBody(
- endpointUri, message, InputStream.class)) {
- LOG.info("Got response from fop.");
- return Response
- .created(new URI("https://camel.apache.org/"))
- .entity(response)
- .build();
- }
-
+ byte[] bytes = producerTemplate.requestBody(endpointUri, message, byte[].class);
+ LOG.info("Got response from fop.");
+ return Response
+ .created(new URI("https://camel.apache.org/"))
+ .entity(bytes)
+ .build();
}
}
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
index 01632a9..1a55d67 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
@@ -74,12 +74,12 @@ public class SalesforceResource {
@Path("/document/{id}")
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Object getDocument(@PathParam("id") String id) {
+ public String getDocument(@PathParam("id") String id) {
return template.withBody(id)
.withHeader(SalesforceEndpointConfig.SOBJECT_EXT_ID_NAME, "Name")
.withHeader(SalesforceEndpointConfig.SOBJECT_NAME, "Document")
.to("salesforce:getSObjectWithId?rawPayload=true")
- .request();
+ .request(String.class);
}
@Path("/account")
diff --git a/pom.xml b/pom.xml
index 5c6d9a6..898b4e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.4.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>2.5.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.29.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -81,8 +81,8 @@
<google-native-image-support.version>0.8.0</google-native-image-support.version>
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
<guava.version>29.0-jre</guava.version>
- <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
- <grpc.version>1.40.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <graalvm.version>21.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+ <grpc.version>1.42.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
@@ -117,7 +117,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>3.10.1</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>3.11.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 9df892d..6b0e875 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1171,7 +1171,7 @@
<exclusions>
<exclusion>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
[camel-quarkus] 03/03: Re-enable Kafka ssl sasl tests (#3252)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-2.5.0.CR1
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 386f21163a8cd55f73cf6194db55465c2f734846
Author: Amos Feng <zh...@gmail.com>
AuthorDate: Tue Nov 2 17:30:33 2021 +0800
Re-enable Kafka ssl sasl tests (#3252)
* Revert "Temporarily disable kafka-sasl & kafka-ssl tests due to #3239"
This reverts commit 25a3d41b578c610224a0126f52e2176fd05fdf53.
* Fix #3239 to override KAFKA_ADVERTISED_LISTENERS env
* sync avro.version
---
.../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java | 9 +++++++++
.../apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 --
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslTestResource.java | 11 ++++++++++-
.../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 --
.../apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java | 9 +++++++++
pom.xml | 2 +-
8 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 71d482b..947a7ee 100644
--- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
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 a6f55b9..ac807d3 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
@@ -129,6 +129,15 @@ public class KafkaSaslSslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index 968749a..c4a246b 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 297a3f4..6b25cb4 100644
--- a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++ b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
-import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
-@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
@NativeImageTest
public class KafkaSaslIT extends KafkaSaslBindingTest {
}
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 b42ac32..66c2fe7 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
@@ -83,7 +83,7 @@ public class KafkaSaslTestResource extends KafkaTestResource {
SaslKafkaContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
- String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT";
+ String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092";
withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
@@ -103,6 +103,15 @@ public class KafkaSaslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SASL_PLAINTEXT://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
index f25e8c0..8cc3a89 100644
--- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
+++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
@@ -22,13 +22,11 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
@QuarkusTest
@QuarkusTestResource(KafkaSslTestResource.class)
public class KafkaSslTest {
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 ea775dd..ed0e0da 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
@@ -122,6 +122,15 @@ public class KafkaSslTestResource extends KafkaTestResource {
}
@Override
+ protected void configure() {
+ super.configure();
+
+ String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SSL://%s:9093,BROKER://%s:9092", host, host));
+ }
+
+ @Override
protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git a/pom.xml b/pom.xml
index 898b4e2..d1b5b62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
- <avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
<bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->