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/03 09:27:13 UTC
[camel-quarkus] branch quarkus-main updated (16f53f2 -> 581ba8c)
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 16f53f2 Re-enable Kafka ssl sasl tests (#3252)
omit 25a3d41 Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
omit 4462054 Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
omit 1deeeff Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
omit 9b89722 Upgrade Quarkus to 2.5.0.CR1
add 34fb249 Remove bulkhead related tests as this is not yet implemented in Camel #2876
add 7520b87 Use log await strategy for Spring RabbitMQ container
add d336d13 Align Azurite container version with Camel
add 1ba2029 Updated CHANGELOG.md
add 6db7bd9 Added explanation that Quarkus-amazon-lambda can not be used by aws2-lambda
add fc5520e Add notes about the salesforce-maven-plugin to the Salesforce extension docs
add 25b8fd5 Assert that Component DSL and Endpoint DSL work for AtlasMap
add 26ebed5 Updated CHANGELOG.md
add 0644b64 Sql - native tests fail on NPE during db initialization #3247
add 6812801 Make sure all AWS extensions tested with Quarkus clients have the option documented #3201
add 391b4a2 Reorder dependencies in integration-tests/aws2-quarkus-client-grouped/pom.xml
add 1820104 Add Amazon keyword to Quarkus metadata of AWS extensions
add 7bfd50f Fix #3254 to re-enable KafkaSaslSslIT and KafkaSslIT native tests (#3255)
add 0c4446a Updated CHANGELOG.md
new 7530b47 Upgrade Quarkus to 2.5.0.CR1
new 657ac76 Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
new 16b9534 Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
new 869f7c2 Temporarily disable kafka-sasl & kafka-ssl tests due to #3239
new 581ba8c Re-enable Kafka ssl sasl tests (#3252)
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 (16f53f2)
\
N -- N -- N refs/heads/quarkus-main (581ba8c)
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 5 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:
CHANGELOG.md | 12 ++++
docs/antora.yml | 1 +
.../ROOT/pages/reference/extensions/aws2-ddb.adoc | 13 ++--
.../pages/reference/extensions/aws2-lambda.adoc | 8 +++
.../ROOT/pages/reference/extensions/aws2-s3.adoc | 44 ++-----------
.../ROOT/pages/reference/extensions/aws2-ses.adoc | 32 ++++++++++
.../ROOT/pages/reference/extensions/aws2-sns.adoc | 32 ++++++++++
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 32 ++++++++++
.../pages/reference/extensions/salesforce.adoc | 35 +++++++++++
extensions/aws2-athena/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-ddb/runtime/pom.xml | 3 +
.../runtime/src/main/doc/configuration.adoc | 29 ---------
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-ec2/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-ecs/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-eks/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-eventbridge/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-iam/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-kms/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-lambda/runtime/pom.xml | 1 +
.../runtime/src/main/doc/configuration.adoc | 4 ++
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-mq/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-msk/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-s3/runtime/pom.xml | 2 +
.../runtime/src/main/doc/configuration.adoc | 62 -------------------
extensions/aws2-ses/runtime/pom.xml | 3 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-sns/runtime/pom.xml | 2 +
extensions/aws2-sqs/runtime/pom.xml | 2 +
extensions/aws2-sts/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
extensions/aws2-translate/runtime/pom.xml | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +
.../salesforce/runtime/src/main/doc/usage.adoc | 31 ++++++++++
.../src/main/resources/application.properties | 5 --
.../faulttolerance/it/CoreFaultToleranceTest.java | 6 +-
.../support/azure/AzureStorageTestResource.java | 2 +-
.../atlasmap/it/AtlasmapComponentDsl.java} | 11 ++--
.../camel/quarkus/component/atlasmap/it/Route.java | 6 +-
.../aws2-quarkus-client-grouped/pom.xml | 8 +--
.../camel/quarkus/kafka/sasl/KafkaSaslSslIT.java | 2 -
.../apache/camel/quarkus/kafka/ssl/KafkaSslIT.java | 2 -
.../quarkus/kafka/ssl/KafkaSslTestResource.java | 2 +
.../rabbitmq/it/SpringRabbitmqTestResource.java | 2 +-
integration-tests/sql/README.adoc | 2 +-
.../sql/src/main/resources/application.properties | 2 +-
pom.xml | 2 +-
.../camel/quarkus/maven/CamelQuarkusExtension.java | 20 +++++-
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 72 ++++++++++++++++++++++
.../doc-templates/extension-doc-page.adoc | 34 +++++++++-
60 files changed, 394 insertions(+), 171 deletions(-)
delete mode 100644 extensions/aws2-ddb/runtime/src/main/doc/configuration.adoc
create mode 100644 extensions/aws2-lambda/runtime/src/main/doc/configuration.adoc
delete mode 100644 extensions/aws2-s3/runtime/src/main/doc/configuration.adoc
create mode 100644 extensions/salesforce/runtime/src/main/doc/usage.adoc
copy integration-tests/{main/src/main/java/org/apache/camel/quarkus/main/CamelComponents.java => atlasmap/src/main/java/org/apache/camel/quarkus/component/atlasmap/it/AtlasmapComponentDsl.java} (76%)
[camel-quarkus] 03/05: Fix #3227 to remove the workaround in
KafkaDevServicesDisabledTest
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 16b9534962f73c41d2df45cc1fc737a014a0fcb1
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Mon Oct 25 22:20:51 2021 +0800
Fix #3227 to remove the workaround in KafkaDevServicesDisabledTest
---
.../component/kafka/deployment/KafkaDevServicesDisabledTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
index 75daa19..14883db 100644
--- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
+++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
@@ -34,8 +34,7 @@ public class KafkaDevServicesDisabledTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.withConfigurationResource("application-configuration-devservices-disabled.properties")
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
- .overrideConfigKey("camel.component.kafka.brokers", "");
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
@Inject
CamelContext context;
[camel-quarkus] 01/05: 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-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7530b4792434a686a0e3c194407b7318b2ff06f7
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 +-
integration-tests-support/azure/pom.xml | 6 ++++++
.../camel/quarkus/component/fop/it/FopResource.java | 16 ++++++----------
.../quarkus/component/salesforce/SalesforceResource.java | 4 ++--
pom.xml | 6 +++---
poms/bom/pom.xml | 2 +-
7 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 30b5114..114a808 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: 999-SNAPSHOT # 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/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 bfe9109..217ff9d 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>999-SNAPSHOT</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.41.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 -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 9cf7449..678db54 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] 05/05: 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-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 581ba8ca974fb8129f67904b09488c9baf698b5d
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 217ff9d..338278b 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 -->
[camel-quarkus] 04/05: 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-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 869f7c21a48692d4ec54dd6a07b4345bd26c9f68
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] 02/05: Revert "Fix #3206 to produce
RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers
property"
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 657ac76e6dce02f9458523d01832aa5b279e5546
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Mon Oct 25 22:18:23 2021 +0800
Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property"
This reverts commit 03b6dbb4be7ddd0320ecb9b06100c9a6a089925a.
---
.../camel/quarkus/component/kafka/deployment/KafkaProcessor.java | 6 +++---
.../component/kafka/deployment/KafkaDevServicesDisabledTest.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
index 9acafda..6aab15e 100644
--- a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
+++ b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
@@ -24,8 +24,8 @@ import io.quarkus.deployment.Capability;
import io.quarkus.deployment.IsNormal;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
import io.quarkus.kafka.client.deployment.DevServicesKafkaBrokerBuildItem;
import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig;
@@ -55,13 +55,13 @@ class KafkaProcessor {
public void configureKafkaComponentForDevServices(
DevServicesKafkaBrokerBuildItem kafkaBrokerBuildItem,
KafkaBuildTimeConfig kafkaBuildTimeConfig,
- BuildProducer<RunTimeConfigurationDefaultBuildItem> runTimeConfig) {
+ BuildProducer<DevServicesConfigResultBuildItem> devServiceConfig) {
Config config = ConfigProvider.getConfig();
Optional<String> brokers = config.getOptionalValue(CAMEL_KAFKA_BROKERS, String.class);
if (brokers.isEmpty() && kafkaBuildTimeConfig.devservices.enabled.orElse(true)) {
- runTimeConfig.produce(new RunTimeConfigurationDefaultBuildItem(CAMEL_KAFKA_BROKERS,
+ devServiceConfig.produce(new DevServicesConfigResultBuildItem(CAMEL_KAFKA_BROKERS,
kafkaBrokerBuildItem.getBootstrapServers()));
}
}
diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
index 14883db..75daa19 100644
--- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
+++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java
@@ -34,7 +34,8 @@ public class KafkaDevServicesDisabledTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.withConfigurationResource("application-configuration-devservices-disabled.properties")
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+ .overrideConfigKey("camel.component.kafka.brokers", "");
@Inject
CamelContext context;