apache · joewitt · Aug 9, 2024
diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-test-utils/pom.xml
@@ -64,11 +64,6 @@ language governing permissions and limitations under the License. -->
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-property-utils</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock</artifactId>

diff --git a/...processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java b/...processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestGetHDFSEvents.java
@@ -25,7 +25,6 @@
 import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.processors.hadoop.inotify.util.EventTestUtils;
 import org.apache.nifi.util.MockFlowFile;
-import org.apache.nifi.util.NiFiProperties;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.BeforeEach;
@@ -43,13 +42,11 @@
 import static org.mockito.Mockito.when;
 
 public class TestGetHDFSEvents {
-    NiFiProperties mockNiFiProperties;
     DFSInotifyEventInputStream inotifyEventInputStream;
     HdfsAdmin hdfsAdmin;
 
     @BeforeEach
     public void setup() {
-        mockNiFiProperties = mock(NiFiProperties.class);
         inotifyEventInputStream = mock(DFSInotifyEventInputStream.class);
         hdfsAdmin = mock(HdfsAdmin.class);
     }

diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/pom.xml b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/pom.xml
@@ -63,12 +63,6 @@
             <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-property-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>

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
@@ -86,11 +86,5 @@
             <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <!-- Included for nifi-utils StringUtils -->
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-property-utils</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
@@ -37,11 +37,6 @@
             <artifactId>nifi-utils</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-property-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>

diff --git a/...nifi-py4j-bundle/nifi-py4j-bridge/pom.xml → ...extension-bundle/nifi-py4j-bridge/pom.xml b/...nifi-py4j-bundle/nifi-py4j-bridge/pom.xml → ...extension-bundle/nifi-py4j-bridge/pom.xml
@@ -15,7 +15,7 @@
 -->
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>nifi-py4j-bundle</artifactId>
+        <artifactId>nifi-py4j-extension-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>

diff --git a/.../nifi/py4j/ProcessorCreationWorkflow.java → .../nifi/py4j/ProcessorCreationWorkflow.java b/.../nifi/py4j/ProcessorCreationWorkflow.java → .../nifi/py4j/ProcessorCreationWorkflow.java
diff --git a/...a/org/apache/nifi/py4j/PythonProcess.java → ...a/org/apache/nifi/py4j/PythonProcess.java b/...a/org/apache/nifi/py4j/PythonProcess.java → ...a/org/apache/nifi/py4j/PythonProcess.java
diff --git a/...che/nifi/py4j/PythonProcessLogReader.java → ...che/nifi/py4j/PythonProcessLogReader.java b/...che/nifi/py4j/PythonProcessLogReader.java → ...che/nifi/py4j/PythonProcessLogReader.java
diff --git a/.../nifi/py4j/StandardBoundObjectCounts.java → .../nifi/py4j/StandardBoundObjectCounts.java b/.../nifi/py4j/StandardBoundObjectCounts.java → .../nifi/py4j/StandardBoundObjectCounts.java
diff --git a/...pache/nifi/py4j/StandardPythonBridge.java → ...pache/nifi/py4j/StandardPythonBridge.java b/...pache/nifi/py4j/StandardPythonBridge.java → ...pache/nifi/py4j/StandardPythonBridge.java
diff --git a/...i/py4j/StandardPythonProcessorBridge.java → ...i/py4j/StandardPythonProcessorBridge.java b/...i/py4j/StandardPythonProcessorBridge.java → ...i/py4j/StandardPythonProcessorBridge.java
diff --git a/...ache/nifi/py4j/client/CommandBuilder.java → ...ache/nifi/py4j/client/CommandBuilder.java b/...ache/nifi/py4j/client/CommandBuilder.java → ...ache/nifi/py4j/client/CommandBuilder.java
diff --git a/.../nifi/py4j/client/JavaObjectBindings.java → .../nifi/py4j/client/JavaObjectBindings.java b/.../nifi/py4j/client/JavaObjectBindings.java → .../nifi/py4j/client/JavaObjectBindings.java
diff --git a/...e/nifi/py4j/client/NiFiPythonGateway.java → ...e/nifi/py4j/client/NiFiPythonGateway.java b/...e/nifi/py4j/client/NiFiPythonGateway.java → ...e/nifi/py4j/client/NiFiPythonGateway.java
diff --git a/.../apache/nifi/py4j/client/PythonProxy.java → .../apache/nifi/py4j/client/PythonProxy.java b/.../apache/nifi/py4j/client/PythonProxy.java → .../apache/nifi/py4j/client/PythonProxy.java
diff --git a/.../client/PythonProxyInvocationHandler.java → .../client/PythonProxyInvocationHandler.java b/.../client/PythonProxyInvocationHandler.java → .../client/PythonProxyInvocationHandler.java
diff --git a/...ifi/py4j/client/StandardPythonClient.java → ...ifi/py4j/client/StandardPythonClient.java b/...ifi/py4j/client/StandardPythonClient.java → ...ifi/py4j/client/StandardPythonClient.java
diff --git a/...ifi/py4j/logback/LevelChangeListener.java → ...ifi/py4j/logback/LevelChangeListener.java b/...ifi/py4j/logback/LevelChangeListener.java → ...ifi/py4j/logback/LevelChangeListener.java
diff --git a/...i/py4j/logging/LogLevelChangeHandler.java → ...i/py4j/logging/LogLevelChangeHandler.java b/...i/py4j/logging/LogLevelChangeHandler.java → ...i/py4j/logging/LogLevelChangeHandler.java
diff --git a/.../py4j/logging/LogLevelChangeListener.java → .../py4j/logging/LogLevelChangeListener.java b/.../py4j/logging/LogLevelChangeListener.java → .../py4j/logging/LogLevelChangeListener.java
diff --git a/...che/nifi/py4j/logging/PythonLogLevel.java → ...che/nifi/py4j/logging/PythonLogLevel.java b/...che/nifi/py4j/logging/PythonLogLevel.java → ...che/nifi/py4j/logging/PythonLogLevel.java
diff --git a/...ogging/StandardLogLevelChangeHandler.java → ...ogging/StandardLogLevelChangeHandler.java b/...ogging/StandardLogLevelChangeHandler.java → ...ogging/StandardLogLevelChangeHandler.java
diff --git a/...fi/py4j/server/NiFiGatewayConnection.java → ...fi/py4j/server/NiFiGatewayConnection.java b/...fi/py4j/server/NiFiGatewayConnection.java → ...fi/py4j/server/NiFiGatewayConnection.java
diff --git a/...e/nifi/py4j/server/NiFiGatewayServer.java → ...e/nifi/py4j/server/NiFiGatewayServer.java b/...e/nifi/py4j/server/NiFiGatewayServer.java → ...e/nifi/py4j/server/NiFiGatewayServer.java
diff --git a/...e/nifi/python/processor/AttributeMap.java → ...e/nifi/python/processor/AttributeMap.java b/...e/nifi/python/processor/AttributeMap.java → ...e/nifi/python/processor/AttributeMap.java
diff --git a/...i/python/processor/EmptyAttributeMap.java → ...i/python/processor/EmptyAttributeMap.java b/...i/python/processor/EmptyAttributeMap.java → ...i/python/processor/EmptyAttributeMap.java
diff --git a/...ython/processor/FlowFileAttributeMap.java → ...ython/processor/FlowFileAttributeMap.java b/...ython/processor/FlowFileAttributeMap.java → ...ython/processor/FlowFileAttributeMap.java
diff --git a/...nifi/python/processor/FlowFileSource.java → ...nifi/python/processor/FlowFileSource.java b/...nifi/python/processor/FlowFileSource.java → ...nifi/python/processor/FlowFileSource.java
diff --git a/...python/processor/FlowFileSourceProxy.java → ...python/processor/FlowFileSourceProxy.java b/...python/processor/FlowFileSourceProxy.java → ...python/processor/FlowFileSourceProxy.java
diff --git a/...ython/processor/FlowFileSourceResult.java → ...ython/processor/FlowFileSourceResult.java b/...ython/processor/FlowFileSourceResult.java → ...ython/processor/FlowFileSourceResult.java
diff --git a/...i/python/processor/FlowFileTransform.java → ...i/python/processor/FlowFileTransform.java b/...i/python/processor/FlowFileTransform.java → ...i/python/processor/FlowFileTransform.java
diff --git a/...hon/processor/FlowFileTransformProxy.java → ...hon/processor/FlowFileTransformProxy.java b/...hon/processor/FlowFileTransformProxy.java → ...hon/processor/FlowFileTransformProxy.java
diff --git a/...on/processor/FlowFileTransformResult.java → ...on/processor/FlowFileTransformResult.java b/...on/processor/FlowFileTransformResult.java → ...on/processor/FlowFileTransformResult.java
diff --git a/.../nifi/python/processor/InputFlowFile.java → .../nifi/python/processor/InputFlowFile.java b/.../nifi/python/processor/InputFlowFile.java → .../nifi/python/processor/InputFlowFile.java
diff --git a/...ython/processor/PythonProcessorProxy.java → ...ython/processor/PythonProcessorProxy.java b/...ython/processor/PythonProcessorProxy.java → ...ython/processor/PythonProcessorProxy.java
diff --git a/...ifi/python/processor/RecordTransform.java → ...ifi/python/processor/RecordTransform.java b/...ifi/python/processor/RecordTransform.java → ...ifi/python/processor/RecordTransform.java
diff --git a/...ython/processor/RecordTransformProxy.java → ...ython/processor/RecordTransformProxy.java b/...ython/processor/RecordTransformProxy.java → ...ython/processor/RecordTransformProxy.java
diff --git a/...thon/processor/RecordTransformResult.java → ...thon/processor/RecordTransformResult.java b/...thon/processor/RecordTransformResult.java → ...thon/processor/RecordTransformResult.java
diff --git a/...thon/processor/StandardInputFlowFile.java → ...thon/processor/StandardInputFlowFile.java b/...thon/processor/StandardInputFlowFile.java → ...thon/processor/StandardInputFlowFile.java
diff --git a/...thon/processor/StringMapAttributeMap.java → ...thon/processor/StringMapAttributeMap.java b/...thon/processor/StringMapAttributeMap.java → ...thon/processor/StringMapAttributeMap.java
diff --git a/...vices/org.apache.nifi.python.PythonBridge → ...vices/org.apache.nifi.python.PythonBridge b/...vices/org.apache.nifi.python.PythonBridge → ...vices/org.apache.nifi.python.PythonBridge
diff --git a/...nifi/py4j/PythonProcessLogReaderTest.java → ...nifi/py4j/PythonProcessLogReaderTest.java b/...nifi/py4j/PythonProcessLogReaderTest.java → ...nifi/py4j/PythonProcessLogReaderTest.java
diff --git a/...g/apache/nifi/py4j/PythonProcessTest.java → ...g/apache/nifi/py4j/PythonProcessTest.java b/...g/apache/nifi/py4j/PythonProcessTest.java → ...g/apache/nifi/py4j/PythonProcessTest.java
diff --git a/.../nifi/py4j/client/TestCommandBuilder.java → .../nifi/py4j/client/TestCommandBuilder.java b/.../nifi/py4j/client/TestCommandBuilder.java → .../nifi/py4j/client/TestCommandBuilder.java
diff --git a/...fi/py4j/client/TestNiFiPythonGateway.java → ...fi/py4j/client/TestNiFiPythonGateway.java b/...fi/py4j/client/TestNiFiPythonGateway.java → ...fi/py4j/client/TestNiFiPythonGateway.java
diff --git a/...py4j/logback/LevelChangeListenerTest.java → ...py4j/logback/LevelChangeListenerTest.java b/...py4j/logback/LevelChangeListenerTest.java → ...py4j/logback/LevelChangeListenerTest.java
diff --git a/...undle/nifi-py4j-integration-tests/pom.xml → ...undle/nifi-py4j-integration-tests/pom.xml b/...undle/nifi-py4j-integration-tests/pom.xml → ...undle/nifi-py4j-integration-tests/pom.xml
@@ -15,7 +15,7 @@
 -->
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>nifi-py4j-bundle</artifactId>
+        <artifactId>nifi-py4j-extension-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>

diff --git a/...i.py4j/PythonControllerInteractionIT.java → ...i.py4j/PythonControllerInteractionIT.java b/...i.py4j/PythonControllerInteractionIT.java → ...i.py4j/PythonControllerInteractionIT.java
diff --git a/...n-tests/src/test/resources/images/cup.jpg → ...n-tests/src/test/resources/images/cup.jpg b/...n-tests/src/test/resources/images/cup.jpg → ...n-tests/src/test/resources/images/cup.jpg
diff --git a/...t/resources/json/input/simple-person.json → ...t/resources/json/input/simple-person.json b/...t/resources/json/input/simple-person.json → ...t/resources/json/input/simple-person.json
diff --git a/...s/json/output/simple-person-pretty-2.json → ...s/json/output/simple-person-pretty-2.json b/...s/json/output/simple-person-pretty-2.json → ...s/json/output/simple-person-pretty-2.json
diff --git a/...s/json/output/simple-person-pretty-4.json → ...s/json/output/simple-person-pretty-4.json b/...s/json/output/simple-person-pretty-4.json → ...s/json/output/simple-person-pretty-4.json
diff --git a/...tests/src/test/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml b/...tests/src/test/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml
diff --git a/...es/nifi-py4j-bundle/nifi-py4j-nar/pom.xml → ...4j-extension-bundle/nifi-py4j-nar/pom.xml b/...es/nifi-py4j-bundle/nifi-py4j-nar/pom.xml → ...4j-extension-bundle/nifi-py4j-nar/pom.xml
@@ -18,7 +18,7 @@
 
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-py4j-bundle</artifactId>
+        <artifactId>nifi-py4j-extension-bundle</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...undle/nifi-python-test-extensions/pom.xml → ...undle/nifi-python-test-extensions/pom.xml b/...undle/nifi-python-test-extensions/pom.xml → ...undle/nifi-python-test-extensions/pom.xml
@@ -15,7 +15,7 @@
 -->
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>nifi-py4j-bundle</artifactId>
+        <artifactId>nifi-py4j-extension-bundle</artifactId>
         <groupId>org.apache.nifi</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>

diff --git a/...resources/extensions/ConvertCsvToExcel.py → ...resources/extensions/ConvertCsvToExcel.py b/...resources/extensions/ConvertCsvToExcel.py → ...resources/extensions/ConvertCsvToExcel.py
diff --git a/...in/resources/extensions/CreateFlowFile.py → ...in/resources/extensions/CreateFlowFile.py b/...in/resources/extensions/CreateFlowFile.py → ...in/resources/extensions/CreateFlowFile.py
diff --git a/...ain/resources/extensions/CreateNothing.py → ...ain/resources/extensions/CreateNothing.py b/...ain/resources/extensions/CreateNothing.py → ...ain/resources/extensions/CreateNothing.py
diff --git a/...sources/extensions/DetectObjectInImage.py → ...sources/extensions/DetectObjectInImage.py b/...sources/extensions/DetectObjectInImage.py → ...sources/extensions/DetectObjectInImage.py
diff --git a/...es/extensions/ExitAfterFourInvocations.py → ...es/extensions/ExitAfterFourInvocations.py b/...es/extensions/ExitAfterFourInvocations.py → ...es/extensions/ExitAfterFourInvocations.py
diff --git a/...esources/extensions/FailWithAttributes.py → ...esources/extensions/FailWithAttributes.py b/...esources/extensions/FailWithAttributes.py → ...esources/extensions/FailWithAttributes.py
diff --git a/...in/resources/extensions/GenerateRecord.py → ...in/resources/extensions/GenerateRecord.py b/...in/resources/extensions/GenerateRecord.py → ...in/resources/extensions/GenerateRecord.py
diff --git a/.../main/resources/extensions/LogContents.py → .../main/resources/extensions/LogContents.py b/.../main/resources/extensions/LogContents.py → .../main/resources/extensions/LogContents.py
diff --git a/...ain/resources/extensions/LookupAddress.py → ...ain/resources/extensions/LookupAddress.py b/...ain/resources/extensions/LookupAddress.py → ...ain/resources/extensions/LookupAddress.py
diff --git a/...in/resources/extensions/PopulateRecord.py → ...in/resources/extensions/PopulateRecord.py b/...in/resources/extensions/PopulateRecord.py → ...in/resources/extensions/PopulateRecord.py
diff --git a/...n/resources/extensions/PrettyPrintJson.py → ...n/resources/extensions/PrettyPrintJson.py b/...n/resources/extensions/PrettyPrintJson.py → ...n/resources/extensions/PrettyPrintJson.py
diff --git a/...ain/resources/extensions/RouteFlowFile.py → ...ain/resources/extensions/RouteFlowFile.py b/...ain/resources/extensions/RouteFlowFile.py → ...ain/resources/extensions/RouteFlowFile.py
diff --git a/...in/resources/extensions/SetRecordField.py → ...in/resources/extensions/SetRecordField.py b/...in/resources/extensions/SetRecordField.py → ...in/resources/extensions/SetRecordField.py
diff --git a/...main/resources/extensions/WriteMessage.py → ...main/resources/extensions/WriteMessage.py b/...main/resources/extensions/WriteMessage.py → ...main/resources/extensions/WriteMessage.py
diff --git a/...in/resources/extensions/WriteMessageV2.py → ...in/resources/extensions/WriteMessageV2.py b/...in/resources/extensions/WriteMessageV2.py → ...in/resources/extensions/WriteMessageV2.py
diff --git a/...resources/extensions/WriteNumpyVersion.py → ...resources/extensions/WriteNumpyVersion.py b/...resources/extensions/WriteNumpyVersion.py → ...resources/extensions/WriteNumpyVersion.py
diff --git a/...ces/extensions/WritePropertyToFlowFile.py → ...ces/extensions/WritePropertyToFlowFile.py b/...ces/extensions/WritePropertyToFlowFile.py → ...ces/extensions/WritePropertyToFlowFile.py
diff --git a/.../extensions/multi-module/ProcessorUtil.py → .../extensions/multi-module/ProcessorUtil.py b/.../extensions/multi-module/ProcessorUtil.py → .../extensions/multi-module/ProcessorUtil.py
diff --git a/...es/extensions/multi-module/WriteNumber.py → ...es/extensions/multi-module/WriteNumber.py b/...es/extensions/multi-module/WriteNumber.py → ...es/extensions/multi-module/WriteNumber.py
diff --git a/...i/src/main/python/src/nifiapi/__init__.py → ...urces/extensions/multi-module/__init__.py b/...i/src/main/python/src/nifiapi/__init__.py → ...urces/extensions/multi-module/__init__.py
diff --git a/...xtension-bundles/nifi-py4j-bundle/pom.xml → ...undles/nifi-py4j-extension-bundle/pom.xml b/...xtension-bundles/nifi-py4j-bundle/pom.xml → ...undles/nifi-py4j-extension-bundle/pom.xml
@@ -22,16 +22,14 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nifi-py4j-bundle</artifactId>
+    <artifactId>nifi-py4j-extension-bundle</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>nifi-python-framework-api</module>
         <module>nifi-py4j-bridge</module>
-        <module>nifi-python-framework</module>
-        <module>nifi-python-extension-api</module>
         <module>nifi-py4j-nar</module>
         <module>nifi-python-test-extensions</module>
         <module>nifi-py4j-integration-tests</module>
     </modules>
 </project>
+
diff --git a/nifi-extension-bundles/pom.xml b/nifi-extension-bundles/pom.xml
@@ -27,7 +27,6 @@
         <module>nifi-standard-shared-bundle</module>
         <module>nifi-hadoop-bundle</module>
         <module>nifi-hadoop-libraries-bundle</module>
-        <module>nifi-provenance-repository-bundle</module>
         <module>nifi-standard-bundle</module>
         <module>nifi-standard-services</module>
         <module>nifi-standard-services-api-bom</module>
@@ -44,9 +43,6 @@
         <module>nifi-media-bundle</module>
         <module>nifi-avro-bundle</module>
         <module>nifi-azure-bundle</module>
-        <module>nifi-ldap-iaa-providers-bundle</module>
-        <module>nifi-kerberos-iaa-providers-bundle</module>
-        <module>nifi-single-user-iaa-providers-bundle</module>
         <module>nifi-scripting-bundle</module>
         <module>nifi-elasticsearch-bundle</module>
         <module>nifi-amqp-bundle</module>
@@ -69,6 +65,7 @@
         <module>nifi-poi-bundle</module>
         <module>nifi-cdc</module>
         <module>nifi-parquet-bundle</module>
+        <module>nifi-py4j-extension-bundle</module>
         <module>nifi-extension-utils</module>
         <module>nifi-redis-bundle</module>
         <module>nifi-network-bundle</module>
@@ -92,12 +89,10 @@
         <module>nifi-jslt-bundle</module>
         <module>nifi-iotdb-bundle</module>
         <module>nifi-cipher-bundle</module>
-        <module>nifi-py4j-bundle</module>
         <module>nifi-compress-bundle</module>
         <module>nifi-opentelemetry-bundle</module>
         <module>nifi-apicurio-bundle</module>
         <module>nifi-jolt-bundle</module>
-        <module>nifi-questdb-bundle</module>
         <module>nifi-protobuf-bundle</module>
         <module>nifi-github-bundle</module>
     </modules>

diff --git a/...mework-kubernetes-leader-election/pom.xml → ...mework-kubernetes-leader-election/pom.xml b/...mework-kubernetes-leader-election/pom.xml → ...mework-kubernetes-leader-election/pom.xml
diff --git a/...tion/KubernetesLeaderElectionManager.java → ...tion/KubernetesLeaderElectionManager.java b/...tion/KubernetesLeaderElectionManager.java → ...tion/KubernetesLeaderElectionManager.java
diff --git a/...ection/command/LeaderElectionCommand.java → ...ection/command/LeaderElectionCommand.java b/...ection/command/LeaderElectionCommand.java → ...ection/command/LeaderElectionCommand.java
diff --git a/...ommand/LeaderElectionCommandProvider.java → ...ommand/LeaderElectionCommandProvider.java b/...ommand/LeaderElectionCommandProvider.java → ...ommand/LeaderElectionCommandProvider.java
diff --git a/...tandardLeaderElectionCommandProvider.java → ...tandardLeaderElectionCommandProvider.java b/...tandardLeaderElectionCommandProvider.java → ...tandardLeaderElectionCommandProvider.java
diff --git a/...ler.leader.election.LeaderElectionManager → ...ler.leader.election.LeaderElectionManager b/...ler.leader.election.LeaderElectionManager → ...ler.leader.election.LeaderElectionManager
diff --git a/.../KubernetesLeaderElectionManagerTest.java → .../KubernetesLeaderElectionManagerTest.java b/.../KubernetesLeaderElectionManagerTest.java → .../KubernetesLeaderElectionManagerTest.java
diff --git a/...dle/nifi-framework-kubernetes-nar/pom.xml → ...dle/nifi-framework-kubernetes-nar/pom.xml b/...dle/nifi-framework-kubernetes-nar/pom.xml → ...dle/nifi-framework-kubernetes-nar/pom.xml
diff --git a/...amework-kubernetes-state-provider/pom.xml → ...amework-kubernetes-state-provider/pom.xml b/...amework-kubernetes-state-provider/pom.xml → ...amework-kubernetes-state-provider/pom.xml
diff --git a/...der/KubernetesConfigMapStateProvider.java → ...der/KubernetesConfigMapStateProvider.java b/...der/KubernetesConfigMapStateProvider.java → ...der/KubernetesConfigMapStateProvider.java
diff --git a/...etes/state/provider/StandardStateMap.java → ...etes/state/provider/StandardStateMap.java b/...etes/state/provider/StandardStateMap.java → ...etes/state/provider/StandardStateMap.java
diff --git a/...pache.nifi.components.state.StateProvider → ...pache.nifi.components.state.StateProvider b/...pache.nifi.components.state.StateProvider → ...pache.nifi.components.state.StateProvider
diff --git a/...KubernetesConfigMapStateProviderTest.java → ...KubernetesConfigMapStateProviderTest.java b/...KubernetesConfigMapStateProviderTest.java → ...KubernetesConfigMapStateProviderTest.java
diff --git a/.../nifi-framework-kubernetes-bundle/pom.xml → .../nifi-framework-kubernetes-bundle/pom.xml b/.../nifi-framework-kubernetes-bundle/pom.xml → .../nifi-framework-kubernetes-bundle/pom.xml
@@ -17,7 +17,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-framework</artifactId>
+        <artifactId>nifi-framework-extensions</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-framework-kubernetes-bundle</artifactId>

diff --git a/...e/nifi-kerberos-iaa-providers-nar/pom.xml → ...e/nifi-kerberos-iaa-providers-nar/pom.xml b/...e/nifi-kerberos-iaa-providers-nar/pom.xml → ...e/nifi-kerberos-iaa-providers-nar/pom.xml
diff --git a/...s-nar/src/main/resources/META-INF/LICENSE → ...s-nar/src/main/resources/META-INF/LICENSE b/...s-nar/src/main/resources/META-INF/LICENSE → ...s-nar/src/main/resources/META-INF/LICENSE
diff --git a/...rs-nar/src/main/resources/META-INF/NOTICE → ...rs-nar/src/main/resources/META-INF/NOTICE b/...rs-nar/src/main/resources/META-INF/NOTICE → ...rs-nar/src/main/resources/META-INF/NOTICE
diff --git a/...undle/nifi-kerberos-iaa-providers/pom.xml → ...undle/nifi-kerberos-iaa-providers/pom.xml b/...undle/nifi-kerberos-iaa-providers/pom.xml → ...undle/nifi-kerberos-iaa-providers/pom.xml
diff --git a/...pache/nifi/kerberos/KerberosProvider.java → ...pache/nifi/kerberos/KerberosProvider.java b/...pache/nifi/kerberos/KerberosProvider.java → ...pache/nifi/kerberos/KerberosProvider.java
diff --git a/.../kerberos/KerberosUserDetailsService.java → .../kerberos/KerberosUserDetailsService.java b/.../kerberos/KerberosUserDetailsService.java → .../kerberos/KerberosUserDetailsService.java
diff --git a/...beros/parser/KerberosPrincipalParser.java → ...beros/parser/KerberosPrincipalParser.java b/...beros/parser/KerberosPrincipalParser.java → ...beros/parser/KerberosPrincipalParser.java
diff --git a/...nifi.authentication.LoginIdentityProvider → ...nifi.authentication.LoginIdentityProvider b/...nifi.authentication.LoginIdentityProvider → ...nifi.authentication.LoginIdentityProvider
diff --git a/...ifi-kerberos-iaa-providers-bundle/pom.xml → ...ifi-kerberos-iaa-providers-bundle/pom.xml b/...ifi-kerberos-iaa-providers-bundle/pom.xml → ...ifi-kerberos-iaa-providers-bundle/pom.xml
@@ -17,7 +17,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-extension-bundles</artifactId>
+        <artifactId>nifi-framework-extensions</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-kerberos-iaa-providers-bundle</artifactId>

diff --git a/...undle/nifi-ldap-iaa-providers-nar/pom.xml → ...undle/nifi-ldap-iaa-providers-nar/pom.xml b/...undle/nifi-ldap-iaa-providers-nar/pom.xml → ...undle/nifi-ldap-iaa-providers-nar/pom.xml
diff --git a/...s-nar/src/main/resources/META-INF/LICENSE → ...s-nar/src/main/resources/META-INF/LICENSE b/...s-nar/src/main/resources/META-INF/LICENSE → ...s-nar/src/main/resources/META-INF/LICENSE
diff --git a/...rs-nar/src/main/resources/META-INF/NOTICE → ...rs-nar/src/main/resources/META-INF/NOTICE b/...rs-nar/src/main/resources/META-INF/NOTICE → ...rs-nar/src/main/resources/META-INF/NOTICE
diff --git a/...rs-bundle/nifi-ldap-iaa-providers/pom.xml → ...rs-bundle/nifi-ldap-iaa-providers/pom.xml b/...rs-bundle/nifi-ldap-iaa-providers/pom.xml → ...rs-bundle/nifi-ldap-iaa-providers/pom.xml
diff --git a/...rg/apache/nifi/ldap/IdentityStrategy.java → ...rg/apache/nifi/ldap/IdentityStrategy.java b/...rg/apache/nifi/ldap/IdentityStrategy.java → ...rg/apache/nifi/ldap/IdentityStrategy.java
diff --git a/...nifi/ldap/LdapAuthenticationStrategy.java → ...nifi/ldap/LdapAuthenticationStrategy.java b/...nifi/ldap/LdapAuthenticationStrategy.java → ...nifi/ldap/LdapAuthenticationStrategy.java
diff --git a/...va/org/apache/nifi/ldap/LdapProvider.java → ...va/org/apache/nifi/ldap/LdapProvider.java b/...va/org/apache/nifi/ldap/LdapProvider.java → ...va/org/apache/nifi/ldap/LdapProvider.java
diff --git a/.../apache/nifi/ldap/LdapsSocketFactory.java → .../apache/nifi/ldap/LdapsSocketFactory.java b/.../apache/nifi/ldap/LdapsSocketFactory.java → .../apache/nifi/ldap/LdapsSocketFactory.java
diff --git a/...rg/apache/nifi/ldap/ReferralStrategy.java → ...rg/apache/nifi/ldap/ReferralStrategy.java b/...rg/apache/nifi/ldap/ReferralStrategy.java → ...rg/apache/nifi/ldap/ReferralStrategy.java
diff --git a/...i/ldap/tenants/LdapUserGroupProvider.java → ...i/ldap/tenants/LdapUserGroupProvider.java b/...i/ldap/tenants/LdapUserGroupProvider.java → ...i/ldap/tenants/LdapUserGroupProvider.java
diff --git a/...apache/nifi/ldap/tenants/SearchScope.java → ...apache/nifi/ldap/tenants/SearchScope.java b/...apache/nifi/ldap/tenants/SearchScope.java → ...apache/nifi/ldap/tenants/SearchScope.java
diff --git a/...pache/nifi/ldap/tenants/TenantHolder.java → ...pache/nifi/ldap/tenants/TenantHolder.java b/...pache/nifi/ldap/tenants/TenantHolder.java → ...pache/nifi/ldap/tenants/TenantHolder.java
diff --git a/...nifi.authentication.LoginIdentityProvider → ...nifi.authentication.LoginIdentityProvider b/...nifi.authentication.LoginIdentityProvider → ...nifi.authentication.LoginIdentityProvider
diff --git a/...ache.nifi.authorization.UserGroupProvider → ...ache.nifi.authorization.UserGroupProvider b/...ache.nifi.authorization.UserGroupProvider → ...ache.nifi.authorization.UserGroupProvider
diff --git a/...ap/tenants/LdapUserGroupProviderTest.java → ...ap/tenants/LdapUserGroupProviderTest.java b/...ap/tenants/LdapUserGroupProviderTest.java → ...ap/tenants/LdapUserGroupProviderTest.java
diff --git a/...ders/src/test/resources/nifi-example.ldif → ...ders/src/test/resources/nifi-example.ldif b/...ders/src/test/resources/nifi-example.ldif → ...ders/src/test/resources/nifi-example.ldif
diff --git a/...es/nifi-ldap-iaa-providers-bundle/pom.xml → ...ns/nifi-ldap-iaa-providers-bundle/pom.xml b/...es/nifi-ldap-iaa-providers-bundle/pom.xml → ...ns/nifi-ldap-iaa-providers-bundle/pom.xml
@@ -17,7 +17,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-extension-bundles</artifactId>
+        <artifactId>nifi-framework-extensions</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-ldap-iaa-providers-bundle</artifactId>

diff --git a/...-persistent-provenance-repository/pom.xml → ...-persistent-provenance-repository/pom.xml b/...-persistent-provenance-repository/pom.xml → ...-persistent-provenance-repository/pom.xml
diff --git a/...nifi/provenance/AbstractRecordWriter.java → ...nifi/provenance/AbstractRecordWriter.java b/...nifi/provenance/AbstractRecordWriter.java → ...nifi/provenance/AbstractRecordWriter.java
diff --git a/...ovenance/ByteArraySchemaRecordReader.java → ...ovenance/ByteArraySchemaRecordReader.java b/...ovenance/ByteArraySchemaRecordReader.java → ...ovenance/ByteArraySchemaRecordReader.java
diff --git a/...ovenance/ByteArraySchemaRecordWriter.java → ...ovenance/ByteArraySchemaRecordWriter.java b/...ovenance/ByteArraySchemaRecordWriter.java → ...ovenance/ByteArraySchemaRecordWriter.java
diff --git a/...nance/EventIdFirstSchemaRecordReader.java → ...nance/EventIdFirstSchemaRecordReader.java b/...nance/EventIdFirstSchemaRecordReader.java → ...nance/EventIdFirstSchemaRecordReader.java
diff --git a/...nance/EventIdFirstSchemaRecordWriter.java → ...nance/EventIdFirstSchemaRecordWriter.java b/...nance/EventIdFirstSchemaRecordWriter.java → ...nance/EventIdFirstSchemaRecordWriter.java
diff --git a/...e/nifi/provenance/IndexConfiguration.java → ...e/nifi/provenance/IndexConfiguration.java b/...e/nifi/provenance/IndexConfiguration.java → ...e/nifi/provenance/IndexConfiguration.java
diff --git a/...i/provenance/RepositoryConfiguration.java → ...i/provenance/RepositoryConfiguration.java b/...i/provenance/RepositoryConfiguration.java → ...i/provenance/RepositoryConfiguration.java
diff --git a/...nance/WriteAheadProvenanceRepository.java → ...nance/WriteAheadProvenanceRepository.java b/...nance/WriteAheadProvenanceRepository.java → ...nance/WriteAheadProvenanceRepository.java
diff --git a/...nce/authorization/AuthorizationCheck.java → ...nce/authorization/AuthorizationCheck.java b/...nce/authorization/AuthorizationCheck.java → ...nce/authorization/AuthorizationCheck.java
diff --git a/...enance/authorization/EventAuthorizer.java → ...enance/authorization/EventAuthorizer.java b/...enance/authorization/EventAuthorizer.java → ...enance/authorization/EventAuthorizer.java
diff --git a/...nance/authorization/EventTransformer.java → ...nance/authorization/EventTransformer.java b/...nance/authorization/EventTransformer.java → ...nance/authorization/EventTransformer.java
diff --git a/...ce/authorization/UserEventAuthorizer.java → ...ce/authorization/UserEventAuthorizer.java b/...ce/authorization/UserEventAuthorizer.java → ...ce/authorization/UserEventAuthorizer.java
diff --git a/...ovenance/expiration/ExpirationAction.java → ...ovenance/expiration/ExpirationAction.java b/...ovenance/expiration/ExpirationAction.java → ...ovenance/expiration/ExpirationAction.java
diff --git a/...venance/expiration/FileRemovalAction.java → ...venance/expiration/FileRemovalAction.java b/...venance/expiration/FileRemovalAction.java → ...venance/expiration/FileRemovalAction.java
diff --git a/...che/nifi/provenance/index/EventIndex.java → ...che/nifi/provenance/index/EventIndex.java b/...che/nifi/provenance/index/EventIndex.java → ...che/nifi/provenance/index/EventIndex.java
diff --git a/.../provenance/index/EventIndexSearcher.java → .../provenance/index/EventIndexSearcher.java b/.../provenance/index/EventIndexSearcher.java → .../provenance/index/EventIndexSearcher.java
diff --git a/...fi/provenance/index/EventIndexWriter.java → ...fi/provenance/index/EventIndexWriter.java b/...fi/provenance/index/EventIndexWriter.java → ...fi/provenance/index/EventIndexWriter.java
diff --git a/...ovenance/index/SearchFailedException.java → ...ovenance/index/SearchFailedException.java b/...ovenance/index/SearchFailedException.java → ...ovenance/index/SearchFailedException.java
diff --git a/.../provenance/index/lucene/CachedQuery.java → .../provenance/index/lucene/CachedQuery.java b/.../provenance/index/lucene/CachedQuery.java → .../provenance/index/lucene/CachedQuery.java
diff --git a/...enance/index/lucene/CommitPreference.java → ...enance/index/lucene/CommitPreference.java b/...enance/index/lucene/CommitPreference.java → ...enance/index/lucene/CommitPreference.java
diff --git a/.../lucene/ConvertEventToLuceneDocument.java → .../lucene/ConvertEventToLuceneDocument.java b/.../lucene/ConvertEventToLuceneDocument.java → .../lucene/ConvertEventToLuceneDocument.java
diff --git a/...ovenance/index/lucene/EventIndexTask.java → ...ovenance/index/lucene/EventIndexTask.java b/...ovenance/index/lucene/EventIndexTask.java → ...ovenance/index/lucene/EventIndexTask.java
diff --git a/...e/index/lucene/IndexDirectoryManager.java → ...e/index/lucene/IndexDirectoryManager.java b/...e/index/lucene/IndexDirectoryManager.java → ...e/index/lucene/IndexDirectoryManager.java
diff --git a/...rovenance/index/lucene/IndexLocation.java → ...rovenance/index/lucene/IndexLocation.java b/...rovenance/index/lucene/IndexLocation.java → ...rovenance/index/lucene/IndexLocation.java
diff --git a/...nance/index/lucene/IndexableDocument.java → ...nance/index/lucene/IndexableDocument.java b/...nance/index/lucene/IndexableDocument.java → ...nance/index/lucene/IndexableDocument.java
diff --git a/...lucene/LatestEventsPerProcessorQuery.java → ...lucene/LatestEventsPerProcessorQuery.java b/...lucene/LatestEventsPerProcessorQuery.java → ...lucene/LatestEventsPerProcessorQuery.java
diff --git a/...nance/index/lucene/LatestEventsQuery.java → ...nance/index/lucene/LatestEventsQuery.java b/...nance/index/lucene/LatestEventsQuery.java → ...nance/index/lucene/LatestEventsQuery.java
diff --git a/...nance/index/lucene/LuceneCacheWarmer.java → ...nance/index/lucene/LuceneCacheWarmer.java b/...nance/index/lucene/LuceneCacheWarmer.java → ...nance/index/lucene/LuceneCacheWarmer.java
diff --git a/...enance/index/lucene/LuceneEventIndex.java → ...enance/index/lucene/LuceneEventIndex.java b/...enance/index/lucene/LuceneEventIndex.java → ...enance/index/lucene/LuceneEventIndex.java
diff --git a/...nce/index/lucene/MigrateDefunctIndex.java → ...nce/index/lucene/MigrateDefunctIndex.java b/...nce/index/lucene/MigrateDefunctIndex.java → ...nce/index/lucene/MigrateDefunctIndex.java
diff --git a/...fi/provenance/index/lucene/QueryTask.java → ...fi/provenance/index/lucene/QueryTask.java b/...fi/provenance/index/lucene/QueryTask.java → ...fi/provenance/index/lucene/QueryTask.java
diff --git a/...ovenance/index/lucene/StoredDocument.java → ...ovenance/index/lucene/StoredDocument.java b/...ovenance/index/lucene/StoredDocument.java → ...ovenance/index/lucene/StoredDocument.java
diff --git a/...he/nifi/provenance/lucene/DocsReader.java → ...he/nifi/provenance/lucene/DocsReader.java b/...he/nifi/provenance/lucene/DocsReader.java → ...he/nifi/provenance/lucene/DocsReader.java
diff --git a/...ance/lucene/DocumentToEventConverter.java → ...ance/lucene/DocumentToEventConverter.java b/...ance/lucene/DocumentToEventConverter.java → ...ance/lucene/DocumentToEventConverter.java
diff --git a/...he/nifi/provenance/lucene/FieldNames.java → ...he/nifi/provenance/lucene/FieldNames.java b/...he/nifi/provenance/lucene/FieldNames.java → ...he/nifi/provenance/lucene/FieldNames.java
diff --git a/.../nifi/provenance/lucene/IndexManager.java → .../nifi/provenance/lucene/IndexManager.java b/.../nifi/provenance/lucene/IndexManager.java → .../nifi/provenance/lucene/IndexManager.java
diff --git a/...ifi/provenance/lucene/IndexingAction.java → ...ifi/provenance/lucene/IndexingAction.java b/...ifi/provenance/lucene/IndexingAction.java → ...ifi/provenance/lucene/IndexingAction.java
diff --git a/.../nifi/provenance/lucene/LineageQuery.java → .../nifi/provenance/lucene/LineageQuery.java b/.../nifi/provenance/lucene/LineageQuery.java → .../nifi/provenance/lucene/LineageQuery.java
diff --git a/...ance/lucene/LuceneEventIndexSearcher.java → ...ance/lucene/LuceneEventIndexSearcher.java b/...ance/lucene/LuceneEventIndexSearcher.java → ...ance/lucene/LuceneEventIndexSearcher.java
diff --git a/...enance/lucene/LuceneEventIndexWriter.java → ...enance/lucene/LuceneEventIndexWriter.java b/...enance/lucene/LuceneEventIndexWriter.java → ...enance/lucene/LuceneEventIndexWriter.java
diff --git a/...he/nifi/provenance/lucene/LuceneUtil.java → ...he/nifi/provenance/lucene/LuceneUtil.java b/...he/nifi/provenance/lucene/LuceneUtil.java → ...he/nifi/provenance/lucene/LuceneUtil.java
diff --git a/...ovenance/lucene/StandardIndexManager.java → ...ovenance/lucene/StandardIndexManager.java b/...ovenance/lucene/StandardIndexManager.java → ...ovenance/lucene/StandardIndexManager.java
diff --git a/...ovenance/lucene/UpdateMinimumEventId.java → ...ovenance/lucene/UpdateMinimumEventId.java b/...ovenance/lucene/UpdateMinimumEventId.java → ...ovenance/lucene/UpdateMinimumEventId.java
diff --git a/...fi/provenance/schema/EventFieldNames.java → ...fi/provenance/schema/EventFieldNames.java b/...fi/provenance/schema/EventFieldNames.java → ...fi/provenance/schema/EventFieldNames.java
diff --git a/...ance/schema/EventIdFirstHeaderSchema.java → ...ance/schema/EventIdFirstHeaderSchema.java b/...ance/schema/EventIdFirstHeaderSchema.java → ...ance/schema/EventIdFirstHeaderSchema.java
diff --git a/...e/nifi/provenance/schema/EventRecord.java → ...e/nifi/provenance/schema/EventRecord.java b/...e/nifi/provenance/schema/EventRecord.java → ...e/nifi/provenance/schema/EventRecord.java
diff --git a/.../provenance/schema/EventRecordFields.java → .../provenance/schema/EventRecordFields.java b/.../provenance/schema/EventRecordFields.java → .../provenance/schema/EventRecordFields.java
diff --git a/...enance/schema/LookupTableEventRecord.java → ...enance/schema/LookupTableEventRecord.java b/...enance/schema/LookupTableEventRecord.java → ...enance/schema/LookupTableEventRecord.java
diff --git a/.../schema/LookupTableEventRecordFields.java → .../schema/LookupTableEventRecordFields.java b/.../schema/LookupTableEventRecordFields.java → .../schema/LookupTableEventRecordFields.java
diff --git a/...enance/schema/LookupTableEventSchema.java → ...enance/schema/LookupTableEventSchema.java b/...enance/schema/LookupTableEventSchema.java → ...enance/schema/LookupTableEventSchema.java
diff --git a/...venance/schema/ProvenanceEventSchema.java → ...venance/schema/ProvenanceEventSchema.java b/...venance/schema/ProvenanceEventSchema.java → ...venance/schema/ProvenanceEventSchema.java
diff --git a/...rialization/CompressableRecordReader.java → ...rialization/CompressableRecordReader.java b/...rialization/CompressableRecordReader.java → ...rialization/CompressableRecordReader.java
diff --git a/...rialization/CompressableRecordWriter.java → ...rialization/CompressableRecordWriter.java b/...rialization/CompressableRecordWriter.java → ...rialization/CompressableRecordWriter.java
diff --git a/...ance/serialization/EmptyRecordReader.java → ...ance/serialization/EmptyRecordReader.java b/...ance/serialization/EmptyRecordReader.java → ...ance/serialization/EmptyRecordReader.java
diff --git a/...ce/serialization/EventFileCompressor.java → ...ce/serialization/EventFileCompressor.java b/...ce/serialization/EventFileCompressor.java → ...ce/serialization/EventFileCompressor.java
diff --git a/...rovenance/serialization/RecordReader.java → ...rovenance/serialization/RecordReader.java b/...rovenance/serialization/RecordReader.java → ...rovenance/serialization/RecordReader.java
diff --git a/...ovenance/serialization/RecordReaders.java → ...ovenance/serialization/RecordReaders.java b/...ovenance/serialization/RecordReaders.java → ...ovenance/serialization/RecordReaders.java
diff --git a/...rovenance/serialization/RecordWriter.java → ...rovenance/serialization/RecordWriter.java b/...rovenance/serialization/RecordWriter.java → ...rovenance/serialization/RecordWriter.java
diff --git a/...ovenance/serialization/RecordWriters.java → ...ovenance/serialization/RecordWriters.java b/...ovenance/serialization/RecordWriters.java → ...ovenance/serialization/RecordWriters.java
diff --git a/...venance/serialization/StorageSummary.java → ...venance/serialization/StorageSummary.java b/...venance/serialization/StorageSummary.java → ...venance/serialization/StorageSummary.java
diff --git a/...fi/provenance/store/EventFileManager.java → ...fi/provenance/store/EventFileManager.java b/...fi/provenance/store/EventFileManager.java → ...fi/provenance/store/EventFileManager.java
diff --git a/...che/nifi/provenance/store/EventStore.java → ...che/nifi/provenance/store/EventStore.java b/...che/nifi/provenance/store/EventStore.java → ...che/nifi/provenance/store/EventStore.java
diff --git a/...provenance/store/EventStorePartition.java → ...provenance/store/EventStorePartition.java b/...provenance/store/EventStorePartition.java → ...provenance/store/EventStorePartition.java
diff --git a/...ovenance/store/PartitionedEventStore.java → ...ovenance/store/PartitionedEventStore.java b/...ovenance/store/PartitionedEventStore.java → ...ovenance/store/PartitionedEventStore.java
diff --git a/...tore/PartitionedWriteAheadEventStore.java → ...tore/PartitionedWriteAheadEventStore.java b/...tore/PartitionedWriteAheadEventStore.java → ...tore/PartitionedWriteAheadEventStore.java
diff --git a/...provenance/store/RecordReaderFactory.java → ...provenance/store/RecordReaderFactory.java b/...provenance/store/RecordReaderFactory.java → ...provenance/store/RecordReaderFactory.java
diff --git a/...provenance/store/RecordWriterFactory.java → ...provenance/store/RecordWriterFactory.java b/...provenance/store/RecordWriterFactory.java → ...provenance/store/RecordWriterFactory.java
diff --git a/...i/provenance/store/RecordWriterLease.java → ...i/provenance/store/RecordWriterLease.java b/...i/provenance/store/RecordWriterLease.java → ...i/provenance/store/RecordWriterLease.java
diff --git a/.../nifi/provenance/store/RolloverState.java → .../nifi/provenance/store/RolloverState.java b/.../nifi/provenance/store/RolloverState.java → .../nifi/provenance/store/RolloverState.java
diff --git a/.../nifi/provenance/store/StorageResult.java → .../nifi/provenance/store/StorageResult.java b/.../nifi/provenance/store/StorageResult.java → .../nifi/provenance/store/StorageResult.java
diff --git a/...nance/store/WriteAheadStorePartition.java → ...nance/store/WriteAheadStorePartition.java b/...nance/store/WriteAheadStorePartition.java → ...nance/store/WriteAheadStorePartition.java
diff --git a/...tore/iterator/AggregateEventIterator.java → ...tore/iterator/AggregateEventIterator.java b/...tore/iterator/AggregateEventIterator.java → ...tore/iterator/AggregateEventIterator.java
diff --git a/...re/iterator/AuthorizingEventIterator.java → ...re/iterator/AuthorizingEventIterator.java b/...re/iterator/AuthorizingEventIterator.java → ...re/iterator/AuthorizingEventIterator.java
diff --git a/...venance/store/iterator/EventIterator.java → ...venance/store/iterator/EventIterator.java b/...venance/store/iterator/EventIterator.java → ...venance/store/iterator/EventIterator.java
diff --git a/...r/SelectiveRecordReaderEventIterator.java → ...r/SelectiveRecordReaderEventIterator.java b/...r/SelectiveRecordReaderEventIterator.java → ...r/SelectiveRecordReaderEventIterator.java
diff --git a/.../SequentialRecordReaderEventIterator.java → .../SequentialRecordReaderEventIterator.java b/.../SequentialRecordReaderEventIterator.java → .../SequentialRecordReaderEventIterator.java
diff --git a/...ifi/provenance/toc/StandardTocReader.java → ...ifi/provenance/toc/StandardTocReader.java b/...ifi/provenance/toc/StandardTocReader.java → ...ifi/provenance/toc/StandardTocReader.java
diff --git a/...ifi/provenance/toc/StandardTocWriter.java → ...ifi/provenance/toc/StandardTocWriter.java b/...ifi/provenance/toc/StandardTocWriter.java → ...ifi/provenance/toc/StandardTocWriter.java
diff --git a/...apache/nifi/provenance/toc/TocReader.java → ...apache/nifi/provenance/toc/TocReader.java b/...apache/nifi/provenance/toc/TocReader.java → ...apache/nifi/provenance/toc/TocReader.java
diff --git a/...g/apache/nifi/provenance/toc/TocUtil.java → ...g/apache/nifi/provenance/toc/TocUtil.java b/...g/apache/nifi/provenance/toc/TocUtil.java → ...g/apache/nifi/provenance/toc/TocUtil.java
diff --git a/...apache/nifi/provenance/toc/TocWriter.java → ...apache/nifi/provenance/toc/TocWriter.java b/...apache/nifi/provenance/toc/TocWriter.java → ...apache/nifi/provenance/toc/TocWriter.java
diff --git a/...e/nifi/provenance/util/CloseableUtil.java → ...e/nifi/provenance/util/CloseableUtil.java b/...e/nifi/provenance/util/CloseableUtil.java → ...e/nifi/provenance/util/CloseableUtil.java
diff --git a/.../nifi/provenance/util/DirectoryUtils.java → .../nifi/provenance/util/DirectoryUtils.java b/.../nifi/provenance/util/DirectoryUtils.java → .../nifi/provenance/util/DirectoryUtils.java
diff --git a/...e/nifi/provenance/util/DumpEventFile.java → ...e/nifi/provenance/util/DumpEventFile.java b/...e/nifi/provenance/util/DumpEventFile.java → ...e/nifi/provenance/util/DumpEventFile.java
diff --git a/...i/provenance/util/NamedThreadFactory.java → ...i/provenance/util/NamedThreadFactory.java b/...i/provenance/util/NamedThreadFactory.java → ...i/provenance/util/NamedThreadFactory.java
diff --git a/.../provenance/util/StorageSummaryEvent.java → .../provenance/util/StorageSummaryEvent.java b/.../provenance/util/StorageSummaryEvent.java → .../provenance/util/StorageSummaryEvent.java
diff --git a/...ache.nifi.provenance.ProvenanceRepository → ...ache.nifi.provenance.ProvenanceRepository b/...ache.nifi.provenance.ProvenanceRepository → ...ache.nifi.provenance.ProvenanceRepository
diff --git a/...nance/AbstractTestRecordReaderWriter.java → ...nance/AbstractTestRecordReaderWriter.java b/...nance/AbstractTestRecordReaderWriter.java → ...nance/AbstractTestRecordReaderWriter.java
diff --git a/...e/nifi/provenance/LoopingInputStream.java → ...e/nifi/provenance/LoopingInputStream.java b/...e/nifi/provenance/LoopingInputStream.java → ...e/nifi/provenance/LoopingInputStream.java
diff --git a/...EventIdFirstSchemaRecordReaderWriter.java → ...EventIdFirstSchemaRecordReaderWriter.java b/...EventIdFirstSchemaRecordReaderWriter.java → ...EventIdFirstSchemaRecordReaderWriter.java
diff --git a/...venance/TestSchemaRecordReaderWriter.java → ...venance/TestSchemaRecordReaderWriter.java b/...venance/TestSchemaRecordReaderWriter.java → ...venance/TestSchemaRecordReaderWriter.java
diff --git a/.../org/apache/nifi/provenance/TestUtil.java → .../org/apache/nifi/provenance/TestUtil.java b/.../org/apache/nifi/provenance/TestUtil.java → .../org/apache/nifi/provenance/TestUtil.java
diff --git a/...ance/index/lucene/TestEventIndexTask.java → ...ance/index/lucene/TestEventIndexTask.java b/...ance/index/lucene/TestEventIndexTask.java → ...ance/index/lucene/TestEventIndexTask.java
diff --git a/...dex/lucene/TestIndexDirectoryManager.java → ...dex/lucene/TestIndexDirectoryManager.java b/...dex/lucene/TestIndexDirectoryManager.java → ...dex/lucene/TestIndexDirectoryManager.java
diff --git a/...ce/index/lucene/TestLuceneEventIndex.java → ...ce/index/lucene/TestLuceneEventIndex.java b/...ce/index/lucene/TestLuceneEventIndex.java → ...ce/index/lucene/TestLuceneEventIndex.java
diff --git a/...enance/lucene/TestSimpleIndexManager.java → ...enance/lucene/TestSimpleIndexManager.java b/...enance/lucene/TestSimpleIndexManager.java → ...enance/lucene/TestSimpleIndexManager.java
diff --git a/...provenance/store/ArrayListEventStore.java → ...provenance/store/ArrayListEventStore.java b/...provenance/store/ArrayListEventStore.java → ...provenance/store/ArrayListEventStore.java
diff --git a/...rovenance/store/TestEventFileManager.java → ...rovenance/store/TestEventFileManager.java b/...rovenance/store/TestEventFileManager.java → ...rovenance/store/TestEventFileManager.java
diff --git a/.../TestPartitionedWriteAheadEventStore.java → .../TestPartitionedWriteAheadEventStore.java b/.../TestPartitionedWriteAheadEventStore.java → .../TestPartitionedWriteAheadEventStore.java
diff --git a/...e/store/TestWriteAheadStorePartition.java → ...e/store/TestWriteAheadStorePartition.java b/...e/store/TestWriteAheadStorePartition.java → ...e/store/TestWriteAheadStorePartition.java
diff --git a/...stSelectiveRecordReaderEventIterator.java → ...stSelectiveRecordReaderEventIterator.java b/...stSelectiveRecordReaderEventIterator.java → ...stSelectiveRecordReaderEventIterator.java
diff --git a/...che/nifi/provenance/toc/NopTocWriter.java → ...che/nifi/provenance/toc/NopTocWriter.java b/...che/nifi/provenance/toc/NopTocWriter.java → ...che/nifi/provenance/toc/NopTocWriter.java
diff --git a/...provenance/toc/TestStandardTocReader.java → ...provenance/toc/TestStandardTocReader.java b/...provenance/toc/TestStandardTocReader.java → ...provenance/toc/TestStandardTocReader.java
diff --git a/...provenance/toc/TestStandardTocWriter.java → ...provenance/toc/TestStandardTocWriter.java b/...provenance/toc/TestStandardTocWriter.java → ...provenance/toc/TestStandardTocWriter.java
diff --git a/...le/nifi-provenance-repository-nar/pom.xml → ...le/nifi-provenance-repository-nar/pom.xml b/...le/nifi-provenance-repository-nar/pom.xml → ...le/nifi-provenance-repository-nar/pom.xml
diff --git a/...ry-nar/src/main/resources/META-INF/NOTICE → ...ry-nar/src/main/resources/META-INF/NOTICE b/...ry-nar/src/main/resources/META-INF/NOTICE → ...ry-nar/src/main/resources/META-INF/NOTICE
diff --git a/...fi-volatile-provenance-repository/pom.xml → ...fi-volatile-provenance-repository/pom.xml b/...fi-volatile-provenance-repository/pom.xml → ...fi-volatile-provenance-repository/pom.xml
diff --git a/...venance/VolatileProvenanceRepository.java → ...venance/VolatileProvenanceRepository.java b/...venance/VolatileProvenanceRepository.java → ...venance/VolatileProvenanceRepository.java
diff --git a/...ache.nifi.provenance.ProvenanceRepository → ...ache.nifi.provenance.ProvenanceRepository b/...ache.nifi.provenance.ProvenanceRepository → ...ache.nifi.provenance.ProvenanceRepository
diff --git a/...nce/TestVolatileProvenanceRepository.java → ...nce/TestVolatileProvenanceRepository.java b/...nce/TestVolatileProvenanceRepository.java → ...nce/TestVolatileProvenanceRepository.java
diff --git a/...sitory/src/test/resources/nifi.properties → ...sitory/src/test/resources/nifi.properties b/...sitory/src/test/resources/nifi.properties → ...sitory/src/test/resources/nifi.properties
diff --git a/...nifi-provenance-repository-bundle/pom.xml → ...nifi-provenance-repository-bundle/pom.xml b/...nifi-provenance-repository-bundle/pom.xml → ...nifi-provenance-repository-bundle/pom.xml
@@ -16,7 +16,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-extension-bundles</artifactId>
+        <artifactId>nifi-framework-extensions</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-provenance-repository-bundle</artifactId>

diff --git a/...ension-bundles/nifi-py4j-bundle/README.md → ...ions/nifi-py4j-framework-bundle/README.md b/...ension-bundles/nifi-py4j-bundle/README.md → ...ions/nifi-py4j-framework-bundle/README.md
diff --git a/...j-bundle/nifi-python-extension-api/README → ...k-bundle/nifi-python-extension-api/README b/...j-bundle/nifi-python-extension-api/README → ...k-bundle/nifi-python-extension-api/README
diff --git a/...-bundle/nifi-python-extension-api/pom.xml → ...-bundle/nifi-python-extension-api/pom.xml b/...-bundle/nifi-python-extension-api/pom.xml → ...-bundle/nifi-python-extension-api/pom.xml
diff --git a/...ension-api/src/main/python/pyproject.toml → ...ension-api/src/main/python/pyproject.toml b/...ension-api/src/main/python/pyproject.toml → ...ension-api/src/main/python/pyproject.toml
diff --git a/...urces/extensions/multi-module/__init__.py → ...i/src/main/python/src/nifiapi/__init__.py b/...urces/extensions/multi-module/__init__.py → ...i/src/main/python/src/nifiapi/__init__.py
diff --git a/...pi/src/main/python/src/nifiapi/__jvm__.py → ...pi/src/main/python/src/nifiapi/__jvm__.py b/...pi/src/main/python/src/nifiapi/__jvm__.py → ...pi/src/main/python/src/nifiapi/__jvm__.py
diff --git a/.../main/python/src/nifiapi/documentation.py → .../main/python/src/nifiapi/documentation.py b/.../main/python/src/nifiapi/documentation.py → .../main/python/src/nifiapi/documentation.py
diff --git a/...main/python/src/nifiapi/flowfilesource.py → ...main/python/src/nifiapi/flowfilesource.py b/...main/python/src/nifiapi/flowfilesource.py → ...main/python/src/nifiapi/flowfilesource.py
diff --git a/...n/python/src/nifiapi/flowfiletransform.py → ...n/python/src/nifiapi/flowfiletransform.py b/...n/python/src/nifiapi/flowfiletransform.py → ...n/python/src/nifiapi/flowfiletransform.py
diff --git a/...pi/src/main/python/src/nifiapi/logging.py → ...pi/src/main/python/src/nifiapi/logging.py b/...pi/src/main/python/src/nifiapi/logging.py → ...pi/src/main/python/src/nifiapi/logging.py
diff --git a/...src/main/python/src/nifiapi/properties.py → ...src/main/python/src/nifiapi/properties.py b/...src/main/python/src/nifiapi/properties.py → ...src/main/python/src/nifiapi/properties.py
diff --git a/...ain/python/src/nifiapi/recordtransform.py → ...ain/python/src/nifiapi/recordtransform.py b/...ain/python/src/nifiapi/recordtransform.py → ...ain/python/src/nifiapi/recordtransform.py
diff --git a/...c/main/python/src/nifiapi/relationship.py → ...c/main/python/src/nifiapi/relationship.py b/...c/main/python/src/nifiapi/relationship.py → ...c/main/python/src/nifiapi/relationship.py
diff --git a/...-bundle/nifi-python-framework-api/pom.xml → ...-bundle/nifi-python-framework-api/pom.xml b/...-bundle/nifi-python-framework-api/pom.xml → ...-bundle/nifi-python-framework-api/pom.xml
diff --git a/...apache/nifi/python/BoundObjectCounts.java → ...apache/nifi/python/BoundObjectCounts.java b/...apache/nifi/python/BoundObjectCounts.java → ...apache/nifi/python/BoundObjectCounts.java
diff --git a/...i/python/ControllerServiceTypeLookup.java → ...i/python/ControllerServiceTypeLookup.java b/...i/python/ControllerServiceTypeLookup.java → ...i/python/ControllerServiceTypeLookup.java
diff --git a/...che/nifi/python/DisabledPythonBridge.java → ...che/nifi/python/DisabledPythonBridge.java b/...che/nifi/python/DisabledPythonBridge.java → ...che/nifi/python/DisabledPythonBridge.java
diff --git a/.../org/apache/nifi/python/PythonBridge.java → .../org/apache/nifi/python/PythonBridge.java b/.../org/apache/nifi/python/PythonBridge.java → .../org/apache/nifi/python/PythonBridge.java
diff --git a/...on/PythonBridgeInitializationContext.java → ...on/PythonBridgeInitializationContext.java b/...on/PythonBridgeInitializationContext.java → ...on/PythonBridgeInitializationContext.java
diff --git a/...e/nifi/python/PythonBundleCoordinate.java → ...e/nifi/python/PythonBundleCoordinate.java b/...e/nifi/python/PythonBundleCoordinate.java → ...e/nifi/python/PythonBundleCoordinate.java
diff --git a/.../apache/nifi/python/PythonController.java → .../apache/nifi/python/PythonController.java b/.../apache/nifi/python/PythonController.java → .../apache/nifi/python/PythonController.java
diff --git a/...apache/nifi/python/PythonObjectProxy.java → ...apache/nifi/python/PythonObjectProxy.java b/...apache/nifi/python/PythonObjectProxy.java → ...apache/nifi/python/PythonObjectProxy.java
diff --git a/...ache/nifi/python/PythonProcessConfig.java → ...ache/nifi/python/PythonProcessConfig.java b/...ache/nifi/python/PythonProcessConfig.java → ...ache/nifi/python/PythonProcessConfig.java
diff --git a/...e/nifi/python/PythonProcessorDetails.java → ...e/nifi/python/PythonProcessorDetails.java b/...e/nifi/python/PythonProcessorDetails.java → ...e/nifi/python/PythonProcessorDetails.java
diff --git a/...che/nifi/python/processor/Idempotent.java → ...che/nifi/python/processor/Idempotent.java b/...che/nifi/python/processor/Idempotent.java → ...che/nifi/python/processor/Idempotent.java
diff --git a/...python/processor/PreserveJavaBinding.java → ...python/processor/PreserveJavaBinding.java b/...python/processor/PreserveJavaBinding.java → ...python/processor/PreserveJavaBinding.java
diff --git a/...ifi/python/processor/PythonProcessor.java → ...ifi/python/processor/PythonProcessor.java b/...ifi/python/processor/PythonProcessor.java → ...ifi/python/processor/PythonProcessor.java
diff --git a/...hon/processor/PythonProcessorAdapter.java → ...hon/processor/PythonProcessorAdapter.java b/...hon/processor/PythonProcessorAdapter.java → ...hon/processor/PythonProcessorAdapter.java
diff --git a/...thon/processor/PythonProcessorBridge.java → ...thon/processor/PythonProcessorBridge.java b/...thon/processor/PythonProcessorBridge.java → ...thon/processor/PythonProcessorBridge.java
diff --git a/...PythonProcessorInitializationContext.java → ...PythonProcessorInitializationContext.java b/...PythonProcessorInitializationContext.java → ...PythonProcessorInitializationContext.java
diff --git a/...ntation/MultiProcessorUseCaseDetails.java → ...ntation/MultiProcessorUseCaseDetails.java b/...ntation/MultiProcessorUseCaseDetails.java → ...ntation/MultiProcessorUseCaseDetails.java
diff --git a/...tation/ProcessorConfigurationDetails.java → ...tation/ProcessorConfigurationDetails.java b/...tation/ProcessorConfigurationDetails.java → ...tation/ProcessorConfigurationDetails.java
diff --git a/...or/documentation/PropertyDescription.java → ...or/documentation/PropertyDescription.java b/...or/documentation/PropertyDescription.java → ...or/documentation/PropertyDescription.java
diff --git a/...ocessor/documentation/UseCaseDetails.java → ...ocessor/documentation/UseCaseDetails.java b/...ocessor/documentation/UseCaseDetails.java → ...ocessor/documentation/UseCaseDetails.java
diff --git a/...py4j-bundle/nifi-python-framework/pom.xml → ...work-bundle/nifi-python-framework/pom.xml b/...py4j-bundle/nifi-python-framework/pom.xml → ...work-bundle/nifi-python-framework/pom.xml
diff --git a/...main/python/framework/BundleCoordinate.py → ...main/python/framework/BundleCoordinate.py b/...main/python/framework/BundleCoordinate.py → ...main/python/framework/BundleCoordinate.py
diff --git a/...k/src/main/python/framework/Controller.py → ...k/src/main/python/framework/Controller.py b/...k/src/main/python/framework/Controller.py → ...k/src/main/python/framework/Controller.py
diff --git a/...main/python/framework/ExtensionDetails.py → ...main/python/framework/ExtensionDetails.py b/...main/python/framework/ExtensionDetails.py → ...main/python/framework/ExtensionDetails.py
diff --git a/...main/python/framework/ExtensionManager.py → ...main/python/framework/ExtensionManager.py b/...main/python/framework/ExtensionManager.py → ...main/python/framework/ExtensionManager.py
diff --git a/...n/python/framework/ProcessorInspection.py → ...n/python/framework/ProcessorInspection.py b/...n/python/framework/ProcessorInspection.py → ...n/python/framework/ProcessorInspection.py
diff --git a/...ython/framework/PythonProcessorAdapter.py → ...ython/framework/PythonProcessorAdapter.py b/...ython/framework/PythonProcessorAdapter.py → ...ython/framework/PythonProcessorAdapter.py
diff --git a/...c/test/python/framework/DummyProcessor.py → ...c/test/python/framework/DummyProcessor.py b/...c/test/python/framework/DummyProcessor.py → ...c/test/python/framework/DummyProcessor.py
diff --git a/...n/framework/TestPythonProcessorAdapter.py → ...n/framework/TestPythonProcessorAdapter.py b/...n/framework/TestPythonProcessorAdapter.py → ...n/framework/TestPythonProcessorAdapter.py
diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-py4j-framework-bundle/pom.xml b/nifi-framework-bundle/nifi-framework-extensions/nifi-py4j-framework-bundle/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-framework-extensions</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nifi-py4j-bundle</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>nifi-python-framework-api</module>
+        <module>nifi-python-framework</module>
+        <module>nifi-python-extension-api</module>
+    </modules>
+</project>
diff --git a/...e/nifi-questdb-status-history-nar/pom.xml → ...e/nifi-questdb-status-history-nar/pom.xml b/...e/nifi-questdb-status-history-nar/pom.xml → ...e/nifi-questdb-status-history-nar/pom.xml
diff --git a/...y-nar/src/main/resources/META-INF/LICENSE → ...y-nar/src/main/resources/META-INF/LICENSE b/...y-nar/src/main/resources/META-INF/LICENSE → ...y-nar/src/main/resources/META-INF/LICENSE
diff --git a/...ry-nar/src/main/resources/META-INF/NOTICE → ...ry-nar/src/main/resources/META-INF/NOTICE b/...ry-nar/src/main/resources/META-INF/NOTICE → ...ry-nar/src/main/resources/META-INF/NOTICE
diff --git a/...undle/nifi-questdb-status-history/pom.xml → ...undle/nifi-questdb-status-history/pom.xml b/...undle/nifi-questdb-status-history/pom.xml → ...undle/nifi-questdb-status-history/pom.xml
diff --git a/...questdb/BufferedStatusHistoryStorage.java → ...questdb/BufferedStatusHistoryStorage.java b/...questdb/BufferedStatusHistoryStorage.java → ...questdb/BufferedStatusHistoryStorage.java
diff --git a/...tatus/history/questdb/CapturedStatus.java → ...tatus/history/questdb/CapturedStatus.java b/...tatus/history/questdb/CapturedStatus.java → ...tatus/history/questdb/CapturedStatus.java
diff --git a/...tory/questdb/ComponentDetailsStorage.java → ...tory/questdb/ComponentDetailsStorage.java b/...tory/questdb/ComponentDetailsStorage.java → ...tory/questdb/ComponentDetailsStorage.java
diff --git a/...ry/questdb/ComponentStatusDataSource.java → ...ry/questdb/ComponentStatusDataSource.java b/...ry/questdb/ComponentStatusDataSource.java → ...ry/questdb/ComponentStatusDataSource.java
diff --git a/.../questdb/CounterStatisticsDataSource.java → .../questdb/CounterStatisticsDataSource.java b/.../questdb/CounterStatisticsDataSource.java → .../questdb/CounterStatisticsDataSource.java
diff --git a/...tdb/CounterStatisticsResultProcessor.java → ...tdb/CounterStatisticsResultProcessor.java b/...tdb/CounterStatisticsResultProcessor.java → ...tdb/CounterStatisticsResultProcessor.java
diff --git a/...beddedQuestDbStatusHistoryRepository.java → ...beddedQuestDbStatusHistoryRepository.java b/...beddedQuestDbStatusHistoryRepository.java → ...beddedQuestDbStatusHistoryRepository.java
diff --git a/...DbStatusHistoryRepositoryDefinitions.java → ...DbStatusHistoryRepositoryDefinitions.java b/...DbStatusHistoryRepositoryDefinitions.java → ...DbStatusHistoryRepositoryDefinitions.java
diff --git a/...tdb/GarbageCollectionResultProcessor.java → ...tdb/GarbageCollectionResultProcessor.java b/...tdb/GarbageCollectionResultProcessor.java → ...tdb/GarbageCollectionResultProcessor.java
diff --git a/...db/GarbageCollectionStatusDataSource.java → ...db/GarbageCollectionStatusDataSource.java b/...db/GarbageCollectionStatusDataSource.java → ...db/GarbageCollectionStatusDataSource.java
diff --git a/...stdb/InMemoryComponentDetailsStorage.java → ...stdb/InMemoryComponentDetailsStorage.java b/...stdb/InMemoryComponentDetailsStorage.java → ...stdb/InMemoryComponentDetailsStorage.java
diff --git a/...history/questdb/NodeStatusDataSource.java → ...history/questdb/NodeStatusDataSource.java b/...history/questdb/NodeStatusDataSource.java → ...history/questdb/NodeStatusDataSource.java
diff --git a/...ry/questdb/NodeStatusResultProcessor.java → ...ry/questdb/NodeStatusResultProcessor.java b/...ry/questdb/NodeStatusResultProcessor.java → ...ry/questdb/NodeStatusResultProcessor.java
diff --git a/.../questdb/QuestDbStatusHistoryStorage.java → .../questdb/QuestDbStatusHistoryStorage.java b/.../questdb/QuestDbStatusHistoryStorage.java → .../questdb/QuestDbStatusHistoryStorage.java
diff --git a/...history/questdb/StatusHistoryStorage.java → ...history/questdb/StatusHistoryStorage.java b/...history/questdb/StatusHistoryStorage.java → ...history/questdb/StatusHistoryStorage.java
diff --git a/...status/history/questdb/StorageMetric.java → ...status/history/questdb/StorageMetric.java b/...status/history/questdb/StorageMetric.java → ...status/history/questdb/StorageMetric.java
diff --git a/...tory/questdb/StorageStatusDataSource.java → ...tory/questdb/StorageStatusDataSource.java b/...tory/questdb/StorageStatusDataSource.java → ...tory/questdb/StorageStatusDataSource.java
diff --git a/...questdb/StorageStatusResultProcessor.java → ...questdb/StorageStatusResultProcessor.java b/...questdb/StorageStatusResultProcessor.java → ...questdb/StorageStatusResultProcessor.java
diff --git a/...us/history/questdb/StorageStatusType.java → ...us/history/questdb/StorageStatusType.java b/...us/history/questdb/StorageStatusType.java → ...us/history/questdb/StorageStatusType.java
diff --git a/...er.status.history.StatusHistoryRepository → ...er.status.history.StatusHistoryRepository b/...er.status.history.StatusHistoryRepository → ...er.status.history.StatusHistoryRepository
diff --git a/...edQuestDbStatusHistoryRepositoryTest.java → ...edQuestDbStatusHistoryRepositoryTest.java b/...edQuestDbStatusHistoryRepositoryTest.java → ...edQuestDbStatusHistoryRepositoryTest.java