NIFI-11259 - nifi-extension-bundles refactor

apache · May 16, 2024 · 70fa670 · 70fa670
1 parent 38cbf45
commit 70fa670
Show file tree

Hide file tree

Showing 148 changed files with 11 additions and 1 deletion.
diff --git a/...bundle/nifi-kafka-2-6-integration/pom.xml → ...bundle/nifi-kafka-2-6-integration/pom.xml b/...bundle/nifi-kafka-2-6-integration/pom.xml → ...bundle/nifi-kafka-2-6-integration/pom.xml
diff --git a/...ume/it/ConsumeKafkaDemarcator_2_6_IT.java → ...ume/it/ConsumeKafkaDemarcator_2_6_IT.java b/...ume/it/ConsumeKafkaDemarcator_2_6_IT.java → ...ume/it/ConsumeKafkaDemarcator_2_6_IT.java
diff --git a/...consume/it/ConsumeKafkaRecord_2_6_IT.java → ...consume/it/ConsumeKafkaRecord_2_6_IT.java b/...consume/it/ConsumeKafkaRecord_2_6_IT.java → ...consume/it/ConsumeKafkaRecord_2_6_IT.java
diff --git a/.../it/ConsumeKafkaWrapperRecord_2_6_IT.java → .../it/ConsumeKafkaWrapperRecord_2_6_IT.java b/.../it/ConsumeKafkaWrapperRecord_2_6_IT.java → .../it/ConsumeKafkaWrapperRecord_2_6_IT.java
diff --git a/...a/consume/it/ConsumeKafka_2_6_BaseIT.java → ...a/consume/it/ConsumeKafka_2_6_BaseIT.java b/...a/consume/it/ConsumeKafka_2_6_BaseIT.java → ...a/consume/it/ConsumeKafka_2_6_BaseIT.java
diff --git a/...kafka/consume/it/ConsumeKafka_2_6_IT.java → ...kafka/consume/it/ConsumeKafka_2_6_IT.java b/...kafka/consume/it/ConsumeKafka_2_6_IT.java → ...kafka/consume/it/ConsumeKafka_2_6_IT.java
diff --git a/...publish/it/PublishKafkaRecord_2_6_IT.java → ...publish/it/PublishKafkaRecord_2_6_IT.java b/...publish/it/PublishKafkaRecord_2_6_IT.java → ...publish/it/PublishKafkaRecord_2_6_IT.java
diff --git a/...a/publish/it/PublishKafka_2_6_BaseIT.java → ...a/publish/it/PublishKafka_2_6_BaseIT.java b/...a/publish/it/PublishKafka_2_6_BaseIT.java → ...a/publish/it/PublishKafka_2_6_BaseIT.java
diff --git a/...kafka/publish/it/PublishKafka_2_6_IT.java → ...kafka/publish/it/PublishKafka_2_6_IT.java b/...kafka/publish/it/PublishKafka_2_6_IT.java → ...kafka/publish/it/PublishKafka_2_6_IT.java
diff --git a/...PublishKafka_2_6_PartitionStrategyIT.java → ...PublishKafka_2_6_PartitionStrategyIT.java b/...PublishKafka_2_6_PartitionStrategyIT.java → ...PublishKafka_2_6_PartitionStrategyIT.java
diff --git a/...ocessors/kafka/pubsub/KafkaProcessor.java → ...ocessors/kafka/pubsub/KafkaProcessor.java b/...ocessors/kafka/pubsub/KafkaProcessor.java → ...ocessors/kafka/pubsub/KafkaProcessor.java
diff --git a/...che/nifi/processors/kafka/publish/ff.json → ...che/nifi/processors/kafka/publish/ff.json b/...che/nifi/processors/kafka/publish/ff.json → ...che/nifi/processors/kafka/publish/ff.json
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties
diff --git a/...bundle/nifi-kafka-3-integration/README.md → ...bundle/nifi-kafka-3-integration/README.md b/...bundle/nifi-kafka-3-integration/README.md → ...bundle/nifi-kafka-3-integration/README.md
diff --git a/...a-bundle/nifi-kafka-3-integration/pom.xml → ...a-bundle/nifi-kafka-3-integration/pom.xml b/...a-bundle/nifi-kafka-3-integration/pom.xml → ...a-bundle/nifi-kafka-3-integration/pom.xml
@@ -48,6 +48,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...ka/processors/AbstractConsumeKafkaIT.java → ...ka/processors/AbstractConsumeKafkaIT.java b/...ka/processors/AbstractConsumeKafkaIT.java → ...ka/processors/AbstractConsumeKafkaIT.java
diff --git a/...kafka/processors/AbstractKafkaBaseIT.java → ...kafka/processors/AbstractKafkaBaseIT.java b/...kafka/processors/AbstractKafkaBaseIT.java → ...kafka/processors/AbstractKafkaBaseIT.java
diff --git a/...ka/processors/AbstractPublishKafkaIT.java → ...ka/processors/AbstractPublishKafkaIT.java b/...ka/processors/AbstractPublishKafkaIT.java → ...ka/processors/AbstractPublishKafkaIT.java
diff --git a/.../processors/ConsumeKafkaDemarcatorIT.java → .../processors/ConsumeKafkaDemarcatorIT.java b/.../processors/ConsumeKafkaDemarcatorIT.java → .../processors/ConsumeKafkaDemarcatorIT.java
diff --git a/...nifi/kafka/processors/ConsumeKafkaIT.java → ...nifi/kafka/processors/ConsumeKafkaIT.java b/...nifi/kafka/processors/ConsumeKafkaIT.java → ...nifi/kafka/processors/ConsumeKafkaIT.java
diff --git a/...rocessors/ConsumeKafkaKeyAttributeIT.java → ...rocessors/ConsumeKafkaKeyAttributeIT.java b/...rocessors/ConsumeKafkaKeyAttributeIT.java → ...rocessors/ConsumeKafkaKeyAttributeIT.java
diff --git a/...fka/processors/ConsumeKafkaOffsetsIT.java → ...fka/processors/ConsumeKafkaOffsetsIT.java b/...fka/processors/ConsumeKafkaOffsetsIT.java → ...fka/processors/ConsumeKafkaOffsetsIT.java
diff --git a/...afka/processors/ConsumeKafkaRecordIT.java → ...afka/processors/ConsumeKafkaRecordIT.java b/...afka/processors/ConsumeKafkaRecordIT.java → ...afka/processors/ConsumeKafkaRecordIT.java
diff --git a/...ssors/ConsumeKafkaServiceLifecycleIT.java → ...ssors/ConsumeKafkaServiceLifecycleIT.java b/...ssors/ConsumeKafkaServiceLifecycleIT.java → ...ssors/ConsumeKafkaServiceLifecycleIT.java
diff --git a/...ocessors/ConsumeKafkaWrapperRecordIT.java → ...ocessors/ConsumeKafkaWrapperRecordIT.java b/...ocessors/ConsumeKafkaWrapperRecordIT.java → ...ocessors/ConsumeKafkaWrapperRecordIT.java
diff --git a/...cessors/PublishKafkaAcksBestEffortIT.java → ...cessors/PublishKafkaAcksBestEffortIT.java b/...cessors/PublishKafkaAcksBestEffortIT.java → ...cessors/PublishKafkaAcksBestEffortIT.java
diff --git a/...processors/PublishKafkaAcksOneNodeIT.java → ...processors/PublishKafkaAcksOneNodeIT.java b/...processors/PublishKafkaAcksOneNodeIT.java → ...processors/PublishKafkaAcksOneNodeIT.java
diff --git a/...sors/PublishKafkaAuthSaslPlaintextIT.java → ...sors/PublishKafkaAuthSaslPlaintextIT.java b/...sors/PublishKafkaAuthSaslPlaintextIT.java → ...sors/PublishKafkaAuthSaslPlaintextIT.java
diff --git a/...rocessors/PublishKafkaCompressGZIPIT.java → ...rocessors/PublishKafkaCompressGZIPIT.java b/...rocessors/PublishKafkaCompressGZIPIT.java → ...rocessors/PublishKafkaCompressGZIPIT.java
diff --git a/...a/processors/PublishKafkaDelimitedIT.java → ...a/processors/PublishKafkaDelimitedIT.java b/...a/processors/PublishKafkaDelimitedIT.java → ...a/processors/PublishKafkaDelimitedIT.java
diff --git a/...essors/PublishKafkaFailureStrategyIT.java → ...essors/PublishKafkaFailureStrategyIT.java b/...essors/PublishKafkaFailureStrategyIT.java → ...essors/PublishKafkaFailureStrategyIT.java
diff --git a/...nifi/kafka/processors/PublishKafkaIT.java → ...nifi/kafka/processors/PublishKafkaIT.java b/...nifi/kafka/processors/PublishKafkaIT.java → ...nifi/kafka/processors/PublishKafkaIT.java
diff --git a/...sors/PublishKafkaPartitionStrategyIT.java → ...sors/PublishKafkaPartitionStrategyIT.java b/...sors/PublishKafkaPartitionStrategyIT.java → ...sors/PublishKafkaPartitionStrategyIT.java
diff --git a/...afka/processors/PublishKafkaRecordIT.java → ...afka/processors/PublishKafkaRecordIT.java b/...afka/processors/PublishKafkaRecordIT.java → ...afka/processors/PublishKafkaRecordIT.java
diff --git a/.../PublishKafkaRecordPartialHandlingIT.java → .../PublishKafkaRecordPartialHandlingIT.java b/.../PublishKafkaRecordPartialHandlingIT.java → .../PublishKafkaRecordPartialHandlingIT.java
diff --git a/...i/kafka/processors/PublishKafkaSSLIT.java → ...i/kafka/processors/PublishKafkaSSLIT.java b/...i/kafka/processors/PublishKafkaSSLIT.java → ...i/kafka/processors/PublishKafkaSSLIT.java
diff --git a/...processors/PublishKafkaValueRecordIT.java → ...processors/PublishKafkaValueRecordIT.java b/...processors/PublishKafkaValueRecordIT.java → ...processors/PublishKafkaValueRecordIT.java
diff --git a/...ocessors/PublishKafkaWrapperRecordIT.java → ...ocessors/PublishKafkaWrapperRecordIT.java b/...ocessors/PublishKafkaWrapperRecordIT.java → ...ocessors/PublishKafkaWrapperRecordIT.java
diff --git a/...rs/consume/ConsumeKafkaConfigureTest.java → ...rs/consume/ConsumeKafkaConfigureTest.java b/...rs/consume/ConsumeKafkaConfigureTest.java → ...rs/consume/ConsumeKafkaConfigureTest.java
diff --git a/...ors/publish/PublishKafkaMultipleFFIT.java → ...ors/publish/PublishKafkaMultipleFFIT.java b/...ors/publish/PublishKafkaMultipleFFIT.java → ...ors/publish/PublishKafkaMultipleFFIT.java
diff --git a/...h/additional/PublishKafkaContentX1IT.java → ...h/additional/PublishKafkaContentX1IT.java b/...h/additional/PublishKafkaContentX1IT.java → ...h/additional/PublishKafkaContentX1IT.java
diff --git a/...h/additional/PublishKafkaWrapperX1IT.java → ...h/additional/PublishKafkaWrapperX1IT.java b/...h/additional/PublishKafkaWrapperX1IT.java → ...h/additional/PublishKafkaWrapperX1IT.java
diff --git a/...h/additional/PublishKafkaWrapperX2IT.java → ...h/additional/PublishKafkaWrapperX2IT.java b/...h/additional/PublishKafkaWrapperX2IT.java → ...h/additional/PublishKafkaWrapperX2IT.java
diff --git a/...h/additional/PublishKafkaWrapperX3IT.java → ...h/additional/PublishKafkaWrapperX3IT.java b/...h/additional/PublishKafkaWrapperX3IT.java → ...h/additional/PublishKafkaWrapperX3IT.java
diff --git a/...h/additional/PublishKafkaWrapperX4IT.java → ...h/additional/PublishKafkaWrapperX4IT.java b/...h/additional/PublishKafkaWrapperX4IT.java → ...h/additional/PublishKafkaWrapperX4IT.java
diff --git a/...h/additional/PublishKafkaWrapperX5IT.java → ...h/additional/PublishKafkaWrapperX5IT.java b/...h/additional/PublishKafkaWrapperX5IT.java → ...h/additional/PublishKafkaWrapperX5IT.java
diff --git a/.../processors/publish/additional/readme.txt → .../processors/publish/additional/readme.txt b/.../processors/publish/additional/readme.txt → .../processors/publish/additional/readme.txt
diff --git a/.../dependency/PublishKafkaMultipleFFIT.java → .../dependency/PublishKafkaMultipleFFIT.java b/.../dependency/PublishKafkaMultipleFFIT.java → .../dependency/PublishKafkaMultipleFFIT.java
diff --git a/...cessors/publish/additional/contentX1.json → ...cessors/publish/additional/contentX1.json b/...cessors/publish/additional/contentX1.json → ...cessors/publish/additional/contentX1.json
diff --git a/...cessors/publish/additional/wrapperX1.json → ...cessors/publish/additional/wrapperX1.json b/...cessors/publish/additional/wrapperX1.json → ...cessors/publish/additional/wrapperX1.json
diff --git a/...cessors/publish/additional/wrapperX2.json → ...cessors/publish/additional/wrapperX2.json b/...cessors/publish/additional/wrapperX2.json → ...cessors/publish/additional/wrapperX2.json
diff --git a/...cessors/publish/additional/wrapperX3.json → ...cessors/publish/additional/wrapperX3.json b/...cessors/publish/additional/wrapperX3.json → ...cessors/publish/additional/wrapperX3.json
diff --git a/...cessors/publish/additional/wrapperX4.json → ...cessors/publish/additional/wrapperX4.json b/...cessors/publish/additional/wrapperX4.json → ...cessors/publish/additional/wrapperX4.json
diff --git a/...cessors/publish/additional/wrapperX5.json → ...cessors/publish/additional/wrapperX5.json b/...cessors/publish/additional/wrapperX5.json → ...cessors/publish/additional/wrapperX5.json
diff --git a/...che/nifi/kafka/processors/publish/ff.json → ...che/nifi/kafka/processors/publish/ff.json b/...che/nifi/kafka/processors/publish/ff.json → ...che/nifi/kafka/processors/publish/ff.json
diff --git a/...nifi/kafka/processors/publish/ff.not.json → ...nifi/kafka/processors/publish/ff.not.json b/...nifi/kafka/processors/publish/ff.not.json → ...nifi/kafka/processors/publish/ff.not.json
diff --git a/.../kafka/processors/publish/ff.partial.json → .../kafka/processors/publish/ff.partial.json b/.../kafka/processors/publish/ff.partial.json → .../kafka/processors/publish/ff.partial.json
diff --git a/...ifi/kafka/processors/publish/ffvalue.json → ...ifi/kafka/processors/publish/ffvalue.json b/...ifi/kafka/processors/publish/ffvalue.json → ...ifi/kafka/processors/publish/ffvalue.json
diff --git a/...i/kafka/processors/publish/ffwrapper.json → ...i/kafka/processors/publish/ffwrapper.json b/...i/kafka/processors/publish/ffwrapper.json → ...i/kafka/processors/publish/ffwrapper.json
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties
diff --git a/...a-bundle/nifi-kafka-3-service-nar/pom.xml → ...a-bundle/nifi-kafka-3-service-nar/pom.xml b/...a-bundle/nifi-kafka-3-service-nar/pom.xml → ...a-bundle/nifi-kafka-3-service-nar/pom.xml
diff --git a/...fka-bundle/nifi-kafka-3-service/README.md → ...fka-bundle/nifi-kafka-3-service/README.md b/...fka-bundle/nifi-kafka-3-service/README.md → ...fka-bundle/nifi-kafka-3-service/README.md
diff --git a/...kafka-bundle/nifi-kafka-3-service/pom.xml → ...kafka-bundle/nifi-kafka-3-service/pom.xml b/...kafka-bundle/nifi-kafka-3-service/pom.xml → ...kafka-bundle/nifi-kafka-3-service/pom.xml
@@ -82,11 +82,12 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>3.2.3</version>
+            <version>3.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-ssl-context-service</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <!-- Included for nifi-utils StringUtils -->
@@ -95,5 +96,10 @@
             <artifactId>nifi-property-utils</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...afka/service/Kafka3ConnectionService.java → ...afka/service/Kafka3ConnectionService.java b/...afka/service/Kafka3ConnectionService.java → ...afka/service/Kafka3ConnectionService.java
diff --git a/...a/service/consumer/ConsumerException.java → ...a/service/consumer/ConsumerException.java b/...a/service/consumer/ConsumerException.java → ...a/service/consumer/ConsumerException.java
diff --git a/...rvice/consumer/Kafka3ConsumerService.java → ...rvice/consumer/Kafka3ConsumerService.java b/...rvice/consumer/Kafka3ConsumerService.java → ...rvice/consumer/Kafka3ConsumerService.java
diff --git a/...ervice/consumer/pool/ConsumerFactory.java → ...ervice/consumer/pool/ConsumerFactory.java b/...ervice/consumer/pool/ConsumerFactory.java → ...ervice/consumer/pool/ConsumerFactory.java
diff --git a/...ice/consumer/pool/ConsumerObjectPool.java → ...ice/consumer/pool/ConsumerObjectPool.java b/...ice/consumer/pool/ConsumerObjectPool.java → ...ice/consumer/pool/ConsumerObjectPool.java
diff --git a/...mer/pool/ConsumerPooledObjectFactory.java → ...mer/pool/ConsumerPooledObjectFactory.java b/...mer/pool/ConsumerPooledObjectFactory.java → ...mer/pool/ConsumerPooledObjectFactory.java
diff --git a/...onsumer/pool/StandardConsumerFactory.java → ...onsumer/pool/StandardConsumerFactory.java b/...onsumer/pool/StandardConsumerFactory.java → ...onsumer/pool/StandardConsumerFactory.java
diff --git a/...a/service/consumer/pool/Subscription.java → ...a/service/consumer/pool/Subscription.java b/...a/service/consumer/pool/Subscription.java → ...a/service/consumer/pool/Subscription.java
diff --git a/...rvice/producer/Kafka3ProducerService.java → ...rvice/producer/Kafka3ProducerService.java b/...rvice/producer/Kafka3ProducerService.java → ...rvice/producer/Kafka3ProducerService.java
diff --git a/...ka/service/producer/ProducerCallback.java → ...ka/service/producer/ProducerCallback.java b/...ka/service/producer/ProducerCallback.java → ...ka/service/producer/ProducerCallback.java
diff --git a/...KafkaNonTransactionalProducerWrapper.java → ...KafkaNonTransactionalProducerWrapper.java b/...KafkaNonTransactionalProducerWrapper.java → ...KafkaNonTransactionalProducerWrapper.java
diff --git a/...ce/producer/txn/KafkaProducerWrapper.java → ...ce/producer/txn/KafkaProducerWrapper.java b/...ce/producer/txn/KafkaProducerWrapper.java → ...ce/producer/txn/KafkaProducerWrapper.java
diff --git a/...xn/KafkaTransactionalProducerWrapper.java → ...xn/KafkaTransactionalProducerWrapper.java b/...xn/KafkaTransactionalProducerWrapper.java → ...xn/KafkaTransactionalProducerWrapper.java
diff --git a/....apache.nifi.controller.ControllerService → ....apache.nifi.controller.ControllerService b/....apache.nifi.controller.ControllerService → ....apache.nifi.controller.ControllerService
diff --git a/...ervice/Kafka3ConnectionServiceBaseIT.java → ...ervice/Kafka3ConnectionServiceBaseIT.java b/...ervice/Kafka3ConnectionServiceBaseIT.java → ...ervice/Kafka3ConnectionServiceBaseIT.java
diff --git a/...service/Kafka3ConnectionServiceSSLIT.java → ...service/Kafka3ConnectionServiceSSLIT.java b/...service/Kafka3ConnectionServiceSSLIT.java → ...service/Kafka3ConnectionServiceSSLIT.java
diff --git a/...fka3ConnectionServiceSaslPlaintextIT.java → ...fka3ConnectionServiceSaslPlaintextIT.java b/...fka3ConnectionServiceSaslPlaintextIT.java → ...fka3ConnectionServiceSaslPlaintextIT.java
diff --git a/...fi/kafka/service/KafkaConnectivityIT.java → ...fi/kafka/service/KafkaConnectivityIT.java b/...fi/kafka/service/KafkaConnectivityIT.java → ...fi/kafka/service/KafkaConnectivityIT.java
diff --git a/...pool/ConsumerPooledObjectFactoryTest.java → ...pool/ConsumerPooledObjectFactoryTest.java b/...pool/ConsumerPooledObjectFactoryTest.java → ...pool/ConsumerPooledObjectFactoryTest.java
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/test/resources/simplelogger.properties
diff --git a/...-kafka-bundle/nifi-kafka-jacoco/README.md → ...-kafka-bundle/nifi-kafka-jacoco/README.md b/...-kafka-bundle/nifi-kafka-jacoco/README.md → ...-kafka-bundle/nifi-kafka-jacoco/README.md
diff --git a/...fi-kafka-bundle/nifi-kafka-jacoco/pom.xml → ...fi-kafka-bundle/nifi-kafka-jacoco/pom.xml b/...fi-kafka-bundle/nifi-kafka-jacoco/pom.xml → ...fi-kafka-bundle/nifi-kafka-jacoco/pom.xml
diff --git a/.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml → .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml b/.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml → .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml
diff --git a/...afka-bundle/nifi-kafka-processors/pom.xml → ...afka-bundle/nifi-kafka-processors/pom.xml b/...afka-bundle/nifi-kafka-processors/pom.xml → ...afka-bundle/nifi-kafka-processors/pom.xml
@@ -54,6 +54,7 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-kafka-shared</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>

diff --git a/...e/nifi/kafka/processors/ConsumeKafka.java → ...e/nifi/kafka/processors/ConsumeKafka.java b/...e/nifi/kafka/processors/ConsumeKafka.java → ...e/nifi/kafka/processors/ConsumeKafka.java
diff --git a/...e/nifi/kafka/processors/PublishKafka.java → ...e/nifi/kafka/processors/PublishKafka.java b/...e/nifi/kafka/processors/PublishKafka.java → ...e/nifi/kafka/processors/PublishKafka.java
diff --git a/...i/kafka/processors/common/KafkaUtils.java → ...i/kafka/processors/common/KafkaUtils.java b/...i/kafka/processors/common/KafkaUtils.java → ...i/kafka/processors/common/KafkaUtils.java
diff --git a/...ka/processors/consumer/OffsetTracker.java → ...ka/processors/consumer/OffsetTracker.java b/...ka/processors/consumer/OffsetTracker.java → ...ka/processors/consumer/OffsetTracker.java
diff --git a/...ocessors/consumer/ProcessingStrategy.java → ...ocessors/consumer/ProcessingStrategy.java b/...ocessors/consumer/ProcessingStrategy.java → ...ocessors/consumer/ProcessingStrategy.java
diff --git a/...processors/consumer/bundle/BundleKey.java → ...processors/consumer/bundle/BundleKey.java b/...processors/consumer/bundle/BundleKey.java → ...processors/consumer/bundle/BundleKey.java
diff --git a/...ocessors/consumer/bundle/BundleValue.java → ...ocessors/consumer/bundle/BundleValue.java b/...ocessors/consumer/bundle/BundleValue.java → ...ocessors/consumer/bundle/BundleValue.java
diff --git a/...rs/consumer/bundle/ByteRecordBundler.java → ...rs/consumer/bundle/ByteRecordBundler.java b/...rs/consumer/bundle/ByteRecordBundler.java → ...rs/consumer/bundle/ByteRecordBundler.java
diff --git a/.../FlowFileStreamKafkaMessageConverter.java → .../FlowFileStreamKafkaMessageConverter.java b/.../FlowFileStreamKafkaMessageConverter.java → .../FlowFileStreamKafkaMessageConverter.java
diff --git a/...nsumer/convert/KafkaMessageConverter.java → ...nsumer/convert/KafkaMessageConverter.java b/...nsumer/convert/KafkaMessageConverter.java → ...nsumer/convert/KafkaMessageConverter.java
diff --git a/...rt/RecordStreamKafkaMessageConverter.java → ...rt/RecordStreamKafkaMessageConverter.java b/...rt/RecordStreamKafkaMessageConverter.java → ...rt/RecordStreamKafkaMessageConverter.java
diff --git a/...perRecordStreamKafkaMessageConverter.java → ...perRecordStreamKafkaMessageConverter.java b/...perRecordStreamKafkaMessageConverter.java → ...perRecordStreamKafkaMessageConverter.java
diff --git a/...onsumer/wrapper/ConsumeWrapperRecord.java → ...onsumer/wrapper/ConsumeWrapperRecord.java b/...onsumer/wrapper/ConsumeWrapperRecord.java → ...onsumer/wrapper/ConsumeWrapperRecord.java
diff --git a/...sumer/wrapper/WrapperRecordKeyReader.java → ...sumer/wrapper/WrapperRecordKeyReader.java b/...sumer/wrapper/WrapperRecordKeyReader.java → ...sumer/wrapper/WrapperRecordKeyReader.java
diff --git a/...essors/producer/common/ProducerUtils.java → ...essors/producer/common/ProducerUtils.java b/...essors/producer/common/ProducerUtils.java → ...essors/producer/common/ProducerUtils.java
diff --git a/...ors/producer/common/PublishKafkaUtil.java → ...ors/producer/common/PublishKafkaUtil.java b/...ors/producer/common/PublishKafkaUtil.java → ...ors/producer/common/PublishKafkaUtil.java
diff --git a/...rs/producer/config/DeliveryGuarantee.java → ...rs/producer/config/DeliveryGuarantee.java b/...rs/producer/config/DeliveryGuarantee.java → ...rs/producer/config/DeliveryGuarantee.java
diff --git a/.../DelimitedStreamKafkaRecordConverter.java → .../DelimitedStreamKafkaRecordConverter.java b/.../DelimitedStreamKafkaRecordConverter.java → .../DelimitedStreamKafkaRecordConverter.java
diff --git a/...t/FlowFileStreamKafkaRecordConverter.java → ...t/FlowFileStreamKafkaRecordConverter.java b/...t/FlowFileStreamKafkaRecordConverter.java → ...t/FlowFileStreamKafkaRecordConverter.java
diff --git a/...roducer/convert/KafkaRecordConverter.java → ...roducer/convert/KafkaRecordConverter.java b/...roducer/convert/KafkaRecordConverter.java → ...roducer/convert/KafkaRecordConverter.java
diff --git a/...ert/RecordStreamKafkaRecordConverter.java → ...ert/RecordStreamKafkaRecordConverter.java b/...ert/RecordStreamKafkaRecordConverter.java → ...ert/RecordStreamKafkaRecordConverter.java
diff --git a/...ordWrapperStreamKafkaRecordConverter.java → ...ordWrapperStreamKafkaRecordConverter.java b/...ordWrapperStreamKafkaRecordConverter.java → ...ordWrapperStreamKafkaRecordConverter.java
diff --git a/...ucer/header/AttributesHeadersFactory.java → ...ucer/header/AttributesHeadersFactory.java b/...ucer/header/AttributesHeadersFactory.java → ...ucer/header/AttributesHeadersFactory.java
diff --git a/...ssors/producer/header/HeadersFactory.java → ...ssors/producer/header/HeadersFactory.java b/...ssors/producer/header/HeadersFactory.java → ...ssors/producer/header/HeadersFactory.java
diff --git a/...ors/producer/key/AttributeKeyFactory.java → ...ors/producer/key/AttributeKeyFactory.java b/...ors/producer/key/AttributeKeyFactory.java → ...ors/producer/key/AttributeKeyFactory.java
diff --git a/...a/processors/producer/key/KeyFactory.java → ...a/processors/producer/key/KeyFactory.java b/...a/processors/producer/key/KeyFactory.java → ...a/processors/producer/key/KeyFactory.java
diff --git a/...ssors/producer/key/MessageKeyFactory.java → ...ssors/producer/key/MessageKeyFactory.java b/...ssors/producer/key/MessageKeyFactory.java → ...ssors/producer/key/MessageKeyFactory.java
diff --git a/...rs/producer/value/RecordValueFactory.java → ...rs/producer/value/RecordValueFactory.java b/...rs/producer/value/RecordValueFactory.java → ...rs/producer/value/RecordValueFactory.java
diff --git a/...ocessors/producer/value/ValueFactory.java → ...ocessors/producer/value/ValueFactory.java b/...ocessors/producer/value/ValueFactory.java → ...ocessors/producer/value/ValueFactory.java
diff --git a/...roducer/wrapper/RecordFieldConverter.java → ...roducer/wrapper/RecordFieldConverter.java b/...roducer/wrapper/RecordFieldConverter.java → ...roducer/wrapper/RecordFieldConverter.java
diff --git a/...ducer/wrapper/RecordMetadataStrategy.java → ...ducer/wrapper/RecordMetadataStrategy.java b/...ducer/wrapper/RecordMetadataStrategy.java → ...ducer/wrapper/RecordMetadataStrategy.java
diff --git a/...ssors/producer/wrapper/WrapperRecord.java → ...ssors/producer/wrapper/WrapperRecord.java b/...ssors/producer/wrapper/WrapperRecord.java → ...ssors/producer/wrapper/WrapperRecord.java
diff --git a/...vices/org.apache.nifi.processor.Processor → ...vices/org.apache.nifi.processor.Processor b/...vices/org.apache.nifi.processor.Processor → ...vices/org.apache.nifi.processor.Processor
diff --git a/...fi/kafka/processors/ConsumeKafkaTest.java → ...fi/kafka/processors/ConsumeKafkaTest.java b/...fi/kafka/processors/ConsumeKafkaTest.java → ...fi/kafka/processors/ConsumeKafkaTest.java
diff --git a/...fi/kafka/processors/PublishKafkaTest.java → ...fi/kafka/processors/PublishKafkaTest.java b/...fi/kafka/processors/PublishKafkaTest.java → ...fi/kafka/processors/PublishKafkaTest.java
diff --git a/...producer/key/AttributeKeyFactoryTest.java → ...producer/key/AttributeKeyFactoryTest.java b/...producer/key/AttributeKeyFactoryTest.java → ...producer/key/AttributeKeyFactoryTest.java
diff --git a/...r/queueIn/PublishKafkaNoFlowFileTest.java → ...r/queueIn/PublishKafkaNoFlowFileTest.java b/...r/queueIn/PublishKafkaNoFlowFileTest.java → ...r/queueIn/PublishKafkaNoFlowFileTest.java
diff --git a/...s/producer/wrapper/WrapperRecordTest.java → ...s/producer/wrapper/WrapperRecordTest.java b/...s/producer/wrapper/WrapperRecordTest.java → ...s/producer/wrapper/WrapperRecordTest.java
diff --git a/...bundle/nifi-kafka-service-api-nar/pom.xml → ...bundle/nifi-kafka-service-api-nar/pom.xml b/...bundle/nifi-kafka-service-api-nar/pom.xml → ...bundle/nifi-kafka-service-api-nar/pom.xml
diff --git a/...fka-bundle/nifi-kafka-service-api/pom.xml → ...fka-bundle/nifi-kafka-service-api/pom.xml b/...fka-bundle/nifi-kafka-service-api/pom.xml → ...fka-bundle/nifi-kafka-service-api/pom.xml
@@ -22,9 +22,11 @@
     <artifactId>nifi-kafka-service-api</artifactId>
     <packaging>jar</packaging>
     <dependencies>
+<!--
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>
         </dependency>
+-->
     </dependencies>
 </project>
diff --git a/...a/service/api/KafkaConnectionService.java → ...a/service/api/KafkaConnectionService.java b/...a/service/api/KafkaConnectionService.java → ...a/service/api/KafkaConnectionService.java
diff --git a/...fka/service/api/common/OffsetSummary.java → ...fka/service/api/common/OffsetSummary.java b/...fka/service/api/common/OffsetSummary.java → ...fka/service/api/common/OffsetSummary.java
diff --git a/...ka/service/api/common/PartitionState.java → ...ka/service/api/common/PartitionState.java b/...ka/service/api/common/PartitionState.java → ...ka/service/api/common/PartitionState.java
diff --git a/...vice/api/common/ServiceConfiguration.java → ...vice/api/common/ServiceConfiguration.java b/...vice/api/common/ServiceConfiguration.java → ...vice/api/common/ServiceConfiguration.java
diff --git a/...ice/api/common/TopicPartitionSummary.java → ...ice/api/common/TopicPartitionSummary.java b/...ice/api/common/TopicPartitionSummary.java → ...ice/api/common/TopicPartitionSummary.java
diff --git a/...service/api/consumer/AutoOffsetReset.java → ...service/api/consumer/AutoOffsetReset.java b/...service/api/consumer/AutoOffsetReset.java → ...service/api/consumer/AutoOffsetReset.java
diff --git a/...e/api/consumer/ConsumerConfiguration.java → ...e/api/consumer/ConsumerConfiguration.java b/...e/api/consumer/ConsumerConfiguration.java → ...e/api/consumer/ConsumerConfiguration.java
diff --git a/...ce/api/consumer/KafkaConsumerService.java → ...ce/api/consumer/KafkaConsumerService.java b/...ce/api/consumer/KafkaConsumerService.java → ...ce/api/consumer/KafkaConsumerService.java
diff --git a/.../service/api/consumer/PollingContext.java → .../service/api/consumer/PollingContext.java b/.../service/api/consumer/PollingContext.java → .../service/api/consumer/PollingContext.java
diff --git a/.../service/api/consumer/PollingSummary.java → .../service/api/consumer/PollingSummary.java b/.../service/api/consumer/PollingSummary.java → .../service/api/consumer/PollingSummary.java
diff --git a/...afka/service/api/header/RecordHeader.java → ...afka/service/api/header/RecordHeader.java b/...afka/service/api/header/RecordHeader.java → ...afka/service/api/header/RecordHeader.java
diff --git a/.../service/api/producer/FlowFileResult.java → .../service/api/producer/FlowFileResult.java b/.../service/api/producer/FlowFileResult.java → .../service/api/producer/FlowFileResult.java
diff --git a/...ce/api/producer/KafkaProducerService.java → ...ce/api/producer/KafkaProducerService.java b/...ce/api/producer/KafkaProducerService.java → ...ce/api/producer/KafkaProducerService.java
diff --git a/...e/api/producer/ProducerConfiguration.java → ...e/api/producer/ProducerConfiguration.java b/...e/api/producer/ProducerConfiguration.java → ...e/api/producer/ProducerConfiguration.java
diff --git a/.../api/producer/ProducerRecordMetadata.java → .../api/producer/ProducerRecordMetadata.java b/.../api/producer/ProducerRecordMetadata.java → .../api/producer/ProducerRecordMetadata.java
diff --git a/.../service/api/producer/PublishContext.java → .../service/api/producer/PublishContext.java b/.../service/api/producer/PublishContext.java → .../service/api/producer/PublishContext.java
diff --git a/...a/service/api/producer/RecordSummary.java → ...a/service/api/producer/RecordSummary.java b/...a/service/api/producer/RecordSummary.java → ...a/service/api/producer/RecordSummary.java
diff --git a/.../kafka/service/api/record/ByteRecord.java → .../kafka/service/api/record/ByteRecord.java b/.../kafka/service/api/record/ByteRecord.java → .../kafka/service/api/record/ByteRecord.java
diff --git a/...kafka/service/api/record/KafkaRecord.java → ...kafka/service/api/record/KafkaRecord.java b/...kafka/service/api/record/KafkaRecord.java → ...kafka/service/api/record/KafkaRecord.java
diff --git a/...vice/api/producer/PublishContextTest.java → ...vice/api/producer/PublishContextTest.java b/...vice/api/producer/PublishContextTest.java → ...vice/api/producer/PublishContextTest.java
diff --git a/...ache/nifi/kafka/shared/util/Notifier.java → ...ache/nifi/kafka/shared/util/Notifier.java b/...ache/nifi/kafka/shared/util/Notifier.java → ...ache/nifi/kafka/shared/util/Notifier.java