This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 3f00e6419607f071d017f57a1889d25884d81833 Author: Croway <[email protected]> AuthorDate: Tue Mar 31 12:16:42 2026 +0200 Drop test-jar type from camel-test-infra deps and fix Kafka API rename camel-parent 4.19.0 moved all test-infra classes from src/test/java to src/main/java, so these modules no longer produce test-jar artifacts. Remove <type>test-jar</type> from all camel-test-infra-* dependencies. Also update AbstractKafkaTest to use the renamed kafkaContainer() method (was kafka3Container) and local-kafka-container mapping name (was local-cp-kafka-container). --- tests/itests-aws-v2/pom.xml | 2 -- tests/itests-azure-storage-blob/pom.xml | 3 --- tests/itests-azure-storage-queue/pom.xml | 3 --- tests/itests-cassandra/pom.xml | 2 -- .../java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java | 2 +- tests/itests-couchbase/pom.xml | 1 - tests/itests-cxf/pom.xml | 2 -- tests/itests-cxfrs/pom.xml | 2 -- tests/itests-elasticsearch/pom.xml | 2 -- tests/itests-google-pubsub/pom.xml | 2 -- tests/itests-jdbc/pom.xml | 2 -- tests/itests-mongodb/pom.xml | 2 -- tests/itests-netty-http/pom.xml | 1 - tests/itests-parent/pom.xml | 2 -- tests/itests-sjms2/pom.xml | 3 --- tests/itests-sql/pom.xml | 2 -- 16 files changed, 1 insertion(+), 32 deletions(-) diff --git a/tests/itests-aws-v2/pom.xml b/tests/itests-aws-v2/pom.xml index 0ca29da360..2dd016d217 100644 --- a/tests/itests-aws-v2/pom.xml +++ b/tests/itests-aws-v2/pom.xml @@ -41,7 +41,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-aws-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -49,7 +48,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-aws-v2</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-azure-storage-blob/pom.xml b/tests/itests-azure-storage-blob/pom.xml index 3773232f01..6190b7bb3f 100644 --- a/tests/itests-azure-storage-blob/pom.xml +++ b/tests/itests-azure-storage-blob/pom.xml @@ -86,7 +86,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -94,7 +93,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-azure-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -102,7 +100,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-azure-storage-blob</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-azure-storage-queue/pom.xml b/tests/itests-azure-storage-queue/pom.xml index 87f403c515..bddd09eb78 100644 --- a/tests/itests-azure-storage-queue/pom.xml +++ b/tests/itests-azure-storage-queue/pom.xml @@ -70,7 +70,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -78,7 +77,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-azure-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -86,7 +84,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-azure-storage-queue</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-cassandra/pom.xml b/tests/itests-cassandra/pom.xml index a7b3e65e7b..5b4f410451 100644 --- a/tests/itests-cassandra/pom.xml +++ b/tests/itests-cassandra/pom.xml @@ -42,7 +42,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -50,7 +49,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-cassandra</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java index b492e88dd3..344f74c694 100644 --- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java +++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java @@ -49,7 +49,7 @@ public abstract class AbstractKafkaTest { .addRemoteMapping(RemoteKafkaService::new) .addMapping("embedded", EmbeddedKafkaService::new) .addMapping("local-strimzi-container", StrimziService::new) - .addMapping("local-cp-kafka-container", ContainerLocalKafkaService::kafka3Container) + .addMapping("local-kafka-container", ContainerLocalKafkaService::kafkaContainer) .build(); kafkaService.initialize(); diff --git a/tests/itests-couchbase/pom.xml b/tests/itests-couchbase/pom.xml index 086d78ddc6..2ad7361749 100644 --- a/tests/itests-couchbase/pom.xml +++ b/tests/itests-couchbase/pom.xml @@ -41,7 +41,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-couchbase</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-cxf/pom.xml b/tests/itests-cxf/pom.xml index d664f02100..623275ea8e 100644 --- a/tests/itests-cxf/pom.xml +++ b/tests/itests-cxf/pom.xml @@ -41,14 +41,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-dispatch-router</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-cxfrs/pom.xml b/tests/itests-cxfrs/pom.xml index 84dfee7ec0..b32668d25c 100644 --- a/tests/itests-cxfrs/pom.xml +++ b/tests/itests-cxfrs/pom.xml @@ -41,14 +41,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-dispatch-router</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-elasticsearch/pom.xml b/tests/itests-elasticsearch/pom.xml index 8a33d0fb7e..9dfaafa5c9 100644 --- a/tests/itests-elasticsearch/pom.xml +++ b/tests/itests-elasticsearch/pom.xml @@ -42,14 +42,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-elasticsearch</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> <dependency> diff --git a/tests/itests-google-pubsub/pom.xml b/tests/itests-google-pubsub/pom.xml index 5814d505d1..b7bd5d6c38 100644 --- a/tests/itests-google-pubsub/pom.xml +++ b/tests/itests-google-pubsub/pom.xml @@ -42,7 +42,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -50,7 +49,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-google-pubsub</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-jdbc/pom.xml b/tests/itests-jdbc/pom.xml index d28e2ac399..b4a6ac8795 100644 --- a/tests/itests-jdbc/pom.xml +++ b/tests/itests-jdbc/pom.xml @@ -47,7 +47,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -55,7 +54,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-jdbc</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-mongodb/pom.xml b/tests/itests-mongodb/pom.xml index 2bf4e798bd..f95c2382ca 100644 --- a/tests/itests-mongodb/pom.xml +++ b/tests/itests-mongodb/pom.xml @@ -42,7 +42,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -50,7 +49,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-mongodb</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-netty-http/pom.xml b/tests/itests-netty-http/pom.xml index e0cf0e03d9..a8990f1d94 100644 --- a/tests/itests-netty-http/pom.xml +++ b/tests/itests-netty-http/pom.xml @@ -49,7 +49,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-parent/pom.xml b/tests/itests-parent/pom.xml index ef83c0e03d..16ff974dbf 100644 --- a/tests/itests-parent/pom.xml +++ b/tests/itests-parent/pom.xml @@ -69,7 +69,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -77,7 +76,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-kafka</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-sjms2/pom.xml b/tests/itests-sjms2/pom.xml index 6423d5c331..6c48bd2c0a 100644 --- a/tests/itests-sjms2/pom.xml +++ b/tests/itests-sjms2/pom.xml @@ -41,7 +41,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -49,7 +48,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-messaging-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -57,7 +55,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-dispatch-router</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/tests/itests-sql/pom.xml b/tests/itests-sql/pom.xml index ce4b8fa2e9..3799c86559 100644 --- a/tests/itests-sql/pom.xml +++ b/tests/itests-sql/pom.xml @@ -42,7 +42,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-common</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency> @@ -50,7 +49,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-infra-jdbc</artifactId> <version>${camel.version}</version> - <type>test-jar</type> <scope>test</scope> </dependency>
