You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/08/05 12:20:00 UTC
[camel] branch main updated (62600fa5e6c -> 91942ca36de)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 62600fa5e6c Polished docs
new 93d4bde995a (chores) camel-test-infra-kafka: defaults to running the tests with Kafka 3.x
new 91942ca36de (chores) camel-kafka: defaults to running the tests with Kafka 3.x
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:
components/camel-kafka/pom.xml | 60 +++++++++++++++-------
.../infra/kafka/services/KafkaServiceFactory.java | 8 ++-
2 files changed, 48 insertions(+), 20 deletions(-)
[camel] 01/02: (chores) camel-test-infra-kafka: defaults to running the tests with Kafka 3.x
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 93d4bde995ab4d9cb13efc1bbd546bd7a793677b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Aug 5 11:14:56 2022 +0200
(chores) camel-test-infra-kafka: defaults to running the tests with Kafka 3.x
---
.../camel/test/infra/kafka/services/KafkaServiceFactory.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
index ceb5c6d42f9..8018c5b3bb1 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
@@ -57,10 +57,11 @@ public final class KafkaServiceFactory {
public static KafkaService createService() {
SimpleTestServiceBuilder<KafkaService> builder = new SimpleTestServiceBuilder<>("kafka");
- return builder.addLocalMapping(ContainerLocalKafkaService::new)
+ return builder.addLocalMapping(ContainerLocalKafkaService::kafka3Container)
.addMapping("local-strimzi-container", StrimziService::new)
.addRemoteMapping(RemoteKafkaService::new)
.addMapping("local-kafka3-container", ContainerLocalKafkaService::kafka3Container)
+ .addMapping("local-kafka2-container", ContainerLocalKafkaService::new)
.build();
}
@@ -69,10 +70,13 @@ public final class KafkaServiceFactory {
if (instance == null) {
instance = builder();
- instance.addLocalMapping(() -> new SingletonKafkaService(new ContainerLocalKafkaService(), "kafka"))
+ instance.addLocalMapping(
+ () -> new SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka"))
.addRemoteMapping(RemoteKafkaService::new)
.addMapping("local-kafka3-container",
() -> new SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka3"))
+ .addMapping("local-kafka2-container",
+ () -> new SingletonKafkaService(new ContainerLocalKafkaService(), "kafka2"))
.addMapping("local-strimzi-container",
() -> new SingletonKafkaService(new StrimziService(), "strimzi"));
[camel] 02/02: (chores) camel-kafka: defaults to running the tests with Kafka 3.x
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91942ca36de48e06f201c25994f594ee3ce2e061
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Aug 5 11:16:51 2022 +0200
(chores) camel-kafka: defaults to running the tests with Kafka 3.x
Also, disable Kafka 2.x backwards compatibility tests on ARM because there are no Kafka 2.x images for this architecture
---
components/camel-kafka/pom.xml | 60 +++++++++++++++++++++++++++++-------------
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 6f56ef02ec0..b25d7acb729 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -135,24 +136,47 @@
<configuration>
<reuseForks>true</reuseForks>
</configuration>
- <executions>
- <execution>
- <id>kafka-3</id>
- <configuration>
- <systemPropertyVariables>
- <kafka.instance.type>local-kafka3-container</kafka.instance.type>
- </systemPropertyVariables>
- <reuseForks>true</reuseForks>
- <reportNameSuffix>kafka-3</reportNameSuffix>
- </configuration>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
-
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>arm</id>
+ <activation>
+ <os>
+ <arch>!aarch64</arch>
+ </os>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>kafka-2</id>
+ <configuration>
+ <skipITs>${isKafkaCompatible}</skipITs>
+ <systemPropertyVariables>
+ <kafka.instance.type>local-kafka2-container</kafka.instance.type>
+ </systemPropertyVariables>
+ <reuseForks>true</reuseForks>
+ <reportNameSuffix>kafka-2</reportNameSuffix>
+ </configuration>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>