This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f3f1bc071e NIFI-14546 Moved Kafka3ConnectionService to
nifi-kafka-service-shared
f3f1bc071e is described below
commit f3f1bc071e169b0286a1de053467c5530697e7d1
Author: exceptionfactory <[email protected]>
AuthorDate: Tue May 13 21:45:00 2025 -0500
NIFI-14546 Moved Kafka3ConnectionService to nifi-kafka-service-shared
- Downgraded Kafka Clients from 4.0.0 to 3.9.0
- Updated nifi-kafka-3-service to depend on nifi-kafka-service-shared
- Updated nifi-kafka-service-aws to depend on nifi-kafka-service-shared
Signed-off-by: Pierre Villard <[email protected]>
This closes #9943.
---
.../nifi-kafka-bundle/nifi-kafka-3-service/pom.xml | 53 +---------------------
.../nifi-kafka-service-aws/pom.xml | 4 +-
.../pom.xml | 4 +-
.../kafka/service/Kafka3ConnectionService.java | 0
.../service/consumer/Kafka3ConsumerService.java | 0
.../nifi/kafka/service/consumer/Subscription.java | 0
.../service/producer/Kafka3ProducerService.java | 0
.../kafka/service/producer/ProducerCallback.java | 0
.../KafkaNonTransactionalProducerWrapper.java | 0
.../producer/transaction/KafkaProducerWrapper.java | 0
.../KafkaTransactionalProducerWrapper.java | 0
.../service/Kafka3ConnectionServiceBaseIT.java | 0
.../service/Kafka3ConnectionServiceSSLIT.java | 0
.../Kafka3ConnectionServiceSaslPlaintextIT.java | 0
.../nifi/kafka/service/KafkaConnectivityIT.java | 0
.../src/test/resources/simplelogger.properties | 0
nifi-extension-bundles/nifi-kafka-bundle/pom.xml | 2 +-
17 files changed, 6 insertions(+), 57 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
index 394f130a70..69b9d5d143 100644
--- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
+++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
@@ -28,59 +28,8 @@
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-kafka-service-api</artifactId>
+ <artifactId>nifi-kafka-service-shared</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-ssl-context-service-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-kerberos-user-service-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-kafka-shared</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${testcontainers.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
- <version>${testcontainers.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka4.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-cert-builder</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-ssl</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
index 7f703509fb..7f8df273e0 100644
--- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
+++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
@@ -35,7 +35,7 @@
<!-- Kafka Service implementation required for extending the
Controller Service class -->
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-kafka-3-service</artifactId>
+ <artifactId>nifi-kafka-service-shared</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Controller Service API modules required for extending
Kafka3ConnectionService -->
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka4.version}</version>
+ <version>${kafka3.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.msk</groupId>
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/pom.xml
similarity index 97%
copy from nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
copy to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/pom.xml
index 394f130a70..6be1b7549a 100644
--- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml
+++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/pom.xml
@@ -22,7 +22,7 @@
<version>2.5.0-SNAPSHOT</version>
</parent>
- <artifactId>nifi-kafka-3-service</artifactId>
+ <artifactId>nifi-kafka-service-shared</artifactId>
<packaging>jar</packaging>
<dependencies>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka4.version}</version>
+ <version>${kafka3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerService.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerService.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerService.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerService.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/consumer/Subscription.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/consumer/Subscription.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/consumer/Subscription.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/consumer/Subscription.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/Kafka3ProducerService.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/Kafka3ProducerService.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/Kafka3ProducerService.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/Kafka3ProducerService.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/ProducerCallback.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/ProducerCallback.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/ProducerCallback.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/ProducerCallback.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaNonTransactionalProducerWrapper.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaNonTransactionalProducerWrapper.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaNonTransactionalProducerWrapper.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaNonTransactionalProducerWrapper.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaProducerWrapper.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaProducerWrapper.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaProducerWrapper.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaProducerWrapper.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaTransactionalProducerWrapper.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaTransactionalProducerWrapper.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaTransactionalProducerWrapper.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/producer/transaction/KafkaTransactionalProducerWrapper.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/KafkaConnectivityIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/KafkaConnectivityIT.java
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/java/org/apache/nifi/kafka/service/KafkaConnectivityIT.java
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/KafkaConnectivityIT.java
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/resources/simplelogger.properties
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/resources/simplelogger.properties
similarity index 100%
rename from
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/test/resources/simplelogger.properties
rename to
nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/resources/simplelogger.properties
diff --git a/nifi-extension-bundles/nifi-kafka-bundle/pom.xml
b/nifi-extension-bundles/nifi-kafka-bundle/pom.xml
index 32ef4726e7..37588c78ea 100644
--- a/nifi-extension-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-kafka-bundle/pom.xml
@@ -27,7 +27,6 @@
<skip.integration.tests>false</skip.integration.tests>
<skip.unit.tests>false</skip.unit.tests>
<kafka3.version>3.9.0</kafka3.version>
- <kafka4.version>4.0.0</kafka4.version>
</properties>
<modules>
@@ -41,6 +40,7 @@
<module>nifi-kafka-service-api</module>
<module>nifi-kafka-service-aws</module>
<module>nifi-kafka-service-aws-nar</module>
+ <module>nifi-kafka-service-shared</module>
<module>nifi-kafka-shared</module>
</modules>
