You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2021/12/10 16:38:53 UTC
[nifi] branch NIFI-9428 updated (d45b23d -> b578f18)
This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a change to branch NIFI-9428
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from d45b23d NIFI-8153 custom date/time format properties for PutElasticsearchRecord
add 2b415de NIFI-9336 - Show icon for property values with leading or trailing whitespace (#5559)
add ff86426 NIFI-9436 - In AbstractPutHDFSRecord make sure the record writers use the FileSystem object the processor already has.
add fede6b9 NIFI-9432 - fix typo in diagnostic output (#5562)
add 90b39b5 NIFI-9069 Changed framework dataflow serialization to support JSON
add f95044f NIFI-9433: When a Connection is unregistered from the NioAsyncLoadBalanceClient, make sure that we only cancel its active transaction if the transaction belongs to the appropriate connection. Also ensure that when we do cancel a transaction / call its failure callback, we purge the collection of any FlowFiles that have been sent in that transaction. This ensures that we cannot later attempt to failure the transaction again, decrementing the count of FlowFiles for the con [...]
add 41ff6f0 NIFI-9409 Updated links for EVP BytesToKey and PBKDF2
add 7a83c32 NIFI-9441: Ensure that we only update our member variable for the latest timestamp after processing all objects within the GCS Bucket
add 2a3f7da NIFI-9442: When deleting a connection, ensure that when the source of the connection is a funnel that its upstream components are checked (recursively)
add 53809dd NIFI-9439: - Add PutElasticsearchJson processor to Elasticsearch REST bundle - Deprecate PutElasticsearchHttp/PutElasticsearchHttpReccord in favour of Elasticsearch REST processors
add 0f02774 NIFI-9443 Update NAR plugin to 1.3.3 and update data model for extension manifest to capture new fields
add 1eb4264 NIFI-9447: Fix SNMP related tests to find available UDP ports instead of TCP
add 70822b9 NIFI-9093 This closes #5578. GetSplunk Processor hangs addressed by adding timeouts. changed the required flag to false on ConnectTimeout and ReadTimeout properties
add 12015a1 NIFI-9397 Added Custom Authorization property to JettyWebSocketClient
add 563df24 NIFI-9448 Improved S2S HTTP Extend Transaction Exception Handling
add bf288f3 NIFI-9454: Moved file renaming after closing the OutputStream in StandardFlowConfigurationDAO (#5581)
add dafa03a NIFI-9421: Running NiFi Stateless with local NARs only
add c1bb0c0 NIFI-9417: Update BulletinMergerTest.java
add 97198e3 NIFI-9382: This closes #5584. Added system test that replicates issue in which a closed shared classloader causes issues when used again NIFI-9382: Fixed issue with SharedInstanceClassLoader where the classloader may get closed but then get used again. When the SharedInstanceClassLoader is closed, we will now ensure that we don't use anymore and instead create a new one.
add f5dccb5 NIFI-9444: Added reconnect property to JettyWebsocketClient.
add 3d3f6ac NIFI-9471 Corrected PutKudu usage of DataTypeUtils.toString()
add b7ad1f9 NIFI-9457 Support microseconds for String Timestamps in PutKudu
add a475e7e NIFI-9450 Correct Admin Guide documentation about diagnostics
add 7dc0f84 NIFI-9468 - Bump Kafka client from 2.6.0 to 2.6.3
add f7a300d NIFI-9473 - Upgrade Jackson from 2.12.3 to 2.12.5
add 8fdde86 NIFI-9474 - Upgrade Log4j references to 2.15.0
add b578f18 NIFI-9430: Create initial C2 structure, add c2-protocol-api module (#5563)
No new revisions were added by this update.
Summary of changes:
.github/workflows/system-tests.yml | 17 +-
c2/c2-protocol/c2-protocol-api/pom.xml | 38 +
.../org/apache/nifi/c2/protocol/api/AgentInfo.java | 83 +
.../nifi/c2/protocol/api/AgentRepositories.java | 36 +-
.../c2/protocol/api/AgentRepositoryStatus.java | 93 +
.../c2/protocol/api/AgentResourceConsumption.java | 51 +
.../apache/nifi/c2/protocol/api/AgentStatus.java | 73 +
.../apache/nifi/c2/protocol/api/C2Heartbeat.java | 149 ++
.../nifi/c2/protocol/api/C2HeartbeatResponse.java | 31 +-
.../apache/nifi/c2/protocol/api/C2Operation.java | 97 +
.../nifi/c2/protocol/api/C2OperationAck.java | 84 +
.../nifi/c2/protocol/api/C2OperationState.java | 124 ++
.../nifi/c2/protocol/api/ComponentStatus.java | 24 +-
.../apache/nifi/c2/protocol/api/DeviceInfo.java | 76 +
.../org/apache/nifi/c2/protocol/api/FlowInfo.java | 70 +
.../nifi/c2/protocol/api/FlowQueueStatus.java | 93 +
.../org/apache/nifi/c2/protocol/api/FlowUri.java | 69 +
.../org/apache/nifi/c2/protocol/api/Location.java | 77 +
.../apache/nifi/c2/protocol/api/NetworkInfo.java | 60 +
.../org/apache/nifi/c2/protocol/api/Operation.java | 103 +
.../nifi/c2/protocol/api/OperationState.java | 67 +
.../apache/nifi/c2/protocol/api/OperationType.java | 21 +-
.../apache/nifi/c2/protocol/api/SystemInfo.java | 96 +
c2/c2-protocol/c2-protocol-component-api/pom.xml | 49 +
.../nifi/c2/protocol/component/api/BuildInfo.java | 100 +
.../nifi/c2/protocol/component/api/Bundle.java | 124 ++
.../protocol/component/api/ComponentManifest.java | 71 +
.../api/ConfigurableComponentDefinition.java | 22 +-
.../component/api/ControllerServiceDefinition.java | 56 +
.../c2/protocol/component/api/DefinedType.java | 116 ++
.../protocol/component/api/ExtensionComponent.java | 115 ++
.../component/api/ProcessorDefinition.java | 88 +
.../component/api/PropertyAllowableValue.java | 84 +
.../protocol/component/api/PropertyDescriptor.java | 159 ++
.../c2/protocol/component/api/Relationship.java | 34 +-
.../component/api/ReportingTaskDefinition.java | 86 +
.../c2/protocol/component/api/RuntimeManifest.java | 130 ++
.../protocol/component/api/SchedulingDefaults.java | 91 +
c2/c2-protocol/pom.xml | 34 +
c2/pom.xml | 49 +
minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +-
.../nifi/minifi/c2/service/ConfigService.java | 4 +-
minifi/pom.xml | 6 +-
.../documentation/xml/XmlDocumentationWriter.java | 103 +-
.../src/main/java/org/apache/nifi/flow/Bundle.java | 13 +-
.../java/org/apache/nifi/flow/ComponentType.java | 7 +-
.../org/apache/nifi/flow/ConnectableComponent.java | 21 +
.../java/org/apache/nifi/flow/ScheduledState.java | 3 +-
.../org/apache/nifi/flow/VersionedComponent.java | 14 +-
.../nifi/flow/VersionedControllerService.java | 19 +-
.../apache/nifi/flow/VersionedProcessGroup.java | 1 +
.../org/apache/nifi/flow/VersionedProcessor.java | 2 +-
...lerService.java => VersionedReportingTask.java} | 62 +-
.../nifi/flow/encryptor/StandardFlowEncryptor.java | 19 +-
.../java/org/apache/nifi/util/NiFiProperties.java | 20 +-
.../serialization/record/field/FieldConverter.java | 43 +-
.../field/ObjectTimestampFieldConverter.java | 86 +
.../field/ObjectTimestampFieldConverterTest.java | 114 ++
.../apache/nifi/remote/client/PeerSelector.java | 4 +-
.../nifi/remote/util/ExtendTransactionCommand.java | 68 +
.../nifi/remote/util/SiteToSiteRestApiClient.java | 75 +-
.../nifi/remote/client/http/TestHttpClient.java | 52 +-
.../remote/client/socket/SiteToSiteClientIT.java | 99 -
.../remote/util/TestExtendTransactionCommand.java | 85 +
.../src/main/asciidoc/administration-guide.adoc | 87 +-
nifi-external/nifi-kafka-connect/README.md | 2 +
.../AbstractPolicyBasedAuthorizer.java | 24 +-
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 2 +-
.../nifi-elasticsearch-5-processors/pom.xml | 2 +-
.../AbstractElasticsearchHttpProcessor.java | 1 +
.../elasticsearch/IdentifierNotFoundException.java | 1 +
.../elasticsearch/PutElasticsearchHttp.java | 5 +-
.../elasticsearch/PutElasticsearchHttpRecord.java | 5 +-
.../elasticsearch/RetryableException.java | 1 +
.../elasticsearch/UnretryableException.java | 2 +-
.../elasticsearch/AbstractPutElasticsearch.java | 165 ++
.../elasticsearch/ElasticsearchRestProcessor.java | 4 -
.../processors/elasticsearch/GetElasticsearch.java | 3 +-
.../elasticsearch/PutElasticsearchJson.java | 220 +++
.../elasticsearch/PutElasticsearchRecord.java | 138 +-
.../services/org.apache.nifi.processor.Processor | 2 +
.../additionalDetails.html | 44 +
.../additionalDetails.html | 11 +-
.../elasticsearch/PutElasticsearchJsonTest.groovy | 272 +++
.../PutElasticsearchRecordTest.groovy | 14 +
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 2 +-
.../processors/hadoop/AbstractHadoopProcessor.java | 2 +-
.../processors/hadoop/AbstractPutHDFSRecord.java | 14 +-
.../authorization/FileAccessPolicyProvider.java | 80 +-
.../FileAccessPolicyProviderTest.java | 8 +
.../nifi/authorization/FileAuthorizerTest.java | 9 +
.../nifi-framework-cluster-protocol/pom.xml | 7 +-
.../nifi/cluster/protocol/StandardDataFlow.java | 63 +-
.../coordination/flow/PopularVoteFlowElection.java | 23 +-
.../flow/PopularVoteFlowElectionFactoryBean.java | 16 +-
.../http/replication/RequestReplicator.java | 11 +-
.../replication/ThreadPoolRequestReplicator.java | 41 -
.../resources/nifi-cluster-manager-context.xml | 1 -
.../PopularVoteFlowElectionFactoryBeanTest.groovy | 87 -
.../flow/TestPopularVoteFlowElection.java | 60 +-
.../TestThreadPoolRequestReplicator.java | 77 -
.../apache/nifi/cluster/integration/Cluster.java | 10 +-
.../nifi/cluster/manager/BulletinMergerTest.java | 10 +-
.../src/test/resources/conf/non-empty-flow.xml | 1 +
.../nifi/connectable/StandardConnection.java | 33 +-
.../nifi/controller/StandardProcessorNode.java | 5 +-
.../nifi/controller/flow/AbstractFlowManager.java | 26 +-
.../reporting/AbstractReportingTaskNode.java | 11 +-
.../service/StandardControllerServiceNode.java | 5 +-
.../service/StandardControllerServiceProvider.java | 24 +-
.../nifi/groups/DefaultComponentScheduler.java | 51 +
.../groups/ProcessGroupSynchronizationContext.java | 163 ++
.../nifi/groups/ProcessGroupSynchronizer.java | 12 +-
.../apache/nifi/groups/StandardProcessGroup.java | 1660 +---------------
.../groups/StandardProcessGroupSynchronizer.java | 2084 ++++++++++++++++++++
.../mapping/InstantiatedConnectableComponent.java | 2 +-
.../mapping/InstantiatedVersionedComponent.java | 4 +-
.../mapping/InstantiatedVersionedConnection.java | 2 +-
.../InstantiatedVersionedControllerService.java | 2 +-
.../flow/mapping/InstantiatedVersionedFunnel.java | 2 +-
.../flow/mapping/InstantiatedVersionedLabel.java | 2 +-
.../flow/mapping/InstantiatedVersionedPort.java | 2 +-
.../mapping/InstantiatedVersionedProcessGroup.java | 2 +-
.../mapping/InstantiatedVersionedProcessor.java | 2 +-
.../InstantiatedVersionedRemoteGroupPort.java | 2 +-
.../InstantiatedVersionedRemoteProcessGroup.java | 2 +-
.../flow/mapping/NiFiRegistryFlowMapper.java | 197 +-
.../flow/mapping/StandardComparableDataFlow.java | 32 +
.../apache/nifi/util/FlowDifferenceFilters.java | 111 +-
.../flow/mapping/TestNiFiRegistryFlowMapper.java | 221 +++
.../org/apache/nifi/cluster/protocol/DataFlow.java | 10 +
.../nifi/controller/AbstractComponentNode.java | 25 +-
.../org/apache/nifi/controller/ProcessorNode.java | 2 +-
.../apache/nifi/controller/flow/FlowManager.java | 9 +-
.../nifi/controller/flow/VersionedDataflow.java | 101 +
.../flow/VersionedFlowEncodingVersion.java} | 33 +-
.../nifi/controller/flow/VersionedRegistry.java | 53 +-
.../nifi/controller/flow/VersionedTemplate.java | 28 +-
.../nifi/groups/AbstractComponentScheduler.java | 72 +
.../apache/nifi/groups/BundleUpdateStrategy.java | 16 +-
.../ComponentIdGenerator.java} | 37 +-
.../apache/nifi/groups/ComponentScheduler.java} | 29 +-
.../nifi/groups/GroupSynchronizationOptions.java | 220 +++
.../java/org/apache/nifi/groups/ProcessGroup.java | 12 +-
.../org/apache/nifi/groups/PropertyDecryptor.java | 10 +-
.../registry/flow/mapping/ComponentIdLookup.java | 55 +
.../registry/flow/mapping/FlowMappingOptions.java | 197 ++
.../flow/mapping/SensitiveValueEncryptor.java | 8 +-
.../mapping/VersionedComponentStateLookup.java | 108 +
.../org/apache/nifi/controller/FlowController.java | 19 +-
.../nifi/controller/StandardFlowService.java | 35 +-
...wSynchronizer.java => XmlFlowSynchronizer.java} | 27 +-
.../inheritance/BundleCompatibilityCheck.java | 100 +-
.../inheritance/ConnectionMissingCheck.java | 72 +-
.../client/async/nio/LoadBalanceSession.java | 7 +-
.../async/nio/NioAsyncLoadBalanceClient.java | 13 +-
.../repository/WriteAheadFlowFileRepository.java | 4 +-
.../serialization/AffectedComponentSet.java | 645 ++++++
.../controller/serialization/FlowSynchronizer.java | 3 +-
.../serialization/ScheduledStateLookup.java | 3 +-
.../serialization/StandardFlowSynchronizer.java | 65 +
.../serialization/VersionedDataflowMapper.java | 221 +++
.../serialization/VersionedFlowSerializer.java | 70 +
.../serialization/VersionedFlowSynchronizer.java | 978 +++++++++
.../tasks/FlowConfigurationDiagnosticTask.java | 2 +-
.../FlowConfigurationArchiveManager.java | 44 +-
.../nifi/persistence/FlowConfigurationDAO.java | 13 +-
.../persistence/StandardFlowConfigurationDAO.java | 234 +++
.../StandardXMLFlowConfigurationDAO.java | 190 --
.../java/org/apache/nifi/util/BundleUtils.java | 52 +-
.../main/java/org/apache/nifi/util/FlowParser.java | 161 +-
.../apache/nifi/controller/TestFlowController.java | 72 +-
.../client/async/nio/TestLoadBalanceSession.java | 4 +-
.../controller/service/mock/MockProcessGroup.java | 6 +
.../nifi/integration/FrameworkIntegrationTest.java | 15 +-
.../nifi/integration/versioned/ImportFlowIT.java | 25 +-
.../TestFlowConfigurationArchiveManager.java | 48 +-
.../flow/mapping/NiFiRegistryFlowMapperTest.java | 1 -
.../org/apache/nifi/nar/InstanceClassLoader.java | 4 -
.../nifi/nar/NarThreadContextClassLoader.java | 1 +
.../apache/nifi/nar/SharedInstanceClassLoader.java | 9 +-
.../nar/StandardExtensionDiscoveringManager.java | 8 +-
.../org/apache/nifi/headless/FlowEnricher.java | 264 ---
.../apache/nifi/headless/HeadlessNiFiServer.java | 2 -
.../nifi/properties/NiFiPropertiesLoader.java | 13 +-
.../nifi-framework/nifi-resources/pom.xml | 1 +
.../src/main/resources/conf/nifi.properties | 1 +
.../nifi/registry/flow/FlowRegistryUtils.java | 3 +-
.../apache/nifi/web/StandardNiFiServiceFacade.java | 79 +-
.../apache/nifi/web/api/FlowUpdateResource.java | 41 +-
...connectedNodeMutableRequestExceptionMapper.java | 49 -
.../org/apache/nifi/web/api/dto/DtoFactory.java | 56 +-
.../web/dao/impl/StandardParameterContextDAO.java | 8 +-
.../nifi/web/StandardNiFiServiceFacadeSpec.groovy | 8 +-
.../jquery/propertytable/jquery.propertytable.js | 34 +-
.../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 24 +
.../nifi/processors/gcp/storage/ListGCSBucket.java | 16 +-
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +-
.../processors/kudu/AbstractKuduProcessor.java | 46 +-
.../apache/nifi/processors/kudu/TestPutKudu.java | 55 +-
nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 2 +-
.../snmp/configuration/SNMPConfigurationTest.java | 2 +-
.../snmp/factory/core/V1V2cSNMPFactoryTest.java | 12 +-
.../nifi/snmp/factory/core/V3SNMPFactoryTest.java | 12 +-
.../operations/SNMPTrapReceiverHandlerTest.java | 6 +-
.../snmp/processors/AbstractSNMPProcessorTest.java | 2 +-
.../apache/nifi/snmp/processors/GetSNMPTest.java | 4 +-
.../snmp/processors/TrapSNMPIntegrationTest.java | 4 +-
.../apache/nifi/processors/splunk/GetSplunk.java | 23 +
.../nifi/websocket/jetty/JettyWebSocketClient.java | 68 +-
.../websocket/jetty/ITJettyWebsocketReconnect.java | 105 +
.../websocket/jetty/TestJettyWebSocketClient.java | 24 +
.../docs/TestJacksonExtensionManifestParser.java | 25 +
.../extension-manifest-kafka-2-6-nar.xml | 16 +
.../extension/component/manifest/BuildInfo.java | 89 +
.../component/manifest/ExtensionManifest.java | 56 +
.../{ExtensionManifest.java => ParentNar.java} | 45 +-
.../registry/flow/VersionedParameterContext.java | 22 +-
.../registry/flow/diff/ComparableDataFlow.java | 11 +
.../diff/ConciseEvolvingDifferenceDescriptor.java | 10 +-
.../nifi/registry/flow/diff/DifferenceType.java | 45 +
.../flow/diff/EvolvingDifferenceDescriptor.java | 6 +-
.../flow/diff/StandardComparableDataFlow.java | 32 +
.../registry/flow/diff/StandardFlowComparator.java | 133 +-
.../flow/diff/StaticDifferenceDescriptor.java | 14 +-
.../nifi/registry/service/RegistryService.java | 3 +-
.../nifi-registry-ranger/pom.xml | 2 +-
nifi-stateless/nifi-stateless-assembly/README.md | 7 +-
.../extensions/FileSystemExtensionRepository.java | 46 +-
.../flow/StandardStatelessDataflowFactory.java | 3 +-
.../tests/system/WriteFlowFileCountToFile.java | 30 +-
.../nifi/tests/system/AggregateNiFiInstance.java | 9 +
.../tests/system/ExceptionalBooleanSupplier.java | 8 +-
.../apache/nifi/tests/system/NiFiClientUtil.java | 200 +-
.../org/apache/nifi/tests/system/NiFiInstance.java | 8 +
.../org/apache/nifi/tests/system/NiFiSystemIT.java | 82 +-
.../SpawnedStandaloneNiFiInstanceFactory.java | 22 +-
.../classloaders/ClassloaderIsolationKeyIT.java | 55 +
.../system/clustering/FlowSynchronizationIT.java | 896 +++++++++
.../clustering/JoinClusterWithDifferentFlow.java | 5 +
... JoinClusterWithMissingConnectionWithData.java} | 2 +-
.../system/restart/FlowFileRestorationIT.java | 7 +-
.../resources/conf/clustered/node1/logback.xml | 41 +-
.../resources/conf/clustered/node2/logback.xml | 43 +-
.../src/test/resources/conf/default/logback.xml | 43 +-
.../cli/impl/client/nifi/ConnectionClient.java | 6 +
.../cli/impl/client/nifi/ProcessorClient.java | 4 +
.../cli/impl/client/nifi/ReportingTasksClient.java | 2 +
.../impl/client/nifi/impl/CRUDJerseyClient.java | 6 +-
.../client/nifi/impl/JerseyConnectionClient.java | 24 +-
.../nifi/impl/JerseyControllerServicesClient.java | 6 +-
.../client/nifi/impl/JerseyProcessorClient.java | 41 +-
.../nifi/impl/JerseyReportingTasksClient.java | 30 +
pom.xml | 5 +-
255 files changed, 13706 insertions(+), 3726 deletions(-)
create mode 100644 c2/c2-protocol/c2-protocol-api/pom.xml
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/AgentInfo.java
copy nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/RetryableException.java => c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/AgentRepositories.java (52%)
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/AgentRepositoryStatus.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/AgentResourceConsumption.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/AgentStatus.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2Heartbeat.java
copy nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/RetryableException.java => c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2HeartbeatResponse.java (57%)
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2Operation.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationAck.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/C2OperationState.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/InstantiatedVersionedComponent.java => c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ComponentStatus.java (62%)
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/DeviceInfo.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/FlowInfo.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/FlowQueueStatus.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/FlowUri.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/Location.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/NetworkInfo.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/Operation.java
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/OperationState.java
copy nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ComparableDataFlow.java => c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/OperationType.java (72%)
create mode 100644 c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/SystemInfo.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/pom.xml
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/BuildInfo.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/Bundle.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ComponentManifest.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/InstantiatedVersionedComponent.java => c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ConfigurableComponentDefinition.java (62%)
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ControllerServiceDefinition.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/DefinedType.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ExtensionComponent.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ProcessorDefinition.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/PropertyAllowableValue.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/PropertyDescriptor.java
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/StandardComparableDataFlow.java => c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/Relationship.java (57%)
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ReportingTaskDefinition.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/RuntimeManifest.java
create mode 100644 c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/SchedulingDefaults.java
create mode 100644 c2/c2-protocol/pom.xml
create mode 100644 c2/pom.xml
copy nifi-api/src/main/java/org/apache/nifi/flow/{VersionedControllerService.java => VersionedReportingTask.java} (57%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/cluster/protocol/DataFlow.java => nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/FieldConverter.java (54%)
create mode 100644 nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverter.java
create mode 100644 nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverterTest.java
create mode 100644 nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/ExtendTransactionCommand.java
delete mode 100644 nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/socket/SiteToSiteClientIT.java
create mode 100644 nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/util/TestExtendTransactionCommand.java
create mode 100644 nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
create mode 100644 nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
create mode 100644 nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/resources/docs/org.apache.nifi.processors.elasticsearch.PutElasticsearchJson/additionalDetails.html
create mode 100644 nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.groovy
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/flow/PopularVoteFlowElectionFactoryBeanTest.groovy
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/DefaultComponentScheduler.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/ProcessGroupSynchronizationContext.java
copy nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ComparableDataFlow.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/ProcessGroupSynchronizer.java (63%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroupSynchronizer.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/registry/flow/mapping/TestNiFiRegistryFlowMapper.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/flow/VersionedDataflow.java
copy nifi-nar-bundles/{nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/RetryableException.java => nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/flow/VersionedFlowEncodingVersion.java} (54%)
copy nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedParameterContext.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/flow/VersionedRegistry.java (52%)
copy nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardComparableDataFlow.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/flow/VersionedTemplate.java (60%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/AbstractComponentScheduler.java
copy nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ComparableDataFlow.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/BundleUpdateStrategy.java (72%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/{cluster/protocol/DataFlow.java => groups/ComponentIdGenerator.java} (55%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/{nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/InstantiatedVersionedComponent.java => nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ComponentScheduler.java} (62%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/GroupSynchronizationOptions.java
copy nifi-api/src/main/java/org/apache/nifi/flow/ScheduledState.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/PropertyDecryptor.java (83%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/ComponentIdLookup.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/FlowMappingOptions.java
copy nifi-api/src/main/java/org/apache/nifi/flow/ScheduledState.java => nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/SensitiveValueEncryptor.java (86%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/VersionedComponentStateLookup.java
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/{StandardFlowSynchronizer.java => XmlFlowSynchronizer.java} (99%)
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/AffectedComponentSet.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/StandardFlowSynchronizer.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedDataflowMapper.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSerializer.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardFlowConfigurationDAO.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/src/main/java/org/apache/nifi/headless/FlowEnricher.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/DisconnectedNodeMutableRequestExceptionMapper.java
create mode 100644 nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/test/java/org/apache/nifi/websocket/jetty/ITJettyWebsocketReconnect.java
create mode 100644 nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component/manifest/BuildInfo.java
copy nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component/manifest/{ExtensionManifest.java => ParentNar.java} (52%)
copy nifi-api/src/main/java/org/apache/nifi/flow/ScheduledState.java => nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/ExceptionalBooleanSupplier.java (86%)
create mode 100644 nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
rename nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/{JoinCluslterWithMissingConnectionWithData.java => JoinClusterWithMissingConnectionWithData.java} (98%)